Return-Path: 
 <cvs-return-32014-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 60785 invoked from network); 20 Jan 2009 03:39:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Jan 2009 03:39:03 -0000
Received: (qmail 96706 invoked by uid 500); 20 Jan 2009 03:39:03 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 96627 invoked by uid 500); 20 Jan 2009 03:39:03 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 96618 invoked by uid 99); 20 Jan 2009 03:39:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jan 2009 19:39:02 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 03:39:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 24AE4238896E; Mon, 19 Jan 2009 19:38:42 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r735927 - in /httpd/httpd/trunk/docs/manual/mod:
 core.html.en
 core.xml
Date: Tue, 20 Jan 2009 03:38:41 -0000
To: cvs@httpd.apache.org
From: rbowen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090120033842.24AE4238896E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rbowen
Date: Mon Jan 19 19:38:40 2009
New Revision: 735927

URL: http://svn.apache.org/viewvc?rev=735927&view=rev
Log:
Saying "don't do that" without offering an alternative isn't very
friendly.

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=735927&r1=735926&r2=735927&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Jan 19 19:38:40 2009
@@ -1509,10 +1509,12 @@
     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>

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=735927&r1=735926&r2=735927&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Mon Jan 19 19:38:40 2009
@@ -1489,10 +1489,12 @@
     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>