httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject svn commit: r1600383 - in /httpd/httpd/trunk/docs/manual/mod: mod_authz_core.html.en mod_authz_core.xml
Date Wed, 04 Jun 2014 17:39:03 GMT
Author: mrumph
Date: Wed Jun  4 17:39:03 2014
New Revision: 1600383

URL: http://svn.apache.org/r1600383
Log:
Remove redundant paragraph and fix grammar errors.

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en?rev=1600383&r1=1600382&r2=1600383&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en Wed Jun  4 17:39:03 2014
@@ -143,22 +143,13 @@
     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
@@ -174,7 +165,7 @@
 
   <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>
@@ -199,7 +190,7 @@
 
   <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 &amp;&amp;
%{TIME_HOUR} -le 17</pre>
@@ -225,7 +216,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>
@@ -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/trunk/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml?rev=1600383&r1=1600382&r2=1600383&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml Wed Jun  4 17:39:03 2014
@@ -125,23 +125,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
@@ -159,7 +149,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>
@@ -186,7 +176,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">
@@ -215,7 +205,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
     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>
@@ -526,11 +516,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>



Mime
View raw message