From: Daniel Earl Poirier <poirier@apache.org>
Date: Fri, 18 Dec 2009 15:48:18 +0000 (+0000)
Subject: Document the ability to use shell environment variables in
X-Git-Tag: 2.2.15~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7321bee9be38e7e5bbf11c058cef6c6cf8715a53;p=thirdparty%2Fapache%2Fhttpd.git

Document the ability to use shell environment variables in
the configuration file.

PR: 46333
Patch submitted by: Nathan Stratton Treadway


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

diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index c2f9aa0586e..00b1c3b591b 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -74,9 +74,19 @@ HTTP server.</p>
     and white space occurring before a directive are ignored, so
     you may indent directives for clarity.</p>
 
-    <p>The maximum length of a line in the configuration file,
-    after joining any continued lines and removing leading and
-    trailing white space, is 8192 characters.</p>
+    <p>The values of shell environment variables can be used in
+    configuration file lines using the syntax <code>${ENVVAR}</code>.
+    If "ENVVAR" is the name of a valid environment variable, the value
+    of that variable is substituted into that spot in the
+    configuration file line, and processing continues as if that text
+    were found directly in the configuration file.  (If the ENVVAR
+    variable is not found, the characters "${ENVVAR}" are left
+    unchanged for use by later stages in the config file
+    processing.)</p>
+
+    <p>The maximum length of a line in the configuration file, after
+    environment-variable substitution, joining any continued lines and
+    removing leading and trailing white space, is 8192 characters.</p>
 
     <p>You can check your configuration files for syntax errors
     without starting the server by using <code>apachectl
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 7ef3006b14a..390a88ca85e 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -77,9 +77,19 @@ HTTP server.</p>
     and white space occurring before a directive are ignored, so
     you may indent directives for clarity.</p>
 
-    <p>The maximum length of a line in the configuration file,
-    after joining any continued lines and removing leading and
-    trailing white space, is 8192 characters.</p>
+    <p>The values of shell environment variables can be used in
+    configuration file lines using the syntax <code>${ENVVAR}</code>.
+    If "ENVVAR" is the name of a valid environment variable, the value
+    of that variable is substituted into that spot in the
+    configuration file line, and processing continues as if that text
+    were found directly in the configuration file.  (If the ENVVAR
+    variable is not found, the characters "${ENVVAR}" are left
+    unchanged for use by later stages in the config file
+    processing.)</p>
+
+    <p>The maximum length of a line in the configuration file, after
+    environment-variable substitution, joining any continued lines and
+    removing leading and trailing white space, is 8192 characters.</p>
 
     <p>You can check your configuration files for syntax errors
     without starting the server by using <code>apachectl