Commit cb0f3cec authored by Richard Bowen's avatar Richard Bowen
Browse files

Rebuilding various recent changes. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061947 13f79535-47bb-0310-9956-ffa450edef68
parent edc8e5d6

docs/manual/configuring.html.en

+12 −14
Changes for docs/manual/configuring.html.en: 12 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -74,24 +74,22 @@ Server.</p> 
    and white space occurring before a directive are ignored, so

    you may indent directives for clarity.</p>



    <p>The values of variables defined with the <code class="directive"><a href="./mod/core.html#&#10;    define">

    Define</a></code> of or shell environment variables can be used in

    configuration file lines using the syntax <code>${VAR}</code>.

    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

    <code class="directive"><a href="./mod/core.html#define">Define</a></code> take precedence over shell

    environment variables. If the "VAR" variable is not found, the characters

    <code>${VAR}</code> are left unchanged, and a warning is logged. Variable

    names may not contain colon ":" characters, to avoid clashes with

    <p>The values of variables defined with the <code class="directive"><a href="./mod/core.html#define">Define</a></code> of or shell environment variables can

    be used in configuration file lines using the syntax <code>${VAR}</code>.

    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 <code class="directive"><a href="./mod/core.html#define">Define</a></code> take

    precedence over shell environment variables.

    If the "VAR" variable is not found, the characters <code>${VAR}</code>

    are left unchanged, and a warning is logged.

    Variable names may not contain colon ":" characters, to avoid clashes with

    <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>'s syntax.</p>



    <p>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 <code class="directive"><a href="./mod/mod_env.html#&#10;    setenv">

    SetEnv</a></code>, take effect too late to be used for expansions in the

    configuration file.</p>

    configuration file itself, for example with <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code>, take effect too late to be used for

    expansions in the configuration file.</p>



    <p>The maximum length of a line in the configuration file, after

    variable substitution, joining any continued lines and removing leading

docs/manual/configuring.xml.de

+1 −1
Changes for docs/manual/configuring.xml.de: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>

<!-- English Revision: 420990:1003217 (outdated) -->

<!-- English Revision: 420990:1061758 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/configuring.xml.ja

+1 −1
Changes for docs/manual/configuring.xml.ja: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>

<!-- English Revision: 420990:1003217 (outdated) -->

<!-- English Revision: 420990:1061758 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/configuring.xml.ko

+1 −1
Changes for docs/manual/configuring.xml.ko: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='EUC-KR' ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>

<!-- English Revision: 420990:1003217 (outdated) -->

<!-- English Revision: 420990:1061758 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/configuring.xml.tr

+1 −1
Changes for docs/manual/configuring.xml.tr: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' ?>

<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>

<!-- English Revision: 830237:1003217 (outdated) -->

<!-- English Revision: 830237:1061758 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more