Merge r1928084 from trunk:

helps to re-read the PR.

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

diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index ff6d2dd929aea7bf46da8d76f093a657051a7338..9b7a567991c0a0fe8549e89f45f4027d18205309 100644 (file)
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -68,19 +68,26 @@ Server.</p>
     <p>httpd configuration files contain one directive per line.
     The backslash "\" may be used as the last character on a line
     to indicate that the directive continues onto the next line.
-    There must be no other characters or white space between the
-    backslash and the end of the line.</p>
+    To be interpreted as such a continuation, there must be no
+    other characters or white space between the backslash and the
+    end of the line. </p>
 
-    <p>Arguments to directives are separated by whitespace. If an 
+    <p>Lines that begin with the hash character "#" are considered
+    comments, and are ignored. Comments may <strong>not</strong> be
+    included on the same line as a configuration directive, including
+    at the start of a line that has been continued as described in the
+    preceding pargraph. Commented lines may also be continued, meaning
+    the next physical line is also interpreted as a comment because the
+    logical line begins with a hash character.
+    </p>
+
+    <p> White space occurring before a directive is ignored, so
+    you may indent directives for clarity. Blank lines are also ignored.
+    Arguments to directives are separated by whitespace. If an
     argument contains spaces, you must enclose that argument in quotes.</p>
 
     <p>Directives in the configuration files are case-insensitive,
-    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 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>
+    but arguments to directives are often case sensitive. </p>
 
     <p>The values of variables defined with the <code class="directive"><a href="./mod/core.html#define">Define</a></code> of or shell environment variables can
     be used in configuration file lines using the syntax <code>${VAR}</code>.

diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 8d3acb17911c7d69003b2f18efff6ea624e48d22..266d5caf74e5fa6128820b5c7648dbb4e1194fc5 100644 (file)
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -74,7 +74,9 @@ Server.</p>
     comments, and are ignored. Comments may <strong>not</strong> be
     included on the same line as a configuration directive, including
     at the start of a line that has been continued as described in the
-    preceding pargraph.
+    preceding pargraph. Commented lines may also be continued, meaning
+    the next physical line is also interpreted as a comment because the
+    logical line begins with a hash character.
     </p>
 
     <p> White space occurring before a directive is ignored, so

diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index 4fd784db90bbbb5c4f97e2d7c155a806482ecc5b..2ed8146f611bd44cb643deffc6559654e4908ba1 100644 (file)
--- a/docs/manual/configuring.xml.de
+++ b/docs/manual/configuring.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 420990:1662015 (outdated) -->
+<!-- English Revision: 420990:1928080 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/configuring.xml.fr b/docs/manual/configuring.xml.fr
index 63eba93fe23c3fb50bde9f82b38f35f7a0bcd7d6..3b8fddcc511ae8ad455d0d2a260a86f0f813aae9 100644 (file)
--- a/docs/manual/configuring.xml.fr
+++ b/docs/manual/configuring.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1662015 -->
+<!-- English Revision: 1662015:1928080 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index c4c6ecb4fdca19608b1bed26cefb9ac7bbebbec9..54455d9b23d7b548a2b299c6b2b5f41f091481ac 100644 (file)
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1662015 (outdated) -->
+<!-- English Revision: 420990:1928080 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/configuring.xml.ko b/docs/manual/configuring.xml.ko
index c45b8205b5145af6d5f2caa4a0a239c74eba8f38..b253e7e6f63a0420befbf03b173556ca3226f7de 100644 (file)
--- a/docs/manual/configuring.xml.ko
+++ b/docs/manual/configuring.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1662015 (outdated) -->
+<!-- English Revision: 420990:1928080 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/configuring.xml.meta b/docs/manual/configuring.xml.meta
index b06983ee5899868c3a1a96b344fb8ae7efa72fca..28796b60e280d055bb743941d911d22e9d0d55b2 100644 (file)
--- a/docs/manual/configuring.xml.meta
+++ b/docs/manual/configuring.xml.meta
@@ -9,9 +9,9 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/configuring.xml.tr b/docs/manual/configuring.xml.tr
index 2542d6f7137688161f3fef0fe8df7416c12bae25..b4944cd8701bc39058f37b951d11ad02881addc2 100644 (file)
--- a/docs/manual/configuring.xml.tr
+++ b/docs/manual/configuring.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1662015 -->
+<!-- English Revision: 1662015:1928080 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 07c21ef0f7dea055d5a3e057b2ab47fc3642a29b..160f199bd4ddc44ecc59183950311ca71d11e654 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1927041 (outdated) -->
+<!-- English Revision: 344972:1923004 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 6ef88b6255552bc53570bf5880417c6d0e3ca1a1..38c1fa459c949321b7010fe5270c295d964d12d8 100644 (file)
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1741251:1927041 (outdated) -->
+<!-- English Revision: 1741251:1923004 (outdated) -->
 <!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos-->
 <!--

diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index dd0217849f3f8d8a68be7f4537cff9da34af6e26..363a13ac691f064be4b89224266a567abafe06b5 100644 (file)
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1927041 -->
+<!-- English Revision: 1927041:1923004 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 4820e3b66c01b2622f8c08937fbc0d0f02bf9c0b..1021ced940efacd0c5832ddd18357f4b97f835ae 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:1927041 (outdated) -->
+<!-- English Revision: 669847:1923004 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index e78755527afd76e79a93204836e49a52f246c2bf..b9d96ee4c52f9b48a91a39e026f2df4b34b47a06 100644 (file)
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">tr</variant>
   </variants>

diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index faedc79584b4204f6a019b1ba9a56b52b5de718d..0624e311884862be8cfea3480ebefc2cdea50d3e 100644 (file)
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1907151:1927041 (outdated) -->
+<!-- English Revision: 1907151:1923004 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>