1
0
mirror of https://github.com/apache/httpd.git synced 2025-12-24 15:01:03 +03:00

Fix some whitespace issues

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330318 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2012-04-25 14:48:49 +00:00
parent ad147e5957
commit 00fb4897e1
10 changed files with 40 additions and 48 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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 -->

View File

@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
</variants>
</metafile>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>