From: Rich Bowen <rbowen@apache.org>
Date: Wed, 11 Jan 2023 18:50:11 +0000 (+0000)
Subject: Addresses bug https://bz.apache.org/bugzilla/show_bug.cgi?id=53108
X-Git-Tag: 2.4.56-candidate~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad165d843966e4e7ab5c35681bb6c6118a895dc3;p=thirdparty%2Fapache%2Fhttpd.git

Addresses bug https://bz.apache.org/bugzilla/show_bug.cgi?id=53108


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1906614 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/rewrite/intro.html.en b/docs/manual/rewrite/intro.html.en
index 0f37cbbfbe7..9e7642836be 100644
--- a/docs/manual/rewrite/intro.html.en
+++ b/docs/manual/rewrite/intro.html.en
@@ -231,7 +231,7 @@ value.
 <p>The <var>Substitution</var> can itself be one of three things:</p>
 
 <dl>
-<dt>A full filesystem path to a resource</dt>
+<dt>1. A full filesystem path to a resource</dt>
 <dd>
 <pre class="prettyprint lang-config">RewriteRule "^/games" "/usr/local/games/web"</pre>
 
@@ -239,17 +239,18 @@ value.
 like the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> directive.</p>
 </dd>
 
-<dt>A web-path to a resource</dt>
+<dt>2. A web-path to a resource</dt>
 <dd>
-<pre class="prettyprint lang-config">RewriteRule "^/foo$" "/bar"</pre>
+<pre class="prettyprint lang-config">RewriteRule "^/foo/?$" "/bar"</pre>
 
 <p>If <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is set
 to <code>/usr/local/apache2/htdocs</code>, then this directive would
 map requests for <code>http://example.com/foo</code> to the
 path <code>/usr/local/apache2/htdocs/bar</code>.</p>
+
 </dd>
 
-<dt>An absolute URL</dt>
+<dt>3. An absolute URL</dt>
 <dd>
 <pre class="prettyprint lang-config">RewriteRule "^/product/view$" "http://site2.example.com/seeproduct.html" [R]</pre>
 
@@ -257,6 +258,8 @@ path <code>/usr/local/apache2/htdocs/bar</code>.</p>
 </dd>
 </dl>
 
+<div class="warning">Note that <strong>1</strong> and <strong>2</strong> have exactly the same syntax. The difference between them is that in the case of <strong>1</strong>, the top level of the target path (i.e., <code>/usr/</code>) exists on the filesystem, where as in the case of <strong>2</strong>, it does not. (i.e., there's no <code>/bar/</code> as a root-level directory in the filesystem.)</div>
+
 <p>The <var>Substitution</var> can also
 contain <em>back-references</em> to parts of the incoming URL-path
 matched by the <var>Pattern</var>. Consider the following:</p>
diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index d0897fdc0d3..4d487f03406 100644
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -236,7 +236,7 @@ value.
 <p>The <var>Substitution</var> can itself be one of three things:</p>
 
 <dl>
-<dt>A full filesystem path to a resource</dt>
+<dt>1. A full filesystem path to a resource</dt>
 <dd>
 <highlight language="config">
 RewriteRule "^/games" "/usr/local/games/web"
@@ -245,18 +245,19 @@ RewriteRule "^/games" "/usr/local/games/web"
 like the <directive module="mod_alias">Alias</directive> directive.</p>
 </dd>
 
-<dt>A web-path to a resource</dt>
+<dt>2. A web-path to a resource</dt>
 <dd>
 <highlight language="config">
-RewriteRule "^/foo$" "/bar"
+RewriteRule "^/foo/?$" "/bar"
 </highlight>
 <p>If <directive module="core">DocumentRoot</directive> is set
 to <code>/usr/local/apache2/htdocs</code>, then this directive would
 map requests for <code>http://example.com/foo</code> to the
 path <code>/usr/local/apache2/htdocs/bar</code>.</p>
+
 </dd>
 
-<dt>An absolute URL</dt>
+<dt>3. An absolute URL</dt>
 <dd>
 <highlight language="config">
 RewriteRule "^/product/view$" "http://site2.example.com/seeproduct.html" [R]
@@ -265,6 +266,8 @@ RewriteRule "^/product/view$" "http://site2.example.com/seeproduct.html" [R]
 </dd>
 </dl>
 
+<note type="warning">Note that <strong>1</strong> and <strong>2</strong> have exactly the same syntax. The difference between them is that in the case of <strong>1</strong>, the top level of the target path (i.e., <code>/usr/</code>) exists on the filesystem, where as in the case of <strong>2</strong>, it does not. (i.e., there's no <code>/bar/</code> as a root-level directory in the filesystem.)</note>
+
 <p>The <var>Substitution</var> can also
 contain <em>back-references</em> to parts of the incoming URL-path
 matched by the <var>Pattern</var>. Consider the following:</p>