From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 27 May 2016 20:07:06 +0000 (+0000)
Subject: Synch with trunk
X-Git-Tag: 2.4.21~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=522a6270ce78205ec98d1025d3638aebba525d3d;p=thirdparty%2Fapache%2Fhttpd.git

Synch with trunk

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

diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index cbec42cd0f8..15ef8604bb3 100644
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -72,7 +72,9 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
-    <highlight language="config">UserDir public_html</highlight>
+    <highlight language="config">
+UserDir public_html
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -82,7 +84,9 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
-    <highlight language="config">UserDir /var/html</highlight>
+    <highlight language="config">
+UserDir /var/html
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path <code>/var/html/rbowen/file.html</code></p>
@@ -91,7 +95,9 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
-    <highlight language="config">UserDir /var/www/*/docs</highlight>
+    <highlight language="config">
+UserDir /var/www/*/docs
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -99,7 +105,9 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
-    <highlight language="config">UserDir public_html /var/html</highlight>
+    <highlight language="config">
+UserDir public_html /var/html
+    </highlight>
 
     <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
     Apache will search for <code>~rbowen</code>. If it isn't found,
@@ -114,7 +122,9 @@
     <p>The <directive module="mod_userdir">UserDir</directive> directive can be
       used to redirect user directory requests to external URLs.</p>
 
-    <highlight language="config">UserDir http://example.org/users/*/</highlight>
+    <highlight language="config">
+UserDir http://example.org/users/*/
+    </highlight>
 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
@@ -128,7 +138,9 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
-    <highlight language="config">UserDir disabled root jro fish</highlight>
+    <highlight language="config">
+UserDir disabled root jro fish
+    </highlight>
 
     <p>The configuration above will enable the feature for all users
     except for those listed in the <code>disabled</code> statement.
diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 5e883c8a3ad..747113c2dba 100644
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -140,7 +140,7 @@ UserDir enabled user1 user2 user3
     If you use a command like:</p>
 
     <highlight language="config">
-      UserDir public_html /usr/web http://www.example.com/
+      UserDir "public_html" "/usr/web" "http://www.example.com/"
     </highlight>
 
     <p>With a request for