From ee47c06eeb9f1f496582afc0566ddfbeac2b8358 Mon Sep 17 00:00:00 2001
From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 25 May 2017 06:22:58 +0000
Subject: [PATCH] Backport r1772559, r1774492, r1774493, r1774505 + reorder
 section/module in order to synch with trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796131 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_info.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 8461ac400c..2cacbed8dc 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -108,17 +108,24 @@ configuration</description>
             <dd>Only a simple list of enabled modules</dd>
         <dt><code>?server</code></dt>
             <dd>Only the basic server information</dd>
+        <dt><code>?providers</code></dt>
+            <dd>List the providers that are available on your server</dd>
     </dl>
 </section>
 
 <section id="startup"><title>Dumping the configuration on startup</title>
     <p>If the config define <code>-DDUMP_CONFIG</code> is set,
     <module>mod_info</module> will dump the pre-parsed configuration to
-    <code>stdout</code> during server startup. Pre-parsed means that
-    directives like
+    <code>stdout</code> during server startup.</p>
+
+    <highlight language="sh">
+    httpd -DDUMP_CONFIG -k start
+    </highlight>
+    
+    <p>Pre-parsed means that directives like
     <directive type="section" module="core">IfDefine</directive> and
     <directive type="section" module="core">IfModule</directive> are
-    evaluated and environment varialbles are replaced. However it does
+    evaluated and environment variables are replaced. However it does
     not represent the final state of the configuration. In particular,
     it does not represent the merging or overriding that may happen
     for repeated directives.</p>
@@ -139,18 +146,18 @@ configuration</description>
           <directive module="mod_so">LoadFile</directive>.</li>
       <li>Directives which control the configuration file itself, such as
           <directive module="core">Include</directive>,
-          <directive module="core" type="section">IfModule</directive> and
-          <directive module="core" type="section">IfDefine</directive> are not
+          <directive type="section" module="core">IfModule</directive> and
+          <directive type="section" module="core">IfDefine</directive> are not
           listed, but the included configuration directives are.</li>
       <li>Comments are not listed. (This may be considered a feature.)</li>
       <li>Configuration directives from <code>.htaccess</code> files are
           not listed (since they do not form part of the permanent server
           configuration).</li>
       <li>Container directives such as
-          <directive module="core" type="section">Directory</directive>
+          <directive type="section" module="core">Directory</directive>
           are listed normally, but <module>mod_info</module> cannot figure
           out the line number for the closing
-          <directive module="core" type="section" name="Directory">/Directory</directive>.</li>
+          <directive type="section" module="core" name="Directory">/Directory</directive>.</li>
       <li>Directives generated by third party modules such as <a href="http://perl.apache.org">mod_perl</a>
           might not be listed.</li>
     </ul>
-- 
2.40.0