httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbo...@apache.org
Subject svn commit: r1481368 - in /httpd/httpd/branches/2.4.x/docs/manual: ./ expr.xml mod/ mod/mod_authz_core.xml urlmapping.xml
Date Sat, 11 May 2013 16:14:28 GMT
Author: rbowen
Date: Sat May 11 16:14:28 2013
New Revision: 1481368

URL: http://svn.apache.org/r1481368
Log:
Merge docs tweaks from trunk


Modified:
    httpd/httpd/branches/2.4.x/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/expr.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.xml
    httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml

Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual:r1481359-1481360

Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.xml?rev=1481368&r1=1481367&r2=1481368&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.xml Sat May 11 16:14:28 2013
@@ -519,7 +519,7 @@ listfunction ::= listfuncname "<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>

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1481359

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=1481368&r1=1481367&r2=1481368&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 Sat May 11 16:14:28 2013
@@ -218,7 +218,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let
   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>

Modified: httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml?rev=1481368&r1=1481367&r2=1481368&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml Sat May 11 16:14:28 2013
@@ -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



Mime
View raw message