Backporting to 2.2 for PR 41823

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@619749 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/INSTALL b/INSTALL
index dbcaaf5a714167aa1bf6cf6d042d33db859fd7dd..c9127fc2bfa4a13ff331d00e8383b35a126302d2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -67,8 +67,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 -k install
+    bin\httpd -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.html.en b/docs/manual/platform/win_compiling.html.en
index ff54177ab1d0ec71759d6caf1fbfea6c8792b2c5..0411bdd96358562169dc9be67a2ad68ed5c32527 100644 (file)
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -374,7 +374,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/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.html.en b/docs/manual/platform/windows.html.en
index 4f404b990e840faffd6a8ba0e2deedc4e693623a..313f41d2961894bb3e15400e8c3601baa9cbec38 100644 (file)
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -433,7 +433,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>
 
     <div class="note">It is usually a good practice to grant the user the Apache

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index 3d00d6a4699d9fa445254f72e23deec837f94797..099e3935e139054be762570ca6d0288e6baab0de 100644 (file)
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -433,7 +433,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 120adfc08984e922353cc5e630d2e45130c79d99..48fb05363c5ab768c2f82cae5dfe7a7d91e8cd27 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -634,7 +634,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);