You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2008/11/04 21:32:37 UTC
svn commit: r711385 - in /httpd/site/trunk: docs/dev/patches.html
xdocs/dev/patches.xml
Author: rpluem
Date: Tue Nov 4 12:32:36 2008
New Revision: 711385
URL: http://svn.apache.org/viewvc?rev=711385&view=rev
Log:
* Update outdated information on patches page.
PR: 46145
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem
Modified:
httpd/site/trunk/docs/dev/patches.html
httpd/site/trunk/xdocs/dev/patches.xml
Modified: httpd/site/trunk/docs/dev/patches.html
URL: http://svn.apache.org/viewvc/httpd/site/trunk/docs/dev/patches.html?rev=711385&r1=711384&r2=711385&view=diff
==============================================================================
--- httpd/site/trunk/docs/dev/patches.html (original)
+++ httpd/site/trunk/docs/dev/patches.html Tue Nov 4 12:32:36 2008
@@ -146,17 +146,18 @@
<blockquote>
<p>Currently, there are three active Apache httpd source trees:</p>
<ol>
- <li>Apache httpd 1.3 (apache-1.3 main branch in cvs)</li>
- <li>Apache httpd 2.0.x (httpd-2.0, APACHE_2_0_BRANCH branch in cvs)</li>
- <li>Apache httpd 2.1.x (httpd-2.0 main branch in cvs)</li>
+ <li>Apache httpd 1.3.x</li>
+ <li>Apache httpd 2.2.x</li>
+ <li>Apache httpd 2.3.x (development version)</li>
</ol>
<p>A patch should be created against the last public release or, if
-practical, the latest code in CVS for the relevant source tree.
+practical, the latest code in subversion for the relevant source tree.
Patches created against older releases may not apply to current
sources.</p>
-<p>Instructions for obtaining a source tree from CVS are at
-<a href="http://httpd.apache.org/dev/anoncvs.txt">
-http://httpd.apache.org/dev/anoncvs.txt</a></p>
+<p>Instructions for obtaining a source tree from subversion are at
+ <a href="http://httpd.apache.org/dev/devnotes.html">
+ Apache Development Notes</a>
+</p>
</blockquote>
</td></tr>
</table>
@@ -191,8 +192,8 @@
<li><BLOCKQUOTE><CODE>cd /sources</CODE></BLOCKQUOTE></li>
<li><BLOCKQUOTE><CODE>diff -ru httpd-2.0.x httpd-2.0.x.new >my.unified.diff.patch</CODE></BLOCKQUOTE></li>
</ol>
-<p>If your source tree was checked out of CVS,
-<BLOCKQUOTE><CODE>cvs diff -u</CODE></BLOCKQUOTE> will create the
+<p>If your source tree was checked out of subversion,
+<BLOCKQUOTE><CODE>svn diff</CODE></BLOCKQUOTE> will create the
patch in the correct format.</p>
</blockquote>
</td></tr>
Modified: httpd/site/trunk/xdocs/dev/patches.xml
URL: http://svn.apache.org/viewvc/httpd/site/trunk/xdocs/dev/patches.xml?rev=711385&r1=711384&r2=711385&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/dev/patches.xml (original)
+++ httpd/site/trunk/xdocs/dev/patches.xml Tue Nov 4 12:32:36 2008
@@ -62,19 +62,20 @@
<p>Currently, there are three active Apache httpd source trees:</p>
<ol>
- <li>Apache httpd 1.3 (apache-1.3 main branch in cvs)</li>
- <li>Apache httpd 2.0.x (httpd-2.0, APACHE_2_0_BRANCH branch in cvs)</li>
- <li>Apache httpd 2.1.x (httpd-2.0 main branch in cvs)</li>
+ <li>Apache httpd 1.3.x</li>
+ <li>Apache httpd 2.2.x</li>
+ <li>Apache httpd 2.3.x (development version)</li>
</ol>
<p>A patch should be created against the last public release or, if
-practical, the latest code in CVS for the relevant source tree.
+practical, the latest code in subversion for the relevant source tree.
Patches created against older releases may not apply to current
sources.</p>
-<p>Instructions for obtaining a source tree from CVS are at
-<a href="http://httpd.apache.org/dev/anoncvs.txt">
-http://httpd.apache.org/dev/anoncvs.txt</a></p>.
+<p>Instructions for obtaining a source tree from subversion are at
+ <a href="http://httpd.apache.org/dev/devnotes.html">
+ Apache Development Notes</a>
+</p>.
</section>
@@ -109,8 +110,8 @@
<li><BLOCKQUOTE><CODE>diff -ru httpd-2.0.x httpd-2.0.x.new >my.unified.diff.patch</CODE></BLOCKQUOTE></li>
</ol>
-<p>If your source tree was checked out of CVS,
-<BLOCKQUOTE><CODE>cvs diff -u</CODE></BLOCKQUOTE> will create the
+<p>If your source tree was checked out of subversion,
+<BLOCKQUOTE><CODE>svn diff</CODE></BLOCKQUOTE> will create the
patch in the correct format.</p>
</section>