From: Rich Bowen Date: Fri, 21 Jan 2011 18:20:51 +0000 (+0000) Subject: Rebuilding various recent changes. X-Git-Tag: 2.3.11~147 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03051dc08df8a5a9f1f62ab815c074948765c3fb;p=thirdparty%2Fapache%2Fhttpd.git Rebuilding various recent changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061947 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index eb0f8ab1fab..a9b2349d446 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -74,24 +74,22 @@ Server.

and white space occurring before a directive are ignored, so you may indent directives for clarity.

-

The values of variables defined with the - Define of or shell environment variables can be used in - configuration file lines using the syntax ${VAR}. - If "VAR" is the name of a valid 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. Variables defined with - Define take precedence over shell - environment variables. If the "VAR" variable is not found, the characters - ${VAR} are left unchanged, and a warning is logged. Variable - names may not contain colon ":" characters, to avoid clashes with +

The values of variables defined with the Define of or shell environment variables can + be used in configuration file lines using the syntax ${VAR}. + If "VAR" is the name of a valid 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. + Variables defined with Define take + precedence over shell environment variables. + If the "VAR" variable is not found, the characters ${VAR} + are left unchanged, and a warning is logged. + Variable names may not contain colon ":" characters, to avoid clashes with RewriteMap's syntax.

Only shell environment variables defined before the server is started can be used in expansions. Environment variables defined in the - configuration file itself, for example with - SetEnv, take effect too late to be used for expansions in the - configuration file.

+ configuration file itself, for example with SetEnv, take effect too late to be used for + expansions in the configuration file.

The maximum length of a line in the configuration file, after variable substitution, joining any continued lines and removing leading diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de index 00373fce212..c2cf0faf956 100644 --- a/docs/manual/configuring.xml.de +++ b/docs/manual/configuring.xml.de @@ -1,7 +1,7 @@ - + + + + + + +