From: Christophe Jaillet Date: Sun, 15 May 2016 07:10:32 +0000 (+0000) Subject: xforms X-Git-Tag: 2.4.21~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5688c59a541a7e7344ca630e2ca90907602c2d61;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743886 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en index f324faa6ad8..b51f2f76f9c 100644 --- a/docs/manual/mod/mod_substitute.html.en +++ b/docs/manual/mod/mod_substitute.html.en @@ -74,11 +74,11 @@ Using the n flag forces the pattern to be treated as a fixed string.
f
-
The f flag causes mod_substitute to flatten the +
The f flag causes mod_substitute to flatten the result of a substitution allowing for later substitutions to take place on the boundary of this one. This is the default.
q
-
The q flag causes mod_substitute to not +
The q flag causes mod_substitute to not flatten the buckets after each substitution. This can result in much faster response and a decrease in memory utilization, but should only be used if there is no possibility @@ -105,7 +105,7 @@ when regular expressions are used, as illustrated in the following example:

Example of using backreferences and captures

<Location "/">
     AddOutputFilterByType SUBSTITUTE text/html
-    # "foo=k,bar=k" -> "foo/bar=k" 
+    # "foo=k,bar=k" -> "foo/bar=k"
     Substitute "s|foo=(\w+),bar=\1|foo/bar=$1"
 </Location>
@@ -116,10 +116,10 @@ to the back-end server. These URLs don't work for the end-user, since the back-end server is unreachable.

-

In this case, mod_substutite can be used to rewrite +

In this case, mod_substitute can be used to rewrite those URLs into something that will work from the front end:

-

Rewriting URLs embedded in proxied content

ProxyPass "/blog/" "http://internal.blog.example.com"
+    

Rewriting URLs embedded in proxied content

ProxyPass        "/blog/" "http://internal.blog.example.com"
 ProxyPassReverse "/blog/" "http://internal.blog.example.com/"
 
 Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"
@@ -128,7 +128,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"<

ProxyPassReverse modifies any Location (redirect) headers that are sent by the back-end server, and, in this example, - Substitute takes care of the rest of the problem by + Substitute takes care of the rest of the problem by fixing up the HTML response as well.

@@ -145,7 +145,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"< Module:mod_substitute Compatibility:Available in httpd 2.4.17 and later -

Whether to apply the inherited Substitute +

Whether to apply the inherited Substitute patterns first (on), or after the ones of the current context (off). SubstituteInheritBefore is itself inherited, diff --git a/docs/manual/mod/mod_substitute.xml.fr b/docs/manual/mod/mod_substitute.xml.fr index 10fa8ae4729..61b39b38793 100644 --- a/docs/manual/mod/mod_substitute.xml.fr +++ b/docs/manual/mod/mod_substitute.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_substitute.xml.meta b/docs/manual/mod/mod_substitute.xml.meta index c991ba2149b..eec4a86ef93 100644 --- a/docs/manual/mod/mod_substitute.xml.meta +++ b/docs/manual/mod/mod_substitute.xml.meta @@ -8,6 +8,6 @@ en - fr + fr