diff options
| author | Tony Stevenson <pctony@apache.org> | 2008-02-08 02:38:41 +0000 |
|---|---|---|
| committer | Tony Stevenson <pctony@apache.org> | 2008-02-08 02:38:41 +0000 |
| commit | 1ddf1ed16e36b39db08b9d0996eb0b3079d9206d (patch) | |
| tree | 0fdad40fdb5b4f9610c75930cb87c7a07f7aa8d2 | |
| parent | 647576b5d72bd83e5d7a9cb91ffcaf7d81d1e5df (diff) | |
| download | httpd-1ddf1ed16e36b39db08b9d0996eb0b3079d9206d.tar.gz | |
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
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | docs/manual/platform/win_compiling.xml | 2 | ||||
| -rw-r--r-- | docs/manual/platform/windows.xml | 2 | ||||
| -rw-r--r-- | modules/ldap/README.ldap | 2 | ||||
| -rw-r--r-- | server/mpm/winnt/mpm_winnt.c | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -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 633252cc80..1c2042a137 100644 --- 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 f0d788cebe..5819a44428 100644 --- 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 30ec5cc7f6..116707e07d 100644 --- 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 8568f1cc73..715310e013 100644 --- 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); |