s/2.3/2.5/ and s/2.5/2.&httpd.minor;/ where applicable (assuming it works)

also note that a specific issue with mod_authn_dbd also applies to 2.4, so as to not confuse readers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 630d64e664e6555ddf1c72b09cab69dc303be603..e447aee84111d4359469f3ed722fde6bdaac8149 100644 (file)
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -361,7 +361,7 @@ $ tar xvf httpd-<em>NN</em>.tar
     <p>The first step in upgrading is to read the release announcement
     and the file <code>CHANGES</code> in the source distribution to
     find any changes that may affect your site.  When changing between
-    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3),
+    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.4),
     there will likely be major differences in the compile-time and
     run-time configuration that will require manual adjustments.  All
     modules will also need to be upgraded to accommodate changes in the

diff --git a/docs/manual/mod/mod_authn_dbd.xml b/docs/manual/mod/mod_authn_dbd.xml
index fcb75fc1d681b36841d5ead7759a05a3a9940187..5cf4dd2ee85917740d70844d1eaf0a70b153a887 100644 (file)
--- a/docs/manual/mod/mod_authn_dbd.xml
+++ b/docs/manual/mod/mod_authn_dbd.xml
@@ -60,7 +60,7 @@
 
 <section id="socache">
 <title>Performance and Cacheing</title>
-<p>Some users of DBD authentication in HTTPD 2.2 have reported that it
+<p>Some users of DBD authentication in HTTPD 2.2/2.4 have reported that it
 imposes a problematic load on the database.  This is most likely where
 an HTML page contains hundreds of objects (e.g. images, scripts, etc)
 each of which requires authentication.  Users affected (or concerned)

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index b82017d4b47de00496ed5003de31ea9ee712a2d7..da8b59d135a2ad9f2a91ac9398681068d05b3098 100644 (file)
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -88,11 +88,11 @@
     <a href="http://support.microsoft.com/kb/292539/">KB 292539</a>.
     Windows XP and later do not require this update.</p>
 
-    <p>Note that you cannot install two versions of Apache 2.3 on the
+    <p>Note that you cannot install two versions of Apache 2.&httpd.minor; on the
     same computer with the binary installer. You can, however, install
     a version of the 1.3 series <strong>and</strong> a version of the
-    2.5 series on the same computer without problems. If you need to
-    have two different 2.5 versions on the same computer, you have to
+    2.&httpd.minor; series on the same computer without problems. If you need to
+    have two different 2.&httpd.minor; versions on the same computer, you have to
     <a href="win_compiling.html">compile and install Apache from the
     source</a>.</p>
 
@@ -297,14 +297,14 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
       validate all path names given.  This means that each directory
       which Apache evaluates, from the drive root up to the directory
       leaf, must have read, list and traverse directory permissions.
-      If Apache2.5 is installed at C:\Program Files, then the root
-      directory, Program Files and Apache2.5 must all be visible
+      If Apache2.&httpd.minor; is installed at C:\Program Files, then the root
+      directory, Program Files and Apache2.&httpd.minor; must all be visible
       to Apache.</p></li>
 
       <li><p>Apache for Windows contains the ability to load modules at
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
-      <code>\Apache2.5\modules</code> directory. To activate these or
+      <code>\Apache2.&httpd.minor;\modules</code> directory. To activate these or
       other modules, the new <directive module="mod_so">LoadModule</directive>
       directive must be used. For example, to activate the status
       module, use the following (in addition to the status-activating
@@ -387,7 +387,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     </example>
 
     <p>If you use the first command without any special parameters except
-    <code>-k install</code>, the service will be called <code>Apache2.5</code>
+    <code>-k install</code>, the service will be called <code>Apache2.&httpd.minor;</code>
     and the configuration will be assumed to be <code>conf\httpd.conf</code>.
     </p>
 
@@ -405,8 +405,8 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <p>Normal starting, restarting and shutting down of an Apache
     service is usually done via the Apache Service Monitor, by using
-    commands like <code>NET START Apache2.5</code> and <code>NET STOP
-    Apache2.5</code> or via normal Windows service management. Before
+    commands like <code>NET START Apache2.&httpd.minor;</code> and <code>NET STOP
+    Apache2.&httpd.minor;</code> or via normal Windows service management. Before
     starting Apache as a service by any means, you should test the
     service's configuration file by using:</p>
 
@@ -484,7 +484,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     </ol>
 
     <note>It is usually a good practice to grant the user the Apache
-    service runs as read and execute (RX) access to the whole Apache2.5
+    service runs as read and execute (RX) access to the whole Apache2.&httpd.minor;
     directory, except the <code>logs</code> subdirectory, where the
     user has to have at least change (RWXD) rights.</note>
 
@@ -507,7 +507,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     Windows Control Panel, you may get the following message:</p>
 
     <example>
-      Could not start the Apache2.5 service on \\COMPUTER <br />
+      Could not start the Apache2.&httpd.minor; service on \\COMPUTER <br />
       Error 1067; The process terminated unexpectedly.
     </example>
 
@@ -541,7 +541,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <p>You can also run Apache via the shortcut Start Apache in Console
     placed to <code>Start Menu --&gt; Programs --&gt; Apache HTTP Server
-    2.5.xx --&gt; Control Apache Server</code> during the installation.
+    2.&httpd.minor;.xx --&gt; Control Apache Server</code> during the installation.
     This will open a console window and start Apache inside it. If you
     don't have Apache installed as a service, the window will remain
     visible until you stop Apache by pressing Control-C in the console
@@ -592,7 +592,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
     <example>
       c: <br />
-      cd "\Program Files\Apache Software Foundation\Apache2.5\bin" <br />
+      cd "\Program Files\Apache Software Foundation\Apache2.&httpd.minor;\bin" <br />
       httpd.exe
     </example>