Merge r599646 from trunk:

UserDir accepts multiple file paths. Submitted by: Vincent Jong <megaspaz tron.megaspaz.net>

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

diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index 453ff35f70c763b6fe2541010c583139d3757e81..30ac395a781f0031e34b9344e2b95bb1528898b8 100644 (file)
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -94,6 +94,18 @@
     translated to the file path
     <code>/var/www/rbowen/docs/file.html</code></p>
 
+    <p>Multiple directories or directory paths can also be set.</p>
+
+    <example>
+      UserDir public_html /var/html
+    </example>
+
+    <p>For the URL <code>http://example.com/~rbowen/file.html</code>, 
+    Apache will search for <code>~rbowen</code>. If it isn't found, 
+    Apache will search for <code>rbowen</code> in <code>/var/html</code>. If
+    found, the above URL will then be translated to the file path 
+    <code>/var/html/rbowen/file.html</code></p>
+
   </section>
 
   <section id="enable">

diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 44cd3d0172a68534b185eb9da2160f07a455bbd5..650a5593217d64ee9f44d700a5623de71e8de751 100644 (file)
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -42,7 +42,8 @@ tutorial</a></seealso>
 
 <name>UserDir</name>
 <description>Location of the user-specific directories</description>
-<syntax>UserDir <em>directory-filename</em></syntax>
+<syntax>UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</syntax>
 <contextlist><context>server config</context> <context>virtual
 host</context></contextlist>