From 7c731c03df5e0b98f0e1f17bf91c96d6e5895dce Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Wed, 19 Sep 2012 14:34:03 +0000 Subject: [PATCH] This is 2.4, not 2.3, and we do not support Windows 9x/ME. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1387618 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/invoking.xml | 8 +++----- docs/manual/platform/windows.xml | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml index c2f3ff910e..d7386dbfb8 100644 --- a/docs/manual/invoking.xml +++ b/docs/manual/invoking.xml @@ -26,11 +26,9 @@

On Windows, Apache is normally run as a service on Windows - NT, 2000 and XP, or as a console application on Windows 9x and - ME. For details, see Running Apache as a Service - and Running Apache as a - Console Application.

+ NT, 2000 and XP, Vista and 7. For details, see Running Apache as a Service. +

On Unix, the httpd program is run as a daemon that executes continuously in the diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml index 44ce9c891d..6137b979b0 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -27,7 +27,7 @@

This document explains how to install, configure and run - Apache 2.3 under Microsoft Windows. If you have questions after + Apache 2.4 under Microsoft Windows. If you have questions after reviewing the documentation (and any event and error logs), you should consult the peer-supported users' mailing @@ -43,7 +43,7 @@

Operating System Requirements -

The primary Windows platform for running Apache 2.3 is Windows +

The primary Windows platform for running Apache 2.4 is Windows 2000 or later. The binary installer only works with the x86 family of processors, such as Intel and AMD processors. Always obtain and install the current service pack to avoid operating system bugs.

@@ -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.4 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.3 series on the same computer without problems. If you need to - have two different 2.3 versions on the same computer, you have to + 2.4 series on the same computer without problems. If you need to + have two different 2.4 versions on the same computer, you have to compile and install Apache from the source.

@@ -133,7 +133,7 @@

  • Where to install. The default path is C:\Program Files\Apache Software Foundation under which a directory called - Apache2.3 will be created by default.

    • + Apache2.4 will be created by default.

    During the installation, Apache will configure the files in the @@ -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.3 is installed at C:\Program Files, then the root - directory, Program Files and Apache2.3 must all be visible + If Apache2.4 is installed at C:\Program Files, then the root + directory, Program Files and Apache2.4 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.3\modules directory. To activate these or + \Apache2.4\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.3 + -k install, the service will be called Apache2.4 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.3 and NET STOP - Apache2.3 or via normal Windows service management. Before + commands like NET START Apache2.4 and NET STOP + Apache2.4 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.3 + service runs as read and execute (RX) access to the whole Apache2.4 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.3 service on \\COMPUTER
    + Could not start the Apache2.4 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.3.xx --> Control Apache Server during the installation. + 2.4.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.3\bin"
    + cd "\Program Files\Apache Software Foundation\Apache2.4\bin"
    httpd.exe     -- 2.40.0