Replace rewriterule/rewritecond flow diagram with a easier-to-read

version donated by Joseph Pecoraro.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@895068 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/rewrite/intro.html.en b/docs/manual/rewrite/intro.html.en
index a7f873a9244f26e6d442d934977f515f8e629de0..1b57dd87b982c45e14bc533db300691eeccbe397 100644 (file)
--- a/docs/manual/rewrite/intro.html.en
+++ b/docs/manual/rewrite/intro.html.en
@@ -143,12 +143,13 @@ the expression.</p>
       which can be used with the strings <code>$N</code> and
       <code>%N</code> (see below). These are available for creating
       the strings <em>Substitution</em> and <em>TestString</em>.
-      Figure 2 shows to which locations the back-references are
-      transferred for expansion.</p>
+      Figure 1 shows to which locations the back-references are
+      transferred for expansion as well as illustrating the flow of the
+      RewriteRule, RewriteCond matching.</p>
 
 <p class="figure">
-      <img src="../images/mod_rewrite_fig2.gif" width="381" height="179" alt="[Needs graphics capability to display]" /><br />
-      <dfn>Figure 2:</dfn> The back-reference flow through a rule.
+      <img src="../images/rewrite_rule_flow.png" alt="Flow of RewriteRule and RewriteCond matching" /><br />
+      <dfn>Figure 1:</dfn> The back-reference flow through a rule.
 </p>
 
 

diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index 36aaa398b4597610de2b8dfc8759632ecfa59469..a19e5bbe3709387b15a017f2542a19c04125fb31 100644 (file)
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -147,13 +147,14 @@ the expression.</p>
       which can be used with the strings <code>$N</code> and
       <code>%N</code> (see below). These are available for creating
       the strings <em>Substitution</em> and <em>TestString</em>.
-      Figure 2 shows to which locations the back-references are
-      transferred for expansion.</p>
+      Figure 1 shows to which locations the back-references are
+      transferred for expansion as well as illustrating the flow of the
+      RewriteRule, RewriteCond matching.</p>
 
 <p class="figure">
-      <img src="../images/mod_rewrite_fig2.gif" width="381"
-           height="179" alt="[Needs graphics capability to display]" /><br />
-      <dfn>Figure 2:</dfn> The back-reference flow through a rule.
+      <img src="../images/rewrite_rule_flow.png" 
+      alt="Flow of RewriteRule and RewriteCond matching" /><br />
+      <dfn>Figure 1:</dfn> The back-reference flow through a rule.
 </p>
 
 </section>

diff --git a/docs/manual/rewrite/tech.html.en b/docs/manual/rewrite/tech.html.en
index 337b860c708fec9f395b886c6965f4a2bfb0bd8c..88eb47b272dcf996a83250a5a44ae489a7434a90 100644 (file)
--- a/docs/manual/rewrite/tech.html.en
+++ b/docs/manual/rewrite/tech.html.en
@@ -131,7 +131,7 @@ and URL matching.</p>
       first, and so the control flow is a little bit long-winded. See
       Figure 1 for more details.</p>
 <p class="figure">
-      <img src="../images/mod_rewrite_fig1.gif" width="428" height="385" alt="[Needs graphics capability to display]" /><br />
+      <img src="../images/rewrite_rule_flow.png" alt="Flow of RewriteRule and RewriteCond matching" /><br />
       <dfn>Figure 1:</dfn>The control flow through the rewriting ruleset
 </p>
       <p>As you can see, first the URL is matched against the

diff --git a/docs/manual/rewrite/tech.xml b/docs/manual/rewrite/tech.xml
index e7de78a76fb1eda71a61c9ae8accb33b015b4a75..b0fcb4d8fd584ab4d7025434b15b958edd1a625b 100644 (file)
--- a/docs/manual/rewrite/tech.xml
+++ b/docs/manual/rewrite/tech.xml
@@ -133,8 +133,8 @@ and URL matching.</p>
       first, and so the control flow is a little bit long-winded. See
       Figure 1 for more details.</p>
 <p class="figure">
-      <img src="../images/mod_rewrite_fig1.gif" width="428"
-           height="385" alt="[Needs graphics capability to display]" /><br />
+      <img src="../images/rewrite_rule_flow.png"
+          alt="Flow of RewriteRule and RewriteCond matching" /><br />
       <dfn>Figure 1:</dfn>The control flow through the rewriting ruleset
 </p>
       <p>As you can see, first the URL is matched against the