From 5adb5dab8fd46fa025bdb354d68582fd80d5c3c5 Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Wed, 11 Apr 2012 07:48:10 +0000 Subject: [PATCH] Trying to iron out the confusion about the location of the back-reference section. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1324611 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/rewrite/intro.html.en | 15 ++++++++++----- docs/manual/rewrite/intro.xml | 15 ++++++++++----- docs/manual/rewrite/intro.xml.fr | 2 +- docs/manual/rewrite/intro.xml.meta | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/docs/manual/rewrite/intro.html.en b/docs/manual/rewrite/intro.html.en index bb22280bd7..036da765b2 100644 --- a/docs/manual/rewrite/intro.html.en +++ b/docs/manual/rewrite/intro.html.en @@ -138,14 +138,19 @@ the expression.

CondPattern, back-references are internally created which can be used with the strings $N and %N (see below). These are available for creating - the strings Substitution and TestString. - Figure 1 shows to which locations the back-references are - transferred for expansion as well as illustrating the flow of the - RewriteRule, RewriteCond matching.

+ the strings Substitution and TestString as + outlined in the following chapters. Figure 1 shows to which + locations the back-references are transferred for expansion as + well as illustrating the flow of the RewriteRule, RewriteCond + matching. In the next chapters, we will be exploring how to use + these back-references, so do not fret if it seems a bit alien + to you at first. +

Flow of RewriteRule and RewriteCond matching
- Figure 1: The back-reference flow through a rule. + Figure 1: The back-reference flow through a rule.
+ In this example, a request for /test/1234 would be transformed into /admin.foo?page=test&id=1234&host=admin.example.com.

diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml index 204e870599..ad63516cf8 100644 --- a/docs/manual/rewrite/intro.xml +++ b/docs/manual/rewrite/intro.xml @@ -145,15 +145,20 @@ the expression.

CondPattern, back-references are internally created which can be used with the strings $N and %N (see below). These are available for creating - the strings Substitution and TestString. - Figure 1 shows to which locations the back-references are - transferred for expansion as well as illustrating the flow of the - RewriteRule, RewriteCond matching.

+ the strings Substitution and TestString as + outlined in the following chapters. Figure 1 shows to which + locations the back-references are transferred for expansion as + well as illustrating the flow of the RewriteRule, RewriteCond + matching. In the next chapters, we will be exploring how to use + these back-references, so do not fret if it seems a bit alien + to you at first. +

Flow of RewriteRule and RewriteCond matching
- Figure 1: The back-reference flow through a rule. + Figure 1: The back-reference flow through a rule.
+ In this example, a request for /test/1234 would be transformed into /admin.foo?page=test&id=1234&host=admin.example.com.

diff --git a/docs/manual/rewrite/intro.xml.fr b/docs/manual/rewrite/intro.xml.fr index 7f817a481b..a067c16f69 100644 --- a/docs/manual/rewrite/intro.xml.fr +++ b/docs/manual/rewrite/intro.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/intro.xml.meta b/docs/manual/rewrite/intro.xml.meta index 5aaac0fc86..ce245b2841 100644 --- a/docs/manual/rewrite/intro.xml.meta +++ b/docs/manual/rewrite/intro.xml.meta @@ -8,6 +8,6 @@ en - fr + fr -- 2.40.0