Merge docs tweaks from trunk

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

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index da17b562441bc7c3f90cfae1cb5515b650e9bcb0..cecd792d1393efd6e2c7ea1f221c232576fc6b34 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -519,7 +519,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
 # Only allow access to this content during business hours
 &lt;Directory "/foo/bar/business"&gt;
-    Require expr %{TIME_HOUR} -gt 9 &amp;&amp; %{TIME_HOUR} -lt 17 
+    Require expr "%{TIME_HOUR} -gt 9 &amp;&amp; %{TIME_HOUR} -lt 17"
 &lt;/Directory&gt;     
        </highlight>
 </section>

diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 7f1f9bca842c8a158717ce2a48ec8028c633b77a..8e29ffa39537d2d6420ce66c530270476884adfa 100644 (file)
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -218,7 +218,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
   decisions on arbitrary expressions.</p>
 
     <highlight language="config">
-        Require expr %{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17 
+        Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"
     </highlight>
 
   <p>The syntax is described in the <a href="../expr.html">ap_expr</a>

diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 016d83586644ba556b168b305840a9e0b27a557f..c2b394143ef9c51322e485ce29e1e3722590439e 100644 (file)
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -97,12 +97,12 @@
     <p>Then a request for <code>http://www.example.com/fish/</code> will
     cause httpd to attempt to serve the file
     <code>/var/www/html/fish/index.html</code>. In the event that
-    that file didn't exist, it will next attempt to serve file file
+    that file does not exist, it will next attempt to serve the file
     <code>/var/www/html/fish/index.php</code>.</p>
 
-    <p>If neither of these files existed, the next step would be to
+    <p>If neither of these files existed, the next step is to
     attempt to provide a directory index, if
-    <module>mod_autoindex</module> were loaded and configured to permit
+    <module>mod_autoindex</module> is loaded and configured to permit
     that.</p>
 
     <p>httpd is also capable of <a href="vhosts/">Virtual