Changeset 28467 for trunk/doc


Ignore:
Timestamp:
Sep 1, 2007, 5:24:46 AM (12 years ago)
Author:
markd@…
Message:

Closes #12440. Use .orig instead of .org for the section on creating patchfiles.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/guide/new/xml/portfiledev.xml

    r28261 r28467  
    457457          directory.</para>
    458458
    459           <programlisting><prompt>%%</prompt> <userinput>cp Portfile Portfile.org</userinput></programlisting>
     459          <programlisting><prompt>%%</prompt> <userinput>cp Portfile Portfile.orig</userinput></programlisting>
    460460        </listitem>
    461461
     
    469469          a "unified" diff patch file.</para>
    470470
    471           <programlisting><prompt>%%</prompt> <userinput>diff -u Portfile.org Portfile &gt; Portfile.diff</userinput></programlisting>
     471          <programlisting><prompt>%%</prompt> <userinput>diff -u Portfile.orig Portfile &gt; Portfile.diff</userinput></programlisting>
    472472        </listitem>
    473473
     
    478478          applied.</para>
    479479
    480           <programlisting>--- Portfile.org        2007-07-25 18:52:12.000000000 -0700
     480          <programlisting>--- Portfile.orig        2007-07-25 18:52:12.000000000 -0700
    481481+++ Portfile    2007-07-25 18:53:35.000000000 -0700
    482482@@ -2,7 +2,7 @@
     
    521521
    522522          <programlisting><prompt>%%</prompt> <userinput>cd foo-1.34/src</userinput>
    523 <prompt>%%</prompt> <userinput>cp Makefile.in Makefile.in.org</userinput></programlisting>
     523<prompt>%%</prompt> <userinput>cp Makefile.in Makefile.in.orig</userinput></programlisting>
    524524        </listitem>
    525525
     
    534534
    535535          <programlisting><prompt>%%</prompt> <userinput>cd foo-1.34</userinput>
    536 <prompt>%%</prompt> <userinput>diff -u Makefile.in.org Makefile.in &gt; patch-Makefile.in</userinput></programlisting>
     536<prompt>%%</prompt> <userinput>diff -u Makefile.in.orig Makefile.in &gt; patch-Makefile.in</userinput></programlisting>
    537537
    538538          <note>
     
    550550          support to a <filename>Makefile.in</filename> file.</para>
    551551
    552           <programlisting>--- Makefile.in.org   2007-06-01 16:30:47.000000000 -0700
     552          <programlisting>--- Makefile.in.orig   2007-06-01 16:30:47.000000000 -0700
    553553+++ Makefile.in       2007-06-20 10:10:59.000000000 -0700
    554554@@ -131,23 +131,23 @@
Note: See TracChangeset for help on using the changeset viewer.