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/09/19 18:07:10 UTC
svn commit: r1387657 - in /httpd/httpd/trunk/docs/manual: install.xml
mod/mod_authn_dbd.xml platform/windows.xml
Author: humbedooh
Date: Wed Sep 19 16:07:09 2012
New Revision: 1387657
URL: http://svn.apache.org/viewvc?rev=1387657&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/docs/manual/install.xml
httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml
httpd/httpd/trunk/docs/manual/platform/windows.xml
Modified: httpd/httpd/trunk/docs/manual/install.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/install.xml?rev=1387657&r1=1387656&r2=1387657&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml (original)
+++ httpd/httpd/trunk/docs/manual/install.xml Wed Sep 19 16:07:09 2012
@@ -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
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml?rev=1387657&r1=1387656&r2=1387657&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.xml Wed Sep 19 16:07:09 2012
@@ -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)
Modified: httpd/httpd/trunk/docs/manual/platform/windows.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/windows.xml?rev=1387657&r1=1387656&r2=1387657&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/windows.xml (original)
+++ httpd/httpd/trunk/docs/manual/platform/windows.xml Wed Sep 19 16:07:09 2012
@@ -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 --> Programs --> Apache HTTP Server
- 2.5.xx --> Control Apache Server</code> during the installation.
+ 2.&httpd.minor;.xx --> 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>