From: Mike Rumph Date: Wed, 4 Jun 2014 17:39:03 +0000 (+0000) Subject: Remove redundant paragraph and fix grammar errors. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da36e237ddf3b3cb0d4b4040856714ae95ee34a8;p=thirdparty%2Fapache%2Fhttpd.git Remove redundant paragraph and fix grammar errors. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1600383 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 8e0ebf3adcb..6a3d3565060 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -143,22 +143,13 @@ subrequest. Additionally, SetEnvIf directives are not separately evaluated in the subrequest due to the API phases - mod_setenvif.

- - -

When the server looks up a path via an internal subrequest, - such as looking for a DirectoryIndex or generating a directory listing with - mod_autoindex, per-request environment variables are - not inherited in the subrequest. Additionally, environment - SetEnvIf directives - are not separately evaluated in the subrequest due to the API phases mod_setenvif takes action in.

Require all

-

The all provider mimics the functionality the +

The all provider mimics the functionality that was previously provided by the 'Allow from all' and 'Deny from all' directives. This provider can take one of two arguments which are 'granted' or 'denied'. The following examples will grant or deny @@ -174,7 +165,7 @@

Require method

-

The method provider allows to use the HTTP method in +

The method provider allows using the HTTP method in authorization decisions. The GET and HEAD methods are treated as equivalent. The TRACE method is not available to this provider, use TraceEnable instead.

@@ -199,7 +190,7 @@

Require expr

-

The expr provider allows to base authorization +

The expr provider allows basing authorization decisions on arbitrary expressions.

Require expr %{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17
@@ -225,7 +216,7 @@ through the Require directive in the same way as a base authorization provider. Besides the ability to create and alias an extended provider, it also allows the same extended - authorization provider to be reference by multiple locations. + authorization provider to be referenced by multiple locations.

Example

@@ -279,11 +270,11 @@ sections.

When authorization is enabled, it is normally inherited by each subsequent configuration section, - unless a different set of authorization directives are specified. + unless a different set of authorization directives is specified. This is the default action, which corresponds to an explicit setting of AuthMerging Off.

-

However, there may be circumstances in which is it desirable +

However, there may be circumstances in which it is desirable for a configuration section's authorization to be combined with that of its predecessor while configuration sections are being merged. Two options are available for this case, And diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml index 1425f0d42f5..94a1e4d043b 100644 --- a/docs/manual/mod/mod_authz_core.xml +++ b/docs/manual/mod/mod_authz_core.xml @@ -125,23 +125,13 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in subrequest. Additionally, SetEnvIf directives are not separately evaluated in the subrequest due to the API phases - mod_setenvif.

- - -

When the server looks up a path via an internal subrequest, - such as looking for a DirectoryIndex or generating a directory listing with - mod_autoindex, per-request environment variables are - not inherited in the subrequest. Additionally, environment - SetEnvIf directives - are not separately evaluated in the subrequest due to the API phases mod_setenvif takes action in.

Require all -

The all provider mimics the functionality the +

The all provider mimics the functionality that was previously provided by the 'Allow from all' and 'Deny from all' directives. This provider can take one of two arguments which are 'granted' or 'denied'. The following examples will grant or deny @@ -159,7 +149,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in

Require method -

The method provider allows to use the HTTP method in +

The method provider allows using the HTTP method in authorization decisions. The GET and HEAD methods are treated as equivalent. The TRACE method is not available to this provider, use TraceEnable instead.

@@ -186,7 +176,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
Require expr -

The expr provider allows to base authorization +

The expr provider allows basing authorization decisions on arbitrary expressions.

@@ -215,7 +205,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in through the Require directive in the same way as a base authorization provider. Besides the ability to create and alias an extended provider, it also allows the same extended - authorization provider to be reference by multiple locations. + authorization provider to be referenced by multiple locations.

Example @@ -526,11 +516,11 @@ sections.

When authorization is enabled, it is normally inherited by each subsequent configuration section, - unless a different set of authorization directives are specified. + unless a different set of authorization directives is specified. This is the default action, which corresponds to an explicit setting of AuthMerging Off.

-

However, there may be circumstances in which is it desirable +

However, there may be circumstances in which it is desirable for a configuration section's authorization to be combined with that of its predecessor while configuration sections are being merged. Two options are available for this case, And