From: Rich Bowen <rbowen@apache.org>
Date: Fri, 1 Jan 2010 20:31:05 +0000 (+0000)
Subject: Replace rewriterule/rewritecond flow diagram with a easier-to-read
X-Git-Tag: 2.3.5~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=372a051c4ce428d8ba900c50c9bc3e936330e8b0;p=thirdparty%2Fapache%2Fhttpd.git

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 a7f873a9244..1b57dd87b98 100644
--- 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 36aaa398b45..a19e5bbe370 100644
--- 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 337b860c708..88eb47b272d 100644
--- 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 e7de78a76fb..b0fcb4d8fd5 100644
--- 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