From 20deaccf3edbea3d8df850de3e01b0649811a490 Mon Sep 17 00:00:00 2001 From: Joshua Slive Date: Wed, 23 Jul 2003 19:36:36 +0000 Subject: Hit a couple files that hadn't been adapted to account for the move from to git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100748 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directive-dict.html.en | 10 ++++------ docs/manual/mod/directive-dict.xml | 13 +++++++------ docs/manual/mod/mod_headers.html.en | 26 ++++++-------------------- docs/manual/mod/mod_headers.xml | 30 +++++++++--------------------- docs/manual/sections.html.en | 5 +++++ docs/manual/sections.xml | 6 ++++++ 6 files changed, 37 insertions(+), 53 deletions(-) (limited to 'docs') diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en index 3ce60ea7fb..eb831825d2 100644 --- a/docs/manual/mod/directive-dict.html.en +++ b/docs/manual/mod/directive-dict.html.en @@ -169,12 +169,10 @@
directory
A directive marked as being valid in this context may be - used inside <Directory>, - <Location>, - and <Files> - containers in the server configuration files, subject to the - restrictions outlined in How - Directory, Location and Files sections work.
+ used inside <Directory>, <Location>, <Files>, and <Proxy> containers + in the server configuration files, subject to the restrictions + outlined in Configuration + Sections.
.htaccess
diff --git a/docs/manual/mod/directive-dict.xml b/docs/manual/mod/directive-dict.xml index d07acfc23a..1c82866d6c 100644 --- a/docs/manual/mod/directive-dict.xml +++ b/docs/manual/mod/directive-dict.xml @@ -147,12 +147,13 @@
A directive marked as being valid in this context may be used inside Directory, - Location, - and Files - containers in the server configuration files, subject to the - restrictions outlined in How - Directory, Location and Files sections work.
+ type="section">Directory, Location, Files, and Proxy containers + in the server configuration files, subject to the restrictions + outlined in Configuration + Sections.
.htaccess
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index 5402b6b23d..e855782041 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -50,27 +50,13 @@ is available only in Apache 2.0

Order of Processing

-

The directives provided by mod_headers can occur - almost anywhere within the server configuration. They are valid in the - main server config and virtual host sections, inside - <Directory>, - <Location> and - <Files> sections, - and within .htaccess files.

+

The directives provided by mod_headers can + occur almost anywhere within the server configuration, and can be + limited in scope by enclosing them in configuration sections.

-

The directives are processed in the following order:

- -
    -
  1. main server
    2. -
  2. virtual host
    3. -
  3. <Directory> sections and - .htaccess
    4. -
  4. <Files>
    5. -
  5. <Location>
    6. -
- -

Order is important. These two headers have a different - effect if reversed:

+

Order of processing is important and is affected both by the + order in the configuration file and by placement in configuration sections. These + two headers have a different effect if reversed:

RequestHeader append MirrorID "mirror 12"
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index 8630ebc128..a3043c34b9 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -20,27 +20,15 @@ is available only in Apache 2.0

Order of Processing -

The directives provided by mod_headers can occur - almost anywhere within the server configuration. They are valid in the - main server config and virtual host sections, inside - Directory, - Location and - Files sections, - and within .htaccess files.

- -

The directives are processed in the following order:

- -
    -
  1. main server
    2. -
  2. virtual host
    3. -
  3. Directory sections and - .htaccess
    4. -
  4. Files
    5. -
  5. Location
    6. -
- -

Order is important. These two headers have a different - effect if reversed:

+

The directives provided by mod_headers can + occur almost anywhere within the server configuration, and can be + limited in scope by enclosing them in configuration sections.

+ +

Order of processing is important and is affected both by the + order in the configuration file and by placement in configuration sections. These + two headers have a different effect if reversed:

RequestHeader append MirrorID "mirror 12"
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index 12483d1cee..0bd9ef0016 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -376,6 +376,11 @@ are interpreted, it is important to understand how this works.

the virtual host definition. This allows virtual hosts to override the main server configuration.

+

When the request is served by mod_proxy, the + <Proxy> + container takes the place of the <Directory> container in the processing + order.

+

Later sections override earlier ones.

Technical Note

diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 2685e4e498..7027d69cbe 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -400,6 +400,12 @@ are interpreted, it is important to understand how this works.

the virtual host definition. This allows virtual hosts to override the main server configuration.

+

When the request is served by mod_proxy, the + Proxy + container takes the place of the Directory container in the processing + order.

+

Later sections override earlier ones.

Technical Note -- cgit v1.2.1