Commit a061e4ad authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Synch with trunk 

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

docs/manual/howto/public_html.xml

+18 −6
Original line number Diff line number Diff line
@@ -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.

docs/manual/mod/mod_userdir.xml

+1 −1
Original line number Diff line number Diff line
@@ -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