From: Joe Orton Date: Thu, 9 Mar 2017 08:40:28 +0000 (+0000) Subject: Regenerate docs. X-Git-Tag: 2.5.0-alpha~575 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=041c8dd52672e1a408db952a3588c9085734a6ea;p=thirdparty%2Fapache%2Fhttpd.git Regenerate docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786111 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 715cbe7b789..176352c618e 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -75,8 +75,10 @@ available
  • HttpProtocolOptions
  • <If>
  • <IfDefine>
    • +
  • <IfDirective>
  • <IfFile>
  • <IfModule>
    • +
  • <IfSection>
  • Include
  • IncludeOptional
  • KeepAlive
    • @@ -859,12 +861,12 @@ which no other media type configuration could be found. Status:Core Module:core -

    In its one parameter form, Define is equivalent - to passing the -D argument to httpd. It - can be used to toggle the use of - <IfDefine> sections - without needing to alter -D arguments in any startup - scripts.

    +

    In its one parameter form, Define is + equivalent to passing the -D argument to + httpd. It can be used to toggle the use of + <IfDefine> + sections without needing to alter -D arguments in any + startup scripts.

    In addition to that, if the second parameter is given, a config variable is set to this value. The variable can be used in the configuration using @@ -2282,6 +2284,50 @@ if a test is true at startup </IfDefine> + +

    top
    +

    <IfDirective> Directive

    + + + + + + + +
    Description:Encloses directives that are processed conditional on the +presence or absence of a specific directive
    Syntax:<IfDirective [!]directive-name> ... + </IfDirective>
    Context:server config, virtual host, directory, .htaccess
    Override:All
    Status:Core
    Module:core
    +

    The <IfDirective test>...</IfDirective> + section is used to mark directives that are conditional on the presence of + a specific directive. The directives within an <IfDirective> section are only processed if the test + is true. If test is false, everything between the start and + end markers is ignored.

    + +

    The test in the <IfDirective> section can be one of two forms:

    + + + +

    In the former case, the directives between the start and end + markers are only processed if a directive of the given name is + available at the time of processing. The second format reverses the test, + and only processes the directives if the directive-name is + not defined.

    + +
    This section should only be used if you need to have one + configuration file that works across multiple versions of + httpd, regardless of whether a particular + directive is available. In normal operation, directives need not + be placed in <IfDirective> + sections.
    + +

    See also

    +
    top

    <IfFile> Directive

    @@ -2369,6 +2415,63 @@ presence or absence of a specific module placed in <IfModule> sections.
    + +
    top
    +

    <IfSection> Directive

    + + + + + + + +
    Description:Encloses directives that are processed conditional on the +presence or absence of a specific section directive
    Syntax:<IfSection [!]section-name> ... + </IfSection>
    Context:server config, virtual host, directory, .htaccess
    Override:All
    Status:Core
    Module:core
    +

    The <IfSection + test>...</IfSection> section is used + to mark directives that are conditional on the presence of a + specific section directive. A section directive is any directive + such as <virtualhost> which + encloses other directives, and has a directive name with a leading + "<". The sec + + The directives within an <IfSection> section are only processed if the test + is true. If test is false, everything between the start and + end markers is ignored.

    + +

    The section-name specified must not include the + leading "<". The test in the <IfSection> section can be one of two + forms:

    + + + +

    In the former case, the directives between the start and + end markers are only processed if a section directive of the given + name is available at the time of processing. The second format + reverses the test, and only processes the directives if the + section-name is not defined.

    + +

    For example:

    + + 
    <IfSection VirtualHost>
+   ...
+</IfSection>
    + + +
    This section should only be used if you need to have one + configuration file that works across multiple versions of httpd, + regardless of whether a particular section directive is + available. In normal operation, directives need not be placed in + <IfSection> sections.
    + +

    See also

    +
    top

    Include Directive

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 3f469f73189..345f3e30742 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 98c7b838769..0d6e8f7a274 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_log_debug.xml.meta b/docs/manual/mod/mod_log_debug.xml.meta index d52c5b7c16e..b0ef3d604a7 100644 --- a/docs/manual/mod/mod_log_debug.xml.meta +++ b/docs/manual/mod/mod_log_debug.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 328a40e1bed..f1ecb1771e3 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -555,12 +555,18 @@ satisfied by a request at runtime <IfDefine [!]parameter-name> ... </IfDefine>svdhCEncloses directives that will be processed only if a test is true at startup -<IfFile [!]parameter-name> ... - </IfFile>svdhCEncloses directives that will be processed only +<IfDirective [!]directive-name> ... + </IfDirective>svdhCEncloses directives that are processed conditional on the +presence or absence of a specific directive +<IfFile [!]parameter-name> ... + </IfFile>svdhCEncloses directives that will be processed only if file exists at startup -<IfModule [!]module-file|module-identifier> ... - </IfModule>svdhCEncloses directives that are processed conditional on the +<IfModule [!]module-file|module-identifier> ... + </IfModule>svdhCEncloses directives that are processed conditional on the presence or absence of a specific module +<IfSection [!]section-name> ... + </IfSection>svdhCEncloses directives that are processed conditional on the +presence or absence of a specific section directive <IfVersion [[!]operator] version> ... </IfVersion>svdhEcontains version dependent configuration ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files