httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1343937 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/configuring.xml docs/manual/mod/mod_info.xml
Date Tue, 29 May 2012 19:19:38 GMT
Author: sf
Date: Tue May 29 19:19:37 2012
New Revision: 1343937

URL: http://svn.apache.org/viewvc?rev=1343937&view=rev
Log:
Merge r1343935:
be more verbose about what -DDUMP_CONFIG does not


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/configuring.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_info.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1343935

Modified: httpd/httpd/branches/2.4.x/docs/manual/configuring.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/configuring.xml?rev=1343937&r1=1343936&r2=1343937&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/configuring.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/configuring.xml Tue May 29 19:19:37 2012
@@ -111,7 +111,8 @@ Server.</p>
     variables resolved and all comments and non-matching
     <directive module="core" type="section">IfDefine</directive> and
     <directive module="core" type="section">IfModule</directive> sections
-    removed.</p>
+    removed. However, the output does not reflect the merging or overriding
+    that may happen for repeated directives.</p>
   </section>
 
   <section id="modules">

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_info.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_info.xml?rev=1343937&r1=1343936&r2=1343937&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_info.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_info.xml Tue May 29 19:19:37 2012
@@ -114,8 +114,16 @@ configuration</description>
 <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. This is roughly equivalent
-    to the <code>?config</code> query.</p>
+    <code>stdout</code> during server startup. 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
+    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>
+
+    <p>This is roughly equivalent to the <code>?config</code> query.</p>
 </section>
 
 <section id="limitations"><title>Known Limitations</title>



Mime
View raw message