From 00fb4897e190bb26895f0d021b8321f8d623ec7d Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Wed, 25 Apr 2012 14:48:49 +0000 Subject: [PATCH] Fix some whitespace issues git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330318 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/rewrite/access.html.en | 6 +++--- docs/manual/rewrite/access.xml | 6 +++--- docs/manual/rewrite/avoid.html.en | 10 +++++----- docs/manual/rewrite/avoid.xml | 10 +++++----- docs/manual/rewrite/flags.xml.fr | 2 +- docs/manual/rewrite/flags.xml.meta | 2 +- docs/manual/rewrite/remapping.html.en | 16 ++++++---------- docs/manual/rewrite/remapping.xml | 16 ++++++---------- docs/manual/rewrite/rewritemap.html.en | 10 +++++----- docs/manual/rewrite/rewritemap.xml | 10 +++++----- 10 files changed, 40 insertions(+), 48 deletions(-) diff --git a/docs/manual/rewrite/access.html.en b/docs/manual/rewrite/access.html.en index b31b8fcaff7..0b6896e17f9 100644 --- a/docs/manual/rewrite/access.html.en +++ b/docs/manual/rewrite/access.html.en @@ -187,9 +187,9 @@ RewriteRule ^/secret/files/ - [F] 
 SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 <Location /secret/files>
-	Order allow,deny
-	Allow from all
-	Deny from env=goaway
+    Order allow,deny
+    Allow from all
+    Deny from env=goaway
 </Location>
diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml index 7e04240db0c..2b6c677c5b5 100644 --- a/docs/manual/rewrite/access.xml +++ b/docs/manual/rewrite/access.xml @@ -187,9 +187,9 @@ RewriteRule ^/secret/files/ - [F] SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway <Location /secret/files> - Order allow,deny - Allow from all - Deny from env=goaway + Order allow,deny + Allow from all + Deny from env=goaway </Location>

diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en index 5185a43752e..f66b18f4aaa 100644 --- a/docs/manual/rewrite/avoid.html.en +++ b/docs/manual/rewrite/avoid.html.en @@ -91,13 +91,13 @@ following:

 <VirtualHost *:80>
-	ServerName www.example.com
-	Redirect / https://www.example.com/
+    ServerName www.example.com
+    Redirect / https://www.example.com/
 </VirtualHost >
 
 <VirtualHost *:443>
-	ServerName www.example.com
-	# ... SSL configuration goes here
+    ServerName www.example.com
+    # ... SSL configuration goes here
 </VirtualHost >
@@ -212,7 +212,7 @@ hostname, such as www.example.com instead of 
 <If "$req{Host} != 'www.example.com'">
-	RedirectMatch (.*) http://www.example.com$1
+    RedirectMatch (.*) http://www.example.com$1
 </If>
diff --git a/docs/manual/rewrite/avoid.xml b/docs/manual/rewrite/avoid.xml index fa79a6fa589..89833228ad8 100644 --- a/docs/manual/rewrite/avoid.xml +++ b/docs/manual/rewrite/avoid.xml @@ -97,13 +97,13 @@ following:

<VirtualHost *:80> - ServerName www.example.com - Redirect / https://www.example.com/ + ServerName www.example.com + Redirect / https://www.example.com/ </VirtualHost > <VirtualHost *:443> - ServerName www.example.com - # ... SSL configuration goes here + ServerName www.example.com + # ... SSL configuration goes here </VirtualHost > @@ -218,7 +218,7 @@ module="core" type="section">If directive, as shown here:

<If "$req{Host} != 'www.example.com'"> - RedirectMatch (.*) http://www.example.com$1 + RedirectMatch (.*) http://www.example.com$1 </If> diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr index f76cd17fe60..5f7c2d8f73b 100644 --- a/docs/manual/rewrite/flags.xml.fr +++ b/docs/manual/rewrite/flags.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af035..e4f3ee6f495 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en index 76966b1fe40..485b3b023f0 100644 --- a/docs/manual/rewrite/remapping.html.en +++ b/docs/manual/rewrite/remapping.html.en @@ -120,9 +120,7 @@ RewriteRule ^/foo\.html$ bar.html [ - 
-    Redirect /foo.html /bar.html
-
+ 
Redirect /foo.html /bar.html
@@ -231,14 +229,12 @@ RewriteRule ^foo\.html$ foo.cgi [H= -RewriteEngine on -RewriteBase /var/www/htdocs + RewriteEngine on + RewriteBase /var/www/htdocs -RewriteCond $1.php -f -RewriteCond $1.html !-f -RewriteRule ^(.*).html$ $1.php - + RewriteCond $1.php -f + RewriteCond $1.html !-f + RewriteRule ^(.*).html$ $1.php </Directory> diff --git a/docs/manual/rewrite/remapping.xml b/docs/manual/rewrite/remapping.xml index 3d474323174..3f615d38eba 100644 --- a/docs/manual/rewrite/remapping.xml +++ b/docs/manual/rewrite/remapping.xml @@ -116,9 +116,7 @@ RewriteRule ^/foo\.html$ bar.html [ - - Redirect /foo.html /bar.html - + Redirect /foo.html /bar.html @@ -222,14 +220,12 @@ RewriteRule ^foo\.html$ foo.cgi [H= -RewriteEngine on -RewriteBase /var/www/htdocs + RewriteEngine on + RewriteBase /var/www/htdocs -RewriteCond $1.php -f -RewriteCond $1.html !-f -RewriteRule ^(.*).html$ $1.php - + RewriteCond $1.php -f + RewriteCond $1.html !-f + RewriteRule ^(.*).html$ $1.php </Directory> diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en index 3e4f62429b9..3941a9c10ac 100644 --- 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.

recipe:

#Product to ID configuration
-    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]
@@ -325,9 +325,9 @@ by many requests. the int function, and then use that in your RewriteRule:

- 
Redirect a URI to an all-lowercase version of itself
-    RewriteMap lc int:tolower
-    RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
+    
#Redirect a URI to an all-lowercase version of itself
+RewriteMap lc int:tolower
+RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
     

 
 
diff --git a/docs/manual/rewrite/rewritemap.xml b/docs/manual/rewrite/rewritemap.xml
index e03df546791..7e4c95e69ec 100644
--- a/docs/manual/rewrite/rewritemap.xml
+++ b/docs/manual/rewrite/rewritemap.xml
@@ -135,8 +135,8 @@ may be used, and give examples of each.

     recipe:

 
     #Product to ID configuration
-    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]
     
 
     
We assume here that the prods.php script knows what
@@ -312,9 +312,9 @@ by many requests.
     the int function, and then use that in your RewriteRule:
     

 
-    Redirect a URI to an all-lowercase version of itself
-    RewriteMap lc int:tolower
-    RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
+    #Redirect a URI to an all-lowercase version of itself
+RewriteMap lc int:tolower
+RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
     
 
     
-- 
2.47.2