From: Yoshiki Hayashi Date: Mon, 15 Jan 2001 08:58:14 +0000 (+0000) Subject: Backport documentation about Include som-dir usage from 1.3. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=172b7131e77a89c6ca305529b35a4c12298487d1;p=apache Backport documentation about Include som-dir usage from 1.3. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87683 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/configuring.html b/docs/manual/configuring.html index 45525bfee3..428eb404de 100644 --- a/docs/manual/configuring.html +++ b/docs/manual/configuring.html @@ -44,12 +44,24 @@ >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. 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. 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.

+ +

New with Apache 1.3.13 is a feature where if any configuration +file is actually a directory, Apache will enter that directory +and parse any files (and subdirectories) found there as configuration +files. One possible use for this would be to add VirtualHosts +by creating small configuration files for each host, and placing +them in such a configuration directory. Thus, you can add or +remove VirtualHosts without editing any files at all, simply +adding or deleting them. This makes automating such processes +much easier.

The server also reads a file containing mime document types; the diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index 45525bfee3..428eb404de 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -44,12 +44,24 @@ >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. 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. 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.

+ +

New with Apache 1.3.13 is a feature where if any configuration +file is actually a directory, Apache will enter that directory +and parse any files (and subdirectories) found there as configuration +files. One possible use for this would be to add VirtualHosts +by creating small configuration files for each host, and placing +them in such a configuration directory. Thus, you can add or +remove VirtualHosts without editing any files at all, simply +adding or deleting them. This makes automating such processes +much easier.

The server also reads a file containing mime document types; the