Fix some whitespace issues

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330318 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/rewrite/access.html.en b/docs/manual/rewrite/access.html.en
index b31b8fcaff781a4ffa8e980b9acadef5b2f08cf5..0b6896e17f928b106cf0945caff6b245308ee1b8 100644 (file)
--- a/docs/manual/rewrite/access.html.en
+++ b/docs/manual/rewrite/access.html.en
@@ -187,9 +187,9 @@ RewriteRule ^<strong>/secret/files/</strong>   -   [<strong>F</strong>]
       <pre class="prettyprint lang-config">
 SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 &lt;Location /secret/files&gt;
-       Order allow,deny
-       Allow from all
-       Deny from env=goaway
+    Order allow,deny
+    Allow from all
+    Deny from env=goaway
 &lt;/Location&gt;
       </pre>
 

diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml
index 7e04240db0c1c788be6382c19a175e5e5a828f2b..2b6c677c5b514059afd5bf0c669d7acffa837891 100644 (file)
--- a/docs/manual/rewrite/access.xml
+++ b/docs/manual/rewrite/access.xml
@@ -187,9 +187,9 @@ RewriteRule ^<strong>/secret/files/</strong>   -   [<strong>F</strong>]
       <highlight language="config">
 SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 &lt;Location /secret/files&gt;
-       Order allow,deny
-       Allow from all
-       Deny from env=goaway
+    Order allow,deny
+    Allow from all
+    Deny from env=goaway
 &lt;/Location&gt;
       </highlight>
       <p>

diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en
index 5185a43752e6416009549c5ebdf986c63dfd653f..f66b18f4aaa55c2f534b160e8209bd7f23f945d2 100644 (file)
--- a/docs/manual/rewrite/avoid.html.en
+++ b/docs/manual/rewrite/avoid.html.en
@@ -91,13 +91,13 @@ following:</p>
 
 <pre class="prettyprint lang-config">
 &lt;VirtualHost *:80&gt;
-       ServerName www.example.com
-       Redirect / https://www.example.com/
+    ServerName www.example.com
+    Redirect / https://www.example.com/
 &lt;/VirtualHost &gt;
 
 &lt;VirtualHost *:443&gt;
-       ServerName www.example.com
-       # ... SSL configuration goes here
+    ServerName www.example.com
+    # ... SSL configuration goes here
 &lt;/VirtualHost &gt;
 </pre>
 
@@ -212,7 +212,7 @@ hostname, such as <code>www.example.com</code> instead of
 
 <pre class="prettyprint lang-config">
 &lt;If "$req{Host} != 'www.example.com'"&gt;
-       RedirectMatch (.*) http://www.example.com$1
+    RedirectMatch (.*) http://www.example.com$1
 &lt;/If&gt;
 </pre>
 

diff --git a/docs/manual/rewrite/avoid.xml b/docs/manual/rewrite/avoid.xml
index fa79a6fa589bc910719ea6da3f7e173742cc8c45..89833228ad8b4ea15f0a65da029edbafed0a7dc5 100644 (file)
--- a/docs/manual/rewrite/avoid.xml
+++ b/docs/manual/rewrite/avoid.xml
@@ -97,13 +97,13 @@ following:</p>
 
 <highlight language="config">
 &lt;VirtualHost *:80&gt;
-       ServerName www.example.com
-       Redirect / https://www.example.com/
+    ServerName www.example.com
+    Redirect / https://www.example.com/
 &lt;/VirtualHost &gt;
 
 &lt;VirtualHost *:443&gt;
-       ServerName www.example.com
-       # ... SSL configuration goes here
+    ServerName www.example.com
+    # ... SSL configuration goes here
 &lt;/VirtualHost &gt;
 </highlight>
 
@@ -218,7 +218,7 @@ module="core" type="section">If</directive> directive, as shown here:</p>
 
 <highlight language="config">
 &lt;If "$req{Host} != 'www.example.com'"&gt;
-       RedirectMatch (.*) http://www.example.com$1
+    RedirectMatch (.*) http://www.example.com$1
 &lt;/If&gt;
 </highlight>
 

diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index f76cd17fe602c01d888379ee314505fbb34108c9..5f7c2d8f73b0471ca8a0245c66ba520e6470bbcb 100644 (file)
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1311806 -->
+<!-- English Revision: 1311806:1330312 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index 912229af035fb274402498f5449e79893fcdc4f0..e4f3ee6f49579d22f3ac151854846aa839f83758 100644 (file)
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en
index 76966b1fe40c39fd5d62f2c786355d3d83f51e16..485b3b023f06b4fd900584ed87c09893e9648d79 100644 (file)
--- a/docs/manual/rewrite/remapping.html.en
+++ b/docs/manual/rewrite/remapping.html.en
@@ -120,9 +120,7 @@ RewriteRule    ^<strong>/foo</strong>\.html$  <strong>bar</strong>.html  [<stron
     use the Redirect directive. mod_rewrite was used in that earlier
     example in order to hide the redirect from the client:</p>
 
-    <pre class="prettyprint lang-config">
-    Redirect /foo.html /bar.html
-    </pre>
+    <pre class="prettyprint lang-config">Redirect /foo.html /bar.html</pre>
 
 
     </dd>
@@ -231,14 +229,12 @@ RewriteRule    ^foo\.<strong>html</strong>$  foo.<strong>cgi</strong>  [H=<stron
 #   rewriting document.html to document.php
 #   when and only when document.php exists
 &lt;Directory /var/www/htdocs&gt;
-<span class="indent">
-RewriteEngine on
-RewriteBase /var/www/htdocs
+    RewriteEngine on
+    RewriteBase /var/www/htdocs
 
-RewriteCond $1.php -f
-RewriteCond $1.html !-f
-RewriteRule ^(.*).html$ $1.php
-</span>
+    RewriteCond $1.php -f
+    RewriteCond $1.html !-f
+    RewriteRule ^(.*).html$ $1.php
 &lt;/Directory&gt;
 </pre>
 

diff --git a/docs/manual/rewrite/remapping.xml b/docs/manual/rewrite/remapping.xml
index 3d47432317458a0cdf6dbc53b85499ab5ded6de7..3f615d38ebac065dd44474384fa692eb695990f3 100644 (file)
--- a/docs/manual/rewrite/remapping.xml
+++ b/docs/manual/rewrite/remapping.xml
@@ -116,9 +116,7 @@ RewriteRule    ^<strong>/foo</strong>\.html$  <strong>bar</strong>.html  [<stron
     use the Redirect directive. mod_rewrite was used in that earlier
     example in order to hide the redirect from the client:</p>
 
-    <highlight language="config">
-    Redirect /foo.html /bar.html
-    </highlight>
+    <highlight language="config">Redirect /foo.html /bar.html</highlight>
 
     </dd>
   </dl>
@@ -222,14 +220,12 @@ RewriteRule    ^foo\.<strong>html</strong>$  foo.<strong>cgi</strong>  [H=<stron
 #   rewriting document.html to document.php
 #   when and only when document.php exists
 &lt;Directory /var/www/htdocs&gt;
-<indent>
-RewriteEngine on
-RewriteBase /var/www/htdocs
+    RewriteEngine on
+    RewriteBase /var/www/htdocs
 
-RewriteCond $1.php -f
-RewriteCond $1.html !-f
-RewriteRule ^(.*).html$ $1.php
-</indent>
+    RewriteCond $1.php -f
+    RewriteCond $1.html !-f
+    RewriteRule ^(.*).html$ $1.php
 &lt;/Directory&gt;
 </highlight>
     </dd>

diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en
index 3e4f62429b9eb6fe3f09594504483bc8493defd8..3941a9c10acfe27af60ba1ae68297fee60b6fdac 100644 (file)
--- a/docs/manual/rewrite/rewritemap.html.en
+++ b/docs/manual/rewrite/rewritemap.html.en
@@ -143,8 +143,8 @@ may be used, and give examples of each.</p>
     recipe:</p>
 
     <pre class="prettyprint lang-config"><strong>#Product to ID configuration</strong>
-    RewriteMap product2id txt:/etc/apache2/productmap.txt
-    RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
+RewriteMap product2id txt:/etc/apache2/productmap.txt
+RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
     </pre>
 
 
@@ -325,9 +325,9 @@ by many requests.
     the int function, and then use that in your <code>RewriteRule</code>:
     </p>
 
-    <pre class="prettyprint lang-config"><strong>Redirect a URI to an all-lowercase version of itself</strong>
-    RewriteMap lc int:tolower
-    RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
+    <pre class="prettyprint lang-config"><strong>#Redirect a URI to an all-lowercase version of itself</strong>
+RewriteMap lc int:tolower
+RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
     </pre>
 
 

diff --git a/docs/manual/rewrite/rewritemap.xml b/docs/manual/rewrite/rewritemap.xml
index e03df546791ff22d7dd4704dbd6ded8c38ef7e62..7e4c95e69ecdc4e12a63209934e8506483480e0b 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml
+++ b/docs/manual/rewrite/rewritemap.xml
@@ -135,8 +135,8 @@ may be used, and give examples of each.</p>
     recipe:</p>
 
     <highlight language="config"><strong>#Product to ID configuration</strong>
-    RewriteMap product2id txt:/etc/apache2/productmap.txt
-    RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
+RewriteMap product2id txt:/etc/apache2/productmap.txt
+RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
     </highlight>
 
     <p>We assume here that the <code>prods.php</code> script knows what
@@ -312,9 +312,9 @@ by many requests.
     the int function, and then use that in your <code>RewriteRule</code>:
     </p>
 
-    <highlight language="config"><strong>Redirect a URI to an all-lowercase version of itself</strong>
-    RewriteMap lc int:tolower
-    RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
+    <highlight language="config"><strong>#Redirect a URI to an all-lowercase version of itself</strong>
+RewriteMap lc int:tolower
+RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
     </highlight>
 
     <note>