backports minor fixes

Merge r635137 from trunk:
Pet peeve: fix capitalisation of 'Require' directive

Merge r450473 from trunk:
Minor typo

Merge r545834 from trunk:
Fix a typo, as per PR 40447.

Submitted by Tony Stevenson.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@655823 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_authz_user.xml b/docs/manual/mod/mod_authz_user.xml
index b40018f2e361b6167ce8d6e4a05e0ddb743e7371..c06366a9b9691a216b59e87727f4114f2145714d 100644 (file)
--- a/docs/manual/mod/mod_authz_user.xml
+++ b/docs/manual/mod/mod_authz_user.xml
@@ -34,7 +34,7 @@
     authenticated users can be allowed or denied access to portions
     of the web site. <module>mod_authz_user</module> grants
     access if the authenticated user is listed in a <code>Require user</code>
-    directive. Alternatively <code>require valid-user</code> can be used to
+    directive. Alternatively <code>Require valid-user</code> can be used to
     grant access to all successfully authenticated users.</p>
 </summary>
 <seealso><directive module="core">Require</directive></seealso>

diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
index 127e4122b4c119f831c79f51e4463d1412decc67..a086ef3fe8aaf2e3cc2533b65ea00da7d2d60b65 100644 (file)
--- a/docs/manual/mod/mod_dav.xml
+++ b/docs/manual/mod/mod_dav.xml
@@ -91,7 +91,7 @@
          <br />
          &lt;LimitExcept GET OPTIONS&gt;<br />
          <indent>
-           require user admin<br />
+           Require user admin<br />
          </indent>
          &lt;/LimitExcept&gt;<br />
        </indent>

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 3be866037ddc60c765f2469863ce0825f656fa1c..52555c51fcb6d4db2212770e359feea052daa455 100644 (file)
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -43,7 +43,7 @@ configuration</description>
 
     <p>You may wish to use <module>mod_access</module> inside the
     <directive type="section" module="core">Location</directive>
-    directive to limite access to your server configuration
+    directive to limit access to your server configuration
     information:</p>
 
     <example>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index a733d0e81443decbba7767354e00c5b8b8b3d38b..dc544779a4ccc862484a7b9ceab6cb7677efdfdf 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -639,7 +639,7 @@ expressions</description>
         <th>Description</th></tr>
     <tr><td>min</td>
         <td>0</td>
-        <td>Minumum number of connections that will always
+        <td>Minimum number of connections that will always
             be open to the backend server.</td></tr>
     <tr><td>max</td>
         <td>1...n</td>

diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml
index 4f9e10a25f49003932bdeb795f72cc04b2ab1143..87c9a0235a591e8891e370ee2b0c96b5a13b8e6e 100644 (file)
--- a/docs/manual/ssl/ssl_howto.xml
+++ b/docs/manual/ssl/ssl_howto.xml
@@ -205,7 +205,7 @@ AuthName             "Snake Oil Authentication"
 AuthType             Basic
 AuthBasicProvider    file
 AuthUserFile         /usr/local/apache2/conf/httpd.passwd
-require              valid-user
+Require              valid-user
 &lt;/Directory&gt;</pre>
     </example>