Fix whitespace issues and anchor patterns when needed in flags.xml

Fix double-escaped characters in advanced.xml

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

diff --git a/docs/manual/rewrite/advanced.html.en b/docs/manual/rewrite/advanced.html.en
index b723e23de0d246ccd3383ca6dcd18c04cff7d566..22fdd7f239c5bac9964bafc90173dbcd5cbb92c7 100644 (file)
--- a/docs/manual/rewrite/advanced.html.en
+++ b/docs/manual/rewrite/advanced.html.en
@@ -269,13 +269,13 @@ $QS_n = 3600 if ($QS_n eq '');
 if ($QS_f eq '') {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: No file given\n";
+print "<b>ERROR</b>: No file given\n";
 exit(0);
 }
 if (! -f $QS_f) {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: File $QS_f not found\n";
+print "<b>ERROR</b>: File $QS_f not found\n";
 exit(0);
 }
 
@@ -307,7 +307,7 @@ local($file) = @_;
 local(*FP, $size, $buffer, $bytes);
 ($x, $x, $x, $x, $x, $x, $x, $size) = stat($file);
 $size = sprintf("%d", $size);
-open(FP, "<$file");
+open(FP, "<$file");
 $bytes = sysread(FP, $buffer, $size);
 close(FP);
 return $buffer;

diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml
index deab5ee98262f7e1298a138ba08f73119ad89d8d..546472736175220ad7767390fd5a6ec6e8db477d 100644 (file)
--- a/docs/manual/rewrite/advanced.xml
+++ b/docs/manual/rewrite/advanced.xml
@@ -272,13 +272,13 @@ $QS_n = 3600 if ($QS_n eq '');
 if ($QS_f eq '') {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: No file given\n";
+print "<b>ERROR</b>: No file given\n";
 exit(0);
 }
 if (! -f $QS_f) {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: File $QS_f not found\n";
+print "<b>ERROR</b>: File $QS_f not found\n";
 exit(0);
 }
 
@@ -310,7 +310,7 @@ local($file) = @_;
 local(*FP, $size, $buffer, $bytes);
 ($x, $x, $x, $x, $x, $x, $x, $size) = stat($file);
 $size = sprintf("%d", $size);
-open(FP, "<$file");
+open(FP, "<$file");
 $bytes = sysread(FP, $buffer, $size);
 close(FP);
 return $buffer;

diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 492d54468ca5fcde54cc980eb0bcfeda331e0ce4..2ab31c2a9ef963f93482937c9647a18f9a1fc56b 100644 (file)
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -265,7 +265,7 @@ environment variable is used to exclude those requests from the access
 log.</p>
 
 <pre class="prettyprint lang-config">
-RewriteRule \.(png|gif|jpg) - [E=image:1]
+RewriteRule \.(png|gif|jpg)$ - [E=image:1]
 CustomLog logs/access_log combined env=!image
 </pre>
 
@@ -481,7 +481,7 @@ requests.
 example, if you wanted all image requests to be handled by a back-end
 image server, you might do something like the following:</p>
 
-<pre class="prettyprint lang-config">RewriteRule /(.*)\.(jpg|gif|png) http://images.example.com/$1.$2 [P]</pre>
+<pre class="prettyprint lang-config">RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2 [P]</pre>
 
 
 <p>Use of the [P] flag implies [L] - that is, the request is immediately
@@ -531,7 +531,7 @@ use the [PT] flag to ensure that the
 
 <pre class="prettyprint lang-config">
 Alias /icons /usr/local/apache/icons
-RewriteRule /pics/(.+)\.jpg /icons/$1.gif [PT]
+RewriteRule /pics/(.+)\.jpg$ /icons/$1.gif [PT]
 </pre>
 
 
@@ -666,12 +666,12 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule .? - [S=3]
 
 # IF the file exists, then:
-       RewriteRule (.*\.gif) images.php?$1
-       RewriteRule (.*\.html) docs.php?$1
-       # Skip past the "else" stanza.
-       RewriteRule .? - [S=1]
+    RewriteRule (.*\.gif) images.php?$1
+    RewriteRule (.*\.html) docs.php?$1
+    # Skip past the "else" stanza.
+    RewriteRule .? - [S=1]
 # ELSE...
-       RewriteRule (.*) 404.php?file=$1
+    RewriteRule (.*) 404.php?file=$1
 # END
 </pre>
 

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index ae538c44b197fffa9468eec28d420dffe2f75896..64b78d423aaaeb40ea3dfa3a1fc55d1744fb699c 100644 (file)
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -252,7 +252,7 @@ environment variable is used to exclude those requests from the access
 log.</p>
 
 <highlight language="config">
-RewriteRule \.(png|gif|jpg) - [E=image:1]
+RewriteRule \.(png|gif|jpg)$ - [E=image:1]
 CustomLog logs/access_log combined env=!image
 </highlight>
 
@@ -465,7 +465,7 @@ requests.
 example, if you wanted all image requests to be handled by a back-end
 image server, you might do something like the following:</p>
 
-<highlight language="config">RewriteRule /(.*)\.(jpg|gif|png) http://images.example.com/$1.$2 [P]</highlight>
+<highlight language="config">RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2 [P]</highlight>
 
 <p>Use of the [P] flag implies [L] - that is, the request is immediately
 pushed through the proxy, and any following rules will not be
@@ -520,7 +520,7 @@ use the [PT] flag to ensure that the
 
 <highlight language="config">
 Alias /icons /usr/local/apache/icons
-RewriteRule /pics/(.+)\.jpg /icons/$1.gif [PT]
+RewriteRule /pics/(.+)\.jpg$ /icons/$1.gif [PT]
 </highlight>
 
 <p>
@@ -654,12 +654,12 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule .? - [S=3]
 
 # IF the file exists, then:
-       RewriteRule (.*\.gif) images.php?$1
-       RewriteRule (.*\.html) docs.php?$1
-       # Skip past the &quot;else&quot; stanza.
-       RewriteRule .? - [S=1]
+    RewriteRule (.*\.gif) images.php?$1
+    RewriteRule (.*\.html) docs.php?$1
+    # Skip past the &quot;else&quot; stanza.
+    RewriteRule .? - [S=1]
 # ELSE...
-       RewriteRule (.*) 404.php?file=$1
+    RewriteRule (.*) 404.php?file=$1
 # END
 </highlight>