You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/04/15 10:48:35 UTC
svn commit: r1326276 - /httpd/site/trunk/docs/dev/patches.html
Author: humbedooh
Date: Sun Apr 15 08:48:35 2012
New Revision: 1326276
URL: http://svn.apache.org/viewvc?rev=1326276&view=rev
Log:
2.3 is no longer the current dev branch, changed to 2.5 and added 2.4 as current release
Modified:
httpd/site/trunk/docs/dev/patches.html
Modified: httpd/site/trunk/docs/dev/patches.html
URL: http://svn.apache.org/viewvc/httpd/site/trunk/docs/dev/patches.html?rev=1326276&r1=1326275&r2=1326276&view=diff
==============================================================================
--- httpd/site/trunk/docs/dev/patches.html [utf-8] (original)
+++ httpd/site/trunk/docs/dev/patches.html [utf-8] Sun Apr 15 08:48:35 2012
@@ -124,7 +124,7 @@ most often for enhancements. You may wi
is considered generally acceptable before updating the documentation.
Patches for the documentation are submitted with any code changes in
the same patch format.</p>
-<p>Please note that for Apache 2.0 and above, most of the
+<p>Please note that for Apache httpd 2.0 and above, most of the
documentation is generated from XML. Your changes need to be made to
the XML version. See
<a href="http://httpd.apache.org/docs-project/docsformat.html">
@@ -146,8 +146,9 @@ information.</p>
<p>Currently, there are three active Apache httpd source trees:</p>
<ol>
<li>Apache httpd 2.0.x (legacy/maintenance)</li>
- <li>Apache httpd 2.2.x (current release)</li>
- <li>Apache httpd 2.3.x (development/beta version)</li>
+ <li>Apache httpd 2.2.x (previous release)</li>
+ <li>Apache httpd 2.4.x (current release, GA)</li>
+ <li>Apache httpd 2.5.x (development/beta version)</li>
</ol>
<p>A patch should be created against the last public release or, if
practical, the latest code in subversion for the relevant source tree.
@@ -185,11 +186,11 @@ goes.</p>
the management of original and modified files:</p>
<ol>
<li><BLOCKQUOTE><CODE>cd /sources</CODE></BLOCKQUOTE></li>
- <li><BLOCKQUOTE><CODE>tar xvzf httpd-2.0.x.tar.gz</CODE></BLOCKQUOTE></li>
- <li><BLOCKQUOTE><CODE>cp -ax httpd-2.0.x httpd-2.0.x.new</CODE></BLOCKQUOTE></li>
- <li>edit files in httpd-2.0.x.new and build/test</li>
+ <li><BLOCKQUOTE><CODE>tar xvzf httpd-2.4.x.tar.gz</CODE></BLOCKQUOTE></li>
+ <li><BLOCKQUOTE><CODE>cp -ax httpd-2.4.x httpd-2.4.x.new</CODE></BLOCKQUOTE></li>
+ <li>edit files in httpd-2.4.x.new and build/test</li>
<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>
+ <li><BLOCKQUOTE><CODE>diff -ru httpd-2.4.x httpd-2.4.x.new >my.unified.diff.patch</CODE></BLOCKQUOTE></li>
</ol>
<p>If your source tree was checked out of subversion,
<BLOCKQUOTE><CODE>svn diff</CODE></BLOCKQUOTE> will create the