From: Yoshiki Hayashi Date: Tue, 16 Jan 2001 02:33:16 +0000 (+0000) Subject: Remove reference to srm.conf and access.conf which was forward ported X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfa47334bc733d013e6f88f7500d1fc6660cf22e;p=apache Remove reference to srm.conf and access.conf which was forward ported by my previous commit. Suggested by Joshua Slive. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87694 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/configuring.html b/docs/manual/configuring.html index 428eb404de..f626637083 100644 --- a/docs/manual/configuring.html +++ b/docs/manual/configuring.html @@ -44,14 +44,12 @@ >directives in plain text configuration files. The main configuration file is usually called httpd.conf. The location of this file is set at compile-time, but may be overridden -with the -f command line flag. Some sites also have -srm.conf and access.conf files for historical -reasons. In addition, other configuration files may be added using -the Include -directive. Any directive may be placed in any of these configuration -files. Changes to the main configuration files are only recognized by -Apache when it is started or restarted.

+with the -f command line flag. In addition, other +configuration files may be added using the Include directive. Any +directive may be placed in any of these configuration files. Changes +to the main configuration files are only recognized by Apache when it +is started or restarted.

New with Apache 1.3.13 is a feature where if any configuration file is actually a directory, Apache will enter that directory diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index 428eb404de..f626637083 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -44,14 +44,12 @@ >directives in plain text configuration files. The main configuration file is usually called httpd.conf. The location of this file is set at compile-time, but may be overridden -with the -f command line flag. Some sites also have -srm.conf and access.conf files for historical -reasons. In addition, other configuration files may be added using -the Include -directive. Any directive may be placed in any of these configuration -files. Changes to the main configuration files are only recognized by -Apache when it is started or restarted.

+with the -f command line flag. In addition, other +configuration files may be added using the Include directive. Any +directive may be placed in any of these configuration files. Changes +to the main configuration files are only recognized by Apache when it +is started or restarted.

New with Apache 1.3.13 is a feature where if any configuration file is actually a directory, Apache will enter that directory