From: Eric Covener <covener@apache.org>
Date: Tue, 24 Feb 2015 16:45:12 +0000 (+0000)
Subject: Merge r1662012 from trunk:
X-Git-Tag: 2.2.30~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f40f92cf088035e8ec32870f2bd9725245acec19;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1662012 from trunk:

improve some slightly awkward wording per comments feedback:

  http://httpd.apache.org/docs/2.4/configuring.html#comment_3678

The original can be read as applying to comments on a subsequent line.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1662017 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 59528670145..870374ab9de 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -73,9 +73,9 @@ HTTP server.</p>
     but arguments to directives are often case sensitive. Lines
     that begin with the hash character "#" are considered
     comments, and are ignored. Comments may <strong>not</strong> be
-    included on a line after a configuration directive. Blank lines
-    and white space occurring before a directive are ignored, so
-    you may indent directives for clarity.</p>
+    included on the same line as a configuration directive. 
+    White space occurring before a directive is ignored, so
+    you may indent directives for clarity. Blank lines are also ignored.</p>
 
     <p>The values of shell environment variables can be used in
     configuration file lines using the syntax <code>${ENVVAR}</code>.