From: Rich Bowen <rbowen@apache.org>
Date: Tue, 20 Jan 2009 03:38:40 +0000 (+0000)
Subject: Saying "don't do that" without offering an alternative isn't very
X-Git-Tag: 2.3.2~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=522fc2df916ce04dc40556edd39b5aff72ef91e1;p=apache

Saying "don't do that" without offering an alternative isn't very
friendly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@735927 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index efc2d3ab18..865054d3db 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1509,10 +1509,12 @@ the server configuration files</td></tr>
     include several files at once, in alphabetical order. In
     addition, if <code class="directive">Include</code> points to a directory,
     rather than a file, Apache will read all files in that directory
-    and any subdirectory.  But including entire directories is not
+    and any subdirectory.  However, including entire directories is not
     recommended, because it is easy to accidentally leave temporary
     files in a directory that can cause <code class="program"><a href="../programs/httpd.html">httpd</a></code> to
-    fail.</p>
+    fail. Instead, we encourage you to use the wildcard syntax shown
+    below, to include files that match a particular pattern, such as
+    *.conf, for example.</p>
 
     <p>The file path specified may be an absolute path, or may be relative 
     to the <code class="directive"><a href="#serverroot">ServerRoot</a></code> directory.</p>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 7ea1ced221..4a2da43f97 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1489,10 +1489,12 @@ the server configuration files</description>
     include several files at once, in alphabetical order. In
     addition, if <directive>Include</directive> points to a directory,
     rather than a file, Apache will read all files in that directory
-    and any subdirectory.  But including entire directories is not
+    and any subdirectory.  However, including entire directories is not
     recommended, because it is easy to accidentally leave temporary
     files in a directory that can cause <program>httpd</program> to
-    fail.</p>
+    fail. Instead, we encourage you to use the wildcard syntax shown
+    below, to include files that match a particular pattern, such as
+    *.conf, for example.</p>
 
     <p>The file path specified may be an absolute path, or may be relative 
     to the <directive module="core">ServerRoot</directive> directory.</p>