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 45525bfee34b67ffb3a38689f96e0c09ed8ec565..428eb404de4c0a81fc76fc998d345b128ff700ef 100644 (file)
--- a/docs/manual/configuring.html
+++ b/docs/manual/configuring.html
@@ -44,12 +44,24 @@
 >directives</A> in plain text configuration files.  The main
 configuration file is usually called <CODE>httpd.conf</CODE>.  The
 location of this file is set at compile-time, but may be overridden
-with the <CODE>-f</CODE> command line flag.  In addition, other
-configuration files may be added using the <CODE><A
-HREF="mod/core.html#include">Include</A></CODE> 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.</p>
+with the <CODE>-f</CODE> command line flag.  Some sites also have
+<CODE>srm.conf</CODE> and <CODE>access.conf</CODE> files for <A
+HREF="http://www.apache.org/info/three-config-files.html">historical
+reasons</A>.  In addition, other configuration files may be added using
+the <CODE><A HREF="mod/core.html#include">Include</A></CODE>
+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.</p>
+
+<P>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.
 
 <P>
 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 45525bfee34b67ffb3a38689f96e0c09ed8ec565..428eb404de4c0a81fc76fc998d345b128ff700ef 100644 (file)
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -44,12 +44,24 @@
 >directives</A> in plain text configuration files.  The main
 configuration file is usually called <CODE>httpd.conf</CODE>.  The
 location of this file is set at compile-time, but may be overridden
-with the <CODE>-f</CODE> command line flag.  In addition, other
-configuration files may be added using the <CODE><A
-HREF="mod/core.html#include">Include</A></CODE> 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.</p>
+with the <CODE>-f</CODE> command line flag.  Some sites also have
+<CODE>srm.conf</CODE> and <CODE>access.conf</CODE> files for <A
+HREF="http://www.apache.org/info/three-config-files.html">historical
+reasons</A>.  In addition, other configuration files may be added using
+the <CODE><A HREF="mod/core.html#include">Include</A></CODE>
+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.</p>
+
+<P>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.
 
 <P>
 The server also reads a file containing mime document types; the