From 796353f6313591407c07088047282de9ba87a6eb Mon Sep 17 00:00:00 2001 From: Erik Abele Date: Wed, 13 Feb 2008 12:46:50 +0000 Subject: [PATCH] A more complete solution for PR 41823, see also r619746 and r619747. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@627384 13f79535-47bb-0310-9956-ffa450edef68 --- build/installwinconf.awk | 2 +- docs/manual/platform/windows.xml | 57 ++++++++++++++++---------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/build/installwinconf.awk b/build/installwinconf.awk index b33da6f208..1b62db0996 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -85,7 +85,7 @@ BEGIN { print "#" > dstfl; print "# NOTE: Where filenames are specified, you must use forward slashes" > dstfl; print "# instead of backslashes (e.g., \"c:/apache\" instead of \"c:\\apache\")." > dstfl; - print "# If a drive letter is omitted, the drive on which Apache.exe is located" > dstfl; + print "# If a drive letter is omitted, the drive on which httpd.exe is located" > dstfl; print "# will be used by default. It is recommended that you always supply" > dstfl; print "# an explicit drive letter in absolute paths to avoid confusion." > dstfl; bswarning = 0; diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml index 5819a44428..7fb0002c60 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -147,8 +147,9 @@ site(s).

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

    • + C:\Program Files\Apache Software Foundation + under which a directory called + Apache2.3 will be created by default.

    During the installation, Apache will configure the files in the @@ -249,7 +250,7 @@

  • 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\modules directory. To activate these or + \Apache2.3\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 @@ -319,7 +320,7 @@ the command prompt at the Apache bin subdirectory:

    - httpd -k install + httpd.exe -k install

    If you need to specify the name of the service you want to @@ -328,14 +329,14 @@ computer.

    - httpd -k install -n "MyServiceName" + httpd.exe -k install -n "MyServiceName"

    If you need to have specifically named configuration files for different services, you must use this:

    - httpd -k install -n "MyServiceName" -f "c:\files\my.conf" + httpd.exe -k install -n "MyServiceName" -f "c:\files\my.conf"

    If you use the first command without any special parameters except @@ -346,13 +347,13 @@

    Removing an Apache service is easy. Just use:

    - httpd -k uninstall + httpd.exe -k uninstall

    The specific Apache service to be uninstalled can be specified by using:

    - httpd -k uninstall -n "MyServiceName" + httpd.exe -k uninstall -n "MyServiceName"

    Normal starting, restarting and shutting down of an Apache @@ -363,34 +364,34 @@ service's configuration file by using:

    - httpd -n "MyServiceName" -t + httpd.exe -n "MyServiceName" -t

    You can control an Apache service by its command line switches, too. To start an installed Apache service you'll use this:

    - httpd -k start + httpd.exe -k start

    To stop an Apache service via the command line switches, use this:

    - httpd -k stop + httpd.exe -k stop

    or

    - httpd -k shutdown + httpd.exe -k shutdown

    You can also restart a running service and force it to reread its configuration file by using:

    - httpd -k restart + httpd.exe -k restart

    By default, all Apache services are registered to run as the @@ -482,7 +483,7 @@ in the background. If you run the command

    - httpd -n "MyServiceName" -k start + httpd.exe -n "MyServiceName" -k start

    via a shortcut on your desktop, for example, then if the @@ -530,7 +531,7 @@ use the following command:

    - httpd + httpd.exe

    Apache will execute, and will remain running until it is stopped @@ -551,7 +552,7 @@ window and entering:

    - httpd -k shutdown + httpd.exe -k shutdown

    This should be preferred over pressing Control-C because this @@ -562,7 +563,7 @@ complete without interruption. To restart Apache, use:

    - httpd -k restart + httpd.exe -k restart Note for people familiar with the Unix version of Apache: @@ -574,15 +575,15 @@

    If the Apache console window closes immediately or unexpectedly after startup, open the Command Prompt from the Start Menu --> Programs. Change to the folder to which you installed Apache, type - the command apache, and read the error message. Then + the command httpd.exe, and read the error message. Then change to the logs folder, and review the error.log file for configuration mistakes. If you accepted the defaults when you installed Apache, the commands would be:

    c:
    - cd "\Program Files\Apache Group\Apache2\bin"
    - httpd + cd "\Program Files\Apache Software Foundation\Apache2.3\bin"
    + httpd.exe

    Then wait for Apache to stop, or press Control-C. Then enter the @@ -602,20 +603,20 @@ a particular configuration file:

    - httpd -f "c:\my server files\anotherconfig.conf" + httpd.exe -f "c:\my server files\anotherconfig.conf"

    or

    - httpd -f files\anotherconfig.conf + httpd.exe -f files\anotherconfig.conf

  • -n specifies the installed Apache service whose configuration file is to be used:

    - httpd -n "MyServiceName" + httpd.exe -n "MyServiceName"
    • @@ -651,7 +652,7 @@
  • The server root compiled into the server. This is /apache by default, you can verify it by using - apache -V and looking for a value labelled as + httpd.exe -V and looking for a value labelled as HTTPD_ROOT.
    • @@ -664,7 +665,7 @@

    - HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\2.0.43 + HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Apache\2.3.2

    Correspondingly, if you chose to install Apache for the current @@ -673,7 +674,7 @@ logged on:

    - HKEY_CURRENT_USER\SOFTWARE\Apache Group\Apache\2.0.43 + HKEY_CURRENT_USER\SOFTWARE\Apache Software Foundation\Apache\2.3.2

    This key is compiled into the server and can enable you to test @@ -728,9 +729,9 @@

    If you happen to be running Apache on an alternate port, you need to explicitly put that in the URL:

    - + - http://127.0.0.1:8080/ + http://127.0.0.1:8080/

    Once your basic installation is working, you should configure it -- 2.40.0