From: Stefan Fritsch
Date: Tue, 29 May 2012 19:19:37 +0000 (+0000)
Subject: Merge r1343935:
X-Git-Tag: 2.4.3~415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47ae5f81db388be500f78d73382520e2539e86d6;p=apache
Merge r1343935:
be more verbose about what -DDUMP_CONFIG does not
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1343937 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 1f23479cb8..4a8b36bb9c 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -111,7 +111,8 @@ Server.
variables resolved and all comments and non-matching
IfDefine and
IfModule sections
- removed.
+ removed. However, the output does not reflect the merging or overriding
+ that may happen for repeated directives.
diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 519ed4b744..eba7601227 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -114,8 +114,16 @@ configuration
Dumping the configuration on startup
If the config define -DDUMP_CONFIG
is set,
mod_info will dump the pre-parsed configuration to
- stdout
during server startup. This is roughly equivalent
- to the ?config
query.
+ stdout
during server startup. Pre-parsed means that
+ directives like
+ IfDefine and
+ IfModule 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.
+
+ This is roughly equivalent to the ?config
query.