You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mr...@apache.org on 2014/06/04 20:02:10 UTC
svn commit: r1600400 - in /httpd/httpd/branches/2.4.x/docs/manual/mod:
mod_authz_core.html.en mod_authz_core.xml quickreference.html.en
Author: mrumph
Date: Wed Jun 4 18:02:10 2014
New Revision: 1600400
URL: http://svn.apache.org/r1600400
Log:
Remove redundant paragraph and fix grammar errors.
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en?rev=1600400&r1=1600399&r2=1600400&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en Wed Jun 4 18:02:10 2014
@@ -69,7 +69,7 @@
through the <code class="directive"><a href="#require">Require</a></code> 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.
</p>
<h3><a name="example" id="example">Example</a></h3>
@@ -190,22 +190,13 @@ Alias /secure /webpages/secure
subrequest. Additionally,
<code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> directives
are not separately evaluated in the subrequest due to the API phases
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>.</p>
-
-
- <p>When the server looks up a path via an internal subrequest,
- such as looking for a <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> or generating a directory listing with
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>, per-request environment variables are
- <em>not</em> inherited in the subrequest. Additionally, environment
- <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> directives
- are not separately evaluated in the subrequest due to the API phases
<code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> takes action in.</p>
<h3><a name="reqall" id="reqall">Require all</a></h3>
- <p>The <code>all</code> provider mimics the functionality the
+ <p>The <code>all</code> 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
@@ -221,7 +212,7 @@ Alias /secure /webpages/secure
<h3><a name="reqmethod" id="reqmethod">Require method</a></h3>
- <p>The <code>method</code> provider allows to use the HTTP method in
+ <p>The <code>method</code> 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 <code class="directive"><a href="../mod/core.html#traceenable">TraceEnable</a></code> instead.</p>
@@ -246,7 +237,7 @@ Alias /secure /webpages/secure
<h3><a name="reqexpr" id="reqexpr">Require expr</a></h3>
- <p>The <code>expr</code> provider allows to base authorization
+ <p>The <code>expr</code> provider allows basing authorization
decisions on arbitrary expressions.</p>
<pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"</pre>
@@ -279,11 +270,11 @@ sections.</td></tr>
</table>
<p>When authorization is enabled, it is normally inherited by each
subsequent <a href="../sections.html#merging">configuration section</a>,
- 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 <code>AuthMerging Off</code>.</p>
- <p>However, there may be circumstances in which is it desirable
+ <p>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, <code>And</code>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml?rev=1600400&r1=1600399&r2=1600400&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml Wed Jun 4 18:02:10 2014
@@ -48,7 +48,7 @@
through the <directive module="mod_authz_core">Require</directive> 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.
</p>
<section id="example"><title>Example</title>
@@ -173,23 +173,13 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
subrequest. Additionally,
<directive module="mod_setenvif">SetEnvIf</directive> directives
are not separately evaluated in the subrequest due to the API phases
- <module>mod_setenvif</module>.</p>
-
-
- <p>When the server looks up a path via an internal subrequest,
- such as looking for a <directive module="mod_dir"
- >DirectoryIndex</directive> or generating a directory listing with
- <module>mod_autoindex</module>, per-request environment variables are
- <em>not</em> inherited in the subrequest. Additionally, environment
- <directive module="mod_setenvif">SetEnvIf</directive> directives
- are not separately evaluated in the subrequest due to the API phases
<module>mod_setenvif</module> takes action in.</p>
</section>
<section id="reqall"><title>Require all</title>
- <p>The <code>all</code> provider mimics the functionality the
+ <p>The <code>all</code> 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
@@ -207,7 +197,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
<section id="reqmethod"><title>Require method</title>
- <p>The <code>method</code> provider allows to use the HTTP method in
+ <p>The <code>method</code> 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 <directive module="core">TraceEnable</directive> instead.</p>
@@ -234,7 +224,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
<section id="reqexpr"><title>Require expr</title>
- <p>The <code>expr</code> provider allows to base authorization
+ <p>The <code>expr</code> provider allows basing authorization
decisions on arbitrary expressions.</p>
<highlight language="config">
@@ -521,11 +511,11 @@ sections.</description>
<usage>
<p>When authorization is enabled, it is normally inherited by each
subsequent <a href="../sections.html#merging">configuration section</a>,
- 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 <code>AuthMerging Off</code>.</p>
- <p>However, there may be circumstances in which is it desirable
+ <p>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, <code>And</code>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en?rev=1600400&r1=1600399&r2=1600400&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en Wed Jun 4 18:02:10 2014
@@ -458,8 +458,8 @@ will exit.</td></tr>
<tr><td><a href="mod_unixd.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
requests</td></tr>
<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
-<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>
-[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]]
+<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>]
+[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]
</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
<tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
of the index listing</td></tr>
@@ -780,8 +780,8 @@ extensions</td></tr>
...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
extensions</td></tr>
<tr><td><a href="mod_headers.html#requestheader">RequestHeader add|append|edit|edit*|merge|set|setifempty|unset
-<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>
-[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]]
+<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>]
+[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]
</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
<tr class="odd"><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
[header=<var>timeout</var>[-<var>maxtimeout</var>][,MinRate=<var>rate</var>]