Update xforms

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

15 files changed, 33 insertions, 11 deletions

diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index a9b2349d44..d16253535a 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -99,6 +99,13 @@ Server.</p>
     without starting the server by using <code>apachectl
     configtest</code> or the <code>-t</code> command line
     option.</p>
+
+    <p>You can use <code class="module"><a href="./mod/mod_info.html">mod_info</a></code>'s <code>-DDUMP_CONFIG</code> to
+    dump the configuration with all included files and environment
+    variables resolved and all comments and non-matching
+    <code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> and
+    <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> sections
+    removed.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="modules" id="modules">Modules</a></h2>
diff --git a/docs/manual/configuring.html.tr.utf8 b/docs/manual/configuring.html.tr.utf8
index afcb65f590..658980d527 100644
--- a/docs/manual/configuring.html.tr.utf8
+++ b/docs/manual/configuring.html.tr.utf8
@@ -25,6 +25,7 @@
 <a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/configuring.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 
 <p>Bu belgede Apache HTTP Sunucusunu yapılandırmakta kullanılan dosyalar
 açıklanmıştır.</p>
diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index c2cf0faf95..1b75819f53 100644
--- 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:1061758 (outdated) -->
+<!-- English Revision: 420990:1086771 (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 65e93ff732..bb43476e30 100644
--- 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:1061758 (outdated) -->
+<!-- English Revision: 420990:1086771 (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 a2536dfc9d..ab7de1d6b3 100644
--- 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:1061758 (outdated) -->
+<!-- English Revision: 420990:1086771 (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 b06983ee58..e719482486 100644
--- a/docs/manual/configuring.xml.meta
+++ b/docs/manual/configuring.xml.meta
@@ -12,6 +12,6 @@
     <variant>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 baa24d7e73..70ac8e23ce 100644
--- 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: 1061758 -->
+<!-- English Revision: 1061758:1086771 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index 0a0cef26e3..1f8ab26b06 100644
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -102,6 +102,8 @@
       <li>New API to retain data across module unload/load</li>
       <li>New check_config hook</li>
       <li>New ap_process_fnmatch_configs() to process wildcards</li>
+      <li>Change ap_configfile_t, ap_cfg_getline(), ap_cfg_getc() to return error
+          code, new ap_pcfg_strerror().</li>
     </ul>
   
 
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 9928bc6fde..31c5d60d56 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -69,6 +69,7 @@ configuration</td></tr>
 <ul id="topics">
 <li><img alt="" src="../images/down.gif" /> <a href="#security">Security Issues</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#queries">Selecting the information shown</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startup">Dumping the configuration on startup</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#limitations">Known Limitations</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -129,6 +130,13 @@ configuration</td></tr>
     </dl>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="startup" id="startup">Dumping the configuration on startup</a></h2>
+    <p>If the config define <code>-DDUMP_CONFIG</code> is set,
+    <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> will dump the pre-parsed configuration to
+    <code>stdout</code> during server startup. This is roughly equivalent
+    to the <code>?config</code> query.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="limitations" id="limitations">Known Limitations</a></h2>
     <p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> provides its information by reading the
     parsed configuration, rather than reading the original configuration
diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja
index 4cb0676b46..56a74b2f75 100644
--- a/docs/manual/mod/mod_info.xml.ja
+++ b/docs/manual/mod/mod_info.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: 450473:1042758 (outdated) -->
+<!-- English Revision: 450473:1086771 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko
index 83caaf8cc8..9d1a989f88 100644
--- a/docs/manual/mod/mod_info.xml.ko
+++ b/docs/manual/mod/mod_info.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 125277:1042758 (outdated) -->
+<!-- English Revision: 125277:1086771 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_status.xml.ja b/docs/manual/mod/mod_status.xml.ja
index a9c449378b..454687963b 100644
--- a/docs/manual/mod/mod_status.xml.ja
+++ b/docs/manual/mod/mod_status.xml.ja
@@ -2,7 +2,7 @@
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <modulesynopsis metafile="mod_status.xml.meta">
-<!-- English Revision: 668628:1086605 (outdated) -->
+<!-- English Revision: 668628:1086608 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_status.xml.ko b/docs/manual/mod/mod_status.xml.ko
index 69a5c0b377..ca37088bc7 100644
--- a/docs/manual/mod/mod_status.xml.ko
+++ b/docs/manual/mod/mod_status.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1086605 (outdated) -->
+<!-- English Revision: 420990:1086608 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_status.xml.tr b/docs/manual/mod/mod_status.xml.tr
index 9f8833f030..3b060054e5 100644
--- a/docs/manual/mod/mod_status.xml.tr
+++ b/docs/manual/mod/mod_status.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 779139:1086605 (outdated) -->
+<!-- English Revision: 779139:1086608 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index 47c09225fd..ed05f193cd 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -176,12 +176,16 @@
       clients which require such headers. (This affects all modules which
       use these environment variables.)</dd>
 
-      <dt><code class="module"><a href="./mod/mod_authz_core.html">mod_authz_core</a></code>Authorization Logic Containers</dt>
+      <dt><code class="module"><a href="./mod/mod_authz_core.html">mod_authz_core</a></code> Authorization Logic Containers</dt>
 
       <dd>Advanced authorization logic may now be specified using the
           <code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code> directive
           and the related container directives, such as
           <code class="directive"><a href="./mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></dt>
+      <dd><code class="module"><a href="./mod/mod_info.html">mod_info</a></code> can now dump the pre-parsed configuration
+          to stdout during server startup.</dd>
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">