From: Rich Bowen Date: Thu, 15 Mar 2012 11:23:16 +0000 (+0000) Subject: rebuild X-Git-Tag: 2.5.0-alpha~7367 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f48555d9be552c157012e426299cd4e7416e103;p=apache rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1300919 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index 943d0acf00..2401b40da5 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -283,7 +283,7 @@ redirects.

F|forbidden

Using the [F] flag causes the server to return a 403 Forbidden status code to the client. While the same behavior can be accomplished using -the Deny directive, this +the Deny directive, this allows more flexibility in assigning a Forbidden status.

The following rule will forbid .exe files from being @@ -519,7 +519,7 @@ The target (or substitution string) in a RewriteRule is assumed to be a file path, by default. The use of the [PT] flag causes it to be treated as a URI instead. That is to say, the use of the [PT] flag causes the result of the RewriteRule to be passed back through -URL mapping, so that location-based mappings, such as Alias, Redirect, or ScriptAlias, for example, might have a +URL mapping, so that location-based mappings, such as Alias, Redirect, or ScriptAlias, for example, might have a chance to take effect.

diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr index 7a65f10854..67b376f17b 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/proxy.html.en b/docs/manual/rewrite/proxy.html.en index e8597b3547..5c38634e51 100644 --- a/docs/manual/rewrite/proxy.html.en +++ b/docs/manual/rewrite/proxy.html.en @@ -79,7 +79,7 @@ ProxyPassReverse / http://old.example.com/ that any redirects issued by the backend are correctly passed on to the client.

-

Consider using either ProxyPass or ProxyPassMatch whenever possible in +

Consider using either ProxyPass or ProxyPassMatch whenever possible in preference to mod_rewrite.

diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en index eb1aefd94e..35c0de96c1 100644 --- a/docs/manual/rewrite/remapping.html.en +++ b/docs/manual/rewrite/remapping.html.en @@ -247,7 +247,7 @@ RewriteRule ^(.*).html$ $1.php

This ruleset is designed to use in a per-directory context (In a <Directory> block or in a .htaccess file), so that the -f checks are looking at the correct directory path. - You may need to set a RewriteBase directive to specify the + You may need to set a RewriteBase directive to specify the directory base that you're working in.

@@ -273,7 +273,7 @@ RewriteRule ^(.*).html$ $1.php

The very best way to solve this doesn't involve mod_rewrite at all, -but rather uses the Redirect +but rather uses the Redirect directive placed in a virtual host for the non-canonical hostname(s).