coar 98/01/09 08:26:05
Modified: . devnotes.html voting.html
Log:
Change the notes about context diffs to refer to unified diffs
instead, since that's the current operating norm.
Submitted by: Martin Kraemer
Revision Changes Path
1.5 +1 -1 apache-devsite/devnotes.html
Index: devnotes.html
===================================================================
RCS file: /export/home/cvs/apache-devsite/devnotes.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- devnotes.html 1997/12/02 00:26:44 1.4
+++ devnotes.html 1998/01/09 16:26:02 1.5
@@ -63,7 +63,7 @@
them:
<P>
<DL>
- <DD><SAMP>% cvs diff -c3 apache/src/mod_mime.c > /tmp/foo</SAMP>
+ <DD><SAMP>% cvs diff -u apache/src/mod_mime.c > /tmp/foo</SAMP>
</DD>
</DL>
</P>
1.4 +2 -2 apache-devsite/voting.html
Index: voting.html
===================================================================
RCS file: /export/home/cvs/apache-devsite/voting.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- voting.html 1997/08/26 14:02:36 1.3
+++ voting.html 1998/01/09 16:26:02 1.4
@@ -203,10 +203,10 @@
<H3>Patch Format</H3>
-<P>The patch should be created by using <CODE>diff -C3</CODE> on the
+<P>The patch should be created by using <CODE>diff -u</CODE> on the
<STRONG>CURRENT</STRONG> source and the modified source. E.g.,</P>
-<PRE> diff -C3 http_main.c.orig http_main.c</PRE>
+<PRE> diff -u http_main.c.orig http_main.c</PRE>
<P>All patches necessary to address an action item must be concatenated
within a single patchfile. The source files affected by the patchfile