From: Daniel Gruno Date: Wed, 19 Sep 2012 16:07:09 +0000 (+0000) Subject: s/2.3/2.5/ and s/2.5/2.&httpd.minor;/ where applicable (assuming it works) X-Git-Tag: 2.5.0-alpha~6303 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=009db1df0d4d56cfae3e073392c04139d57b0b8b;p=thirdparty%2Fapache%2Fhttpd.git 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 630d64e664e..e447aee8411 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -361,7 +361,7 @@ $ tar xvf httpd-NN.tar

The first step in upgrading is to read the release announcement and the file CHANGES 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 fcb75fc1d68..5cf4dd2ee85 100644 --- a/docs/manual/mod/mod_authn_dbd.xml +++ b/docs/manual/mod/mod_authn_dbd.xml @@ -60,7 +60,7 @@

Performance and Cacheing -

Some users of DBD authentication in HTTPD 2.2 have reported that it +

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 b82017d4b47..da8b59d135a 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -88,11 +88,11 @@ KB 292539. Windows XP and later do not require this update.

-

Note that you cannot install two versions of Apache 2.3 on the +

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 and 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 compile and install Apache from the source.

@@ -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.

  • 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 - \Apache2.5\modules directory. To activate these or + \Apache2.&httpd.minor;\modules directory. To activate these or other modules, the new LoadModule 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]

    If you use the first command without any special parameters except - -k install, the service will be called Apache2.5 + -k install, the service will be called Apache2.&httpd.minor; and the configuration will be assumed to be conf\httpd.conf.

    @@ -405,8 +405,8 @@ RewriteRule (.*) ${lowercase:$1} [R,L]

    Normal starting, restarting and shutting down of an Apache service is usually done via the Apache Service Monitor, by using - commands like NET START Apache2.5 and NET STOP - Apache2.5 or via normal Windows service management. Before + commands like NET START Apache2.&httpd.minor; and NET STOP + Apache2.&httpd.minor; 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:

    @@ -484,7 +484,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L] 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 logs subdirectory, where the user has to have at least change (RWXD) rights. @@ -507,7 +507,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L] Windows Control Panel, you may get the following message:

    - Could not start the Apache2.5 service on \\COMPUTER
    + Could not start the Apache2.&httpd.minor; service on \\COMPUTER
    Error 1067; The process terminated unexpectedly.     @@ -541,7 +541,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]

    You can also run Apache via the shortcut Start Apache in Console placed to Start Menu --> Programs --> Apache HTTP Server - 2.5.xx --> Control Apache Server during the installation. + 2.&httpd.minor;.xx --> Control Apache Server 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] c:
    - cd "\Program Files\Apache Software Foundation\Apache2.5\bin"
    + cd "\Program Files\Apache Software Foundation\Apache2.&httpd.minor;\bin"
    httpd.exe