From 72e35ecc7ac7593f367a8a3b447546f5add17af4 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Mon, 26 Apr 2010 13:11:56 +0000
Subject: [PATCH] Adds another section to the 'avoiding mod_rewrite' doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@938031 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/rewrite/avoid.html.en | 24 ++++++++++++++++++++++--
 docs/manual/rewrite/avoid.xml     | 24 ++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en
index 3ba2ed4174..3c2d21d8a7 100644
--- a/docs/manual/rewrite/avoid.html.en
+++ b/docs/manual/rewrite/avoid.html.en
@@ -78,7 +78,7 @@ and <code>/one/three/four.html</code>.</p>
 Redirect /one/ http://one.example.com/
 </code></p></div>
 
-<p>To redirect <code>http</code> URLs to <code>https</code>, do the
+<p id="http2https">To redirect <code>http</code> URLs to <code>https</code>, do the
 following:</p>
 
 <div class="example"><p><code>
@@ -109,7 +109,27 @@ task in a <code>.htaccess</code> file instead.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="alias" id="alias">URL Aliasing</a></h2>
-<p>Using Alias</p>
+<p>The <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> directive
+provides mapping from a URI to a directory - usually a directory outside
+of your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>. Although it
+is possible to perform this mappint with <code>mod_rewrite</code>,
+<code>Alias</code> is the preferred method, for reasons of simplicity
+and performance.</p>
+
+<div class="example"><h3>Using Alias</h3><p><code>
+Alias /cats /var/www/virtualhosts/felines/htdocs
+</code></p></div>
+
+<p>
+The use of <code>mod_rewrite</code> to perform this mapping may be
+appropriate when you do not have access to the server configuration
+files. Alias may only be used in server or virtualhost context, and not
+in a <code>.htaccess</code> file.
+</p>
+
+<p>Symbolic links would be another way to accomplish the same thing, if
+you have <code>Options FollowSymLinks</code> enabled on your
+server.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="vhosts" id="vhosts">Virtual Hosting</a></h2>
diff --git a/docs/manual/rewrite/avoid.xml b/docs/manual/rewrite/avoid.xml
index db2bb25369..f32fbda8cf 100644
--- a/docs/manual/rewrite/avoid.xml
+++ b/docs/manual/rewrite/avoid.xml
@@ -87,7 +87,7 @@ and <code>/one/three/four.html</code>.</p>
 Redirect /one/ http://one.example.com/
 </example>
 
-<p>To redirect <code>http</code> URLs to <code>https</code>, do the
+<p id="http2https">To redirect <code>http</code> URLs to <code>https</code>, do the
 following:</p>
 
 <example>
@@ -118,7 +118,27 @@ task in a <code>.htaccess</code> file instead.</p>
 </section>
 
 <section id="alias"><title>URL Aliasing</title>
-<p>Using Alias</p>
+<p>The <directive module="mod_alias">Alias</directive> directive
+provides mapping from a URI to a directory - usually a directory outside
+of your <directive module="core">DocumentRoot</directive>. Although it
+is possible to perform this mappint with <code>mod_rewrite</code>,
+<code>Alias</code> is the preferred method, for reasons of simplicity
+and performance.</p>
+
+<example><title>Using Alias</title>
+Alias /cats /var/www/virtualhosts/felines/htdocs
+</example>
+
+<p>
+The use of <code>mod_rewrite</code> to perform this mapping may be
+appropriate when you do not have access to the server configuration
+files. Alias may only be used in server or virtualhost context, and not
+in a <code>.htaccess</code> file.
+</p>
+
+<p>Symbolic links would be another way to accomplish the same thing, if
+you have <code>Options FollowSymLinks</code> enabled on your
+server.</p>
 </section>
 
 <section id="vhosts"><title>Virtual Hosting</title>
-- 
2.40.0