Fix AuthzMergeRules directive name and an addl typo.

Submitted by Dan Poirier <poirier pobox.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@703266 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 e50ffa551eb48c8d468868fefb2d08eca3924916..ba3aca0c3b384ec2560094c75c054c0187521214 100644 (file)
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -115,8 +115,8 @@
 authz rules to be merged into the current <Directory> or <Location>.  
 Set to 'off' to disable merging. If set to 'off', only the authz rules defined in 
 the current &lt;Directory&gt; or &lt;Location&gt; block will apply.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthMergeRules on | off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthMergeRules on</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzMergeRules on | off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthzMergeRules on</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
@@ -128,7 +128,7 @@ the current &lt;Directory&gt; or &lt;Location&gt; block will apply.</td></tr>
     only the authorization rules that are contained with the current 
     &lt;Directory&gt; or &lt;Location&gt; block are considered. This
     allows the configuration to determine exactly how authorization will
-    be determine without having to take into consideration the 
+    be determined without having to take into consideration the 
     authorization rules that may exist above it.</p>
 
 </div>

diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 23a6447eb655822dfbda50af0345eed2e2428abb..f71a8f5854f7d89c236baf050726c8b897b178d3 100644 (file)
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -283,8 +283,8 @@ providers.</description>
 authz rules to be merged into the current &lt;Directory&gt; or &lt;Location&gt;.  
 Set to 'off' to disable merging. If set to 'off', only the authz rules defined in 
 the current &lt;Directory&gt; or &lt;Location&gt; block will apply.</description>
-<syntax>AuthMergeRules on | off</syntax>
-<default>AuthMergeRules on</default>
+<syntax>AuthzMergeRules on | off</syntax>
+<default>AuthzMergeRules on</default>
 <contextlist><context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>AuthConfig</override>
@@ -296,7 +296,7 @@ the current &lt;Directory&gt; or &lt;Location&gt; block will apply.</description
     only the authorization rules that are contained with the current 
     &lt;Directory&gt; or &lt;Location&gt; block are considered. This
     allows the configuration to determine exactly how authorization will
-    be determine without having to take into consideration the 
+    be determined without having to take into consideration the 
     authorization rules that may exist above it.</p>
 </usage>