From: Christophe Jaillet Date: Fri, 1 Apr 2016 20:25:00 +0000 (+0000) Subject: xforms X-Git-Tag: 2.4.20~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6ff64da20bf928ba0342ee10e8d1230287ebe9;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737439 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en index 4f971531ce3..9cbdefec7a8 100644 --- a/docs/manual/rewrite/avoid.html.en +++ b/docs/manual/rewrite/avoid.html.en @@ -30,14 +30,14 @@

This document supplements the mod_rewrite reference documentation. It describes -perhaps one of the most important concepts about mod_rewrite - namely, +perhaps one of the most important concepts about mod_rewrite - namely, when to avoid using it.

-

mod_rewrite should be considered a last resort, when other +

mod_rewrite should be considered a last resort, when other alternatives are found wanting. Using it when there are simpler alternatives leads to configurations which are confusing, fragile, and hard to maintain. Understanding what other alternatives are available is -a very important step towards mod_rewrite mastery.

+a very important step towards mod_rewrite mastery.

Note that many of these examples won't work unchanged in your particular server configuration, so it's important that you understand @@ -86,7 +86,7 @@ and /one/three/four.html.

To redirect URLs under /one to http://one.example.com, do the following:

-
Redirect /one/ http://one.example.com/
+
Redirect "/one/" "http://one.example.com/"

To redirect one hostname to another, for example @@ -100,12 +100,12 @@ following:

<VirtualHost *:80>
     ServerName www.example.com
     Redirect "/" "https://www.example.com/"
-</VirtualHost >
+</VirtualHost>
 
 <VirtualHost *:443>
     ServerName www.example.com
     # ... SSL configuration goes here
-</VirtualHost >
+</VirtualHost>

The use of RewriteRule to perform this task may be @@ -126,15 +126,15 @@ task in a .htaccess file instead.

The Alias directive provides mapping from a URI to a directory - usually a directory outside of your DocumentRoot. Although it -is possible to perform this mapping with mod_rewrite, -Alias is the preferred method, for reasons of simplicity -and performance.

+is possible to perform this mapping with mod_rewrite, +Alias is the preferred method, for +reasons of simplicity and performance.

Using Alias

Alias "/cats" "/var/www/virtualhosts/felines/htdocs"

-The use of mod_rewrite to perform this mapping may be +The use of mod_rewrite to perform this mapping may be appropriate when you do not have access to the server configuration files. Alias may only be used in server or virtualhost context, and not in a .htaccess file. @@ -148,7 +148,8 @@ server.

Virtual Hosting

Although it is possible to handle virtual hosts with mod_rewrite, it is seldom the right way. Creating individual -<VirtualHost> blocks is almost always the right way to go. In the +<VirtualHost> blocks is +almost always the right way to go. In the event that you have an enormous number of virtual hosts, consider using mod_vhost_alias to create these hosts automatically.

@@ -168,7 +169,7 @@ seems like the right approach.

Simple Proxying

-

RewriteRule provides the [P] flag to pass rewritten URIs through +

RewriteRule provides the [P] flag to pass rewritten URIs through mod_proxy.

RewriteRule "^/?images(.*)" "http://imageserver.local/images$1" [P]
@@ -219,7 +220,8 @@ header, response header, or environment variable, replacing

See especially the expression evaluation documentation for a overview of what types of expressions you can -use in <If> sections, and in certain other directives.

+use in <If> sections, +and in certain other directives.

diff --git a/docs/manual/rewrite/avoid.xml.fr b/docs/manual/rewrite/avoid.xml.fr index 484e5cbc63d..d3bd3bfdf41 100644 --- a/docs/manual/rewrite/avoid.xml.fr +++ b/docs/manual/rewrite/avoid.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/avoid.xml.meta b/docs/manual/rewrite/avoid.xml.meta index 9d51904e7ba..405691d6afd 100644 --- a/docs/manual/rewrite/avoid.xml.meta +++ b/docs/manual/rewrite/avoid.xml.meta @@ -8,6 +8,6 @@ en - fr + fr