As per PR 41823 - s/apache.exe/httpd.exe

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

diff --git a/INSTALL b/INSTALL
index 1e67c20447c6efecc1e1f29715e6de00b0d6bbe3..03b85bde6e0958e77ddf667a9c4d5c153b237651 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -77,8 +77,8 @@
   the text "@@" to discover what you must edit.  To install and start the 
   service after you have corrected the httpd.conf file, use the command
 
-    bin\Apache -k install
-    bin\Apache -k start
+    bin\httpd.exe -k install
+    bin\httpd.exe -k start
 
   The .msi package configures the httpd.conf file, and installs and starts 
   the Apache2 service for you.  It also installs plenty of useful shortcuts

diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml
index 633252cc80bd5bc82305222a82bdb100df489e31..1c2042a13767fff431b3960490c1e14c46f5e15a 100644 (file)
--- a/docs/manual/platform/win_compiling.xml
+++ b/docs/manual/platform/win_compiling.xml
@@ -375,7 +375,7 @@ nmake /f Makefile.win installd INSTDIR=<em>dir</em>
     <p>This will install the following:</p>
 
     <ul>
-      <li><code><em>dir</em>\bin\Apache.exe</code> - Apache
+      <li><code><em>dir</em>\bin\httpd.exe</code> - Apache
       executable</li>
 
       <li><code><em>dir</em>\bin\ApacheMonitor.exe</code> - Service

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index f0d788cebe3f9a02133adea50b8849a9a58468eb..5819a44428ba3ae1e8fe400e21f046dae868d728 100644 (file)
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -432,7 +432,7 @@
       Apache <code>logs</code> directory.</li>
 
       <li>Grant the account read and execute (RX) rights to the
-      <code>Apache.exe</code> binary executable.</li>
+      <code>httpd.exe</code> binary executable.</li>
     </ol>
 
     <note>It is usually a good practice to grant the user the Apache

diff --git a/modules/ldap/README.ldap b/modules/ldap/README.ldap
index 30ec5cc7f6964db49f6d9461d57391069bb51075..116707e07d162344da59c62fa6cc7f21691d4c44 100644 (file)
--- a/modules/ldap/README.ldap
+++ b/modules/ldap/README.ldap
@@ -38,7 +38,7 @@ Quick installation instructions (win32):
 3. Compile the two modules util_ldap and mod_authnz_ldap using the dsp files
 4. You get a mod_authnz_ldap.so and a mod_ldap.so module
 5. Put them in the modules directory, don't forget to copy the
-   nsldap32v50.dll somewhere where apache.exe will find it
+   nsldap32v50.dll somewhere where httpd.exe will find it
 6. Load the two modules in your httpd.conf, like below:
    LoadModule ldap_module modules/mod_ldap.so
    LoadModule authnz_ldap_module modules/mod_authnz_ldap.so

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 8568f1cc732b9617bf8ccd16f13b3e1d754255b6..715310e013b86ca74d8a37291cb9ddb326427c15 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -586,7 +586,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     apr_pool_create_ex(&ptemp, p, NULL, NULL);
 
     /* Build the command line. Should look something like this:
-     * C:/apache/bin/apache.exe -f ap_server_confname
+     * C:/apache/bin/httpd.exe -f ap_server_confname
      * First, get the path to the executable...
      */
     apr_procattr_create(&attr, ptemp);