From: Daniel Gruno <humbedooh@apache.org>
Date: Wed, 9 May 2012 07:50:51 +0000 (+0000)
Subject: backport whitespace/newline changes to 2.4
X-Git-Tag: 2.4.3~465
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abd292588b22dd2f2d0822fdf50dbd8f42fd7f72;p=apache

backport whitespace/newline changes to 2.4

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

diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml
index 8a319dbfc3..2d45a0bbe1 100644
--- a/docs/manual/rewrite/access.xml
+++ b/docs/manual/rewrite/access.xml
@@ -185,7 +185,10 @@ RewriteRule ^/secret/files/   -   [F]
       <highlight language="config">
 SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 &lt;Location /secret/files&gt;
-    Require not env goaway
+    &lt;RequireAll&gt;
+        Require all granted
+        Require not env goaway
+    &lt;/RequireAll&gt;
 &lt;/Location&gt;
       </highlight>
       <p>
@@ -287,7 +290,7 @@ RewriteRule ^ ${deflector:%{HTTP_REFERER}} [R,L]
       we just wish to redirect back to where they came from, a "-" is
       placed in the map:</p>
 
-<example>
+<highlight language="config">
 ##<br />
 ##  deflector.map<br />
 ##<br />
@@ -295,7 +298,7 @@ RewriteRule ^ ${deflector:%{HTTP_REFERER}} [R,L]
 http://badguys.example.com/bad/index.html    -<br />
 http://badguys.example.com/bad/index2.html   -<br />
 http://badguys.example.com/bad/index3.html   http://somewhere.example.com/
-</example>
+</highlight>
 
     </dd>
   </dl>
diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml
index 5464727361..1302e8b4e5 100644
--- a/docs/manual/rewrite/advanced.xml
+++ b/docs/manual/rewrite/advanced.xml
@@ -94,10 +94,8 @@ http://physical_host_of_user1/u/user/anypath
 
 <highlight language="config">
 RewriteEngine on
-
 RewriteMap      users-to-hosts   txt:/path/to/map.users-to-hosts
-
-RewriteRule   ^/u/<strong>([^/]+)</strong>/?(.*)   http://<strong>${users-to-hosts:$1|server0}</strong>/u/$1/$2
+RewriteRule   ^/u/([^/]+)/?(.*)   http://${users-to-hosts:$1|server0}/u/$1/$2
 </highlight>
     </dd>
   </dl>
@@ -129,7 +127,7 @@ RewriteRule   ^/u/<strong>([^/]+)</strong>/?(.*)   http://<strong>${users-to-hos
 
 <highlight language="config">
 # This example is valid in per-directory context only
-RewriteCond %{REQUEST_URI}   <strong>!-U</strong>
+RewriteCond %{REQUEST_URI}   !-U
 RewriteRule ^(.+)\.html$          /regenerate_page.cgi   [PT,L]
 </highlight>
 
@@ -172,7 +170,6 @@ RewriteRule ^(.+)\.html$          /regenerate_page.cgi   [PT,L]
 <highlight language="config">
 RewriteEngine on
 RewriteMap lb rnd:/path/to/serverlist.txt
-
 RewriteRule ^/(.*) http://${lb:servers}/$1 [P,L]
 </highlight>
 
diff --git a/docs/manual/rewrite/proxy.xml b/docs/manual/rewrite/proxy.xml
index 6d8a314a76..0a881f256c 100644
--- a/docs/manual/rewrite/proxy.xml
+++ b/docs/manual/rewrite/proxy.xml
@@ -68,7 +68,7 @@ A number of recipes are provided that describe common scenarios.</p>
 <highlight language="config">
 RewriteEngine  on
 RewriteBase    /products/
-RewriteRule    ^<strong>widget/</strong>(.*)$  <strong>http://product.example.com/widget/</strong>$1  [<strong>P</strong>]
+RewriteRule    ^widget/(.*)$  http://product.example.com/widget/$1  [P]
 ProxyPassReverse /products/widget/ http://product.example.com/widget/
 </highlight>
 
@@ -78,9 +78,9 @@ ProxyPassReverse /products/widget/ http://product.example.com/widget/
    has been migrated yet.</p>
 
 <highlight language="config">
-RewriteCond %{REQUEST_FILENAME}       <strong>!-f</strong>
-RewriteCond %{REQUEST_FILENAME}       <strong>!-d</strong>
-RewriteRule ^/(.*) http://<strong>old</strong>.example.com/$1 [<strong>P</strong>]
+RewriteCond %{REQUEST_FILENAME}       !-f
+RewriteCond %{REQUEST_FILENAME}       !-d
+RewriteRule ^/(.*) http://old.example.com/$1 [P]
 ProxyPassReverse / http://old.example.com/
 </highlight>
     </dd>
diff --git a/docs/manual/rewrite/remapping.xml b/docs/manual/rewrite/remapping.xml
index 948efd587b..c20a976569 100644
--- a/docs/manual/rewrite/remapping.xml
+++ b/docs/manual/rewrite/remapping.xml
@@ -187,7 +187,7 @@ Redirect /docs/ http://new.example.com/docs/
 <highlight language="config">
 RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.<strong>html</strong>$  foo.<strong>cgi</strong>  [H=<strong>cgi-script</strong>]
+RewriteRule    ^foo\.html$  foo.cgi &nbsp; [H=<strong>cgi-script</strong>]
 </highlight>
     </dd>
   </dl>
@@ -476,8 +476,8 @@ com       http://www.example.com/<br />
 RewriteCond %{HTTP_USER_AGENT}  ^<strong>Mozilla/3</strong>.*
 RewriteRule ^foo\.html$         foo.<strong>NS</strong>.html          [<strong>L</strong>]
 
-RewriteCond %{HTTP_USER_AGENT}  ^<strong>Lynx/</strong>         [OR]
-RewriteCond %{HTTP_USER_AGENT}  ^<strong>Mozilla/[12]</strong>
+RewriteCond %{HTTP_USER_AGENT}  ^Lynx/ [OR]
+RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/[12]
 RewriteRule ^foo\.html$         foo.<strong>20</strong>.html          [<strong>L</strong>]
 
 RewriteRule ^foo\.html$         foo.<strong>32</strong>.html          [<strong>L</strong>]
@@ -551,7 +551,7 @@ using the following ruleset:</p>
 
 <highlight language="config">
 RewriteEngine on
-RewriteRule   <strong>^/$</strong>  /about/  [<strong>R</strong>]
+RewriteRule   ^/$  /about/  [<strong>R</strong>]
 </highlight>
 
 <p>Note that this can also be handled using the <directive