Commit 904bb9a0 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Synch with trunk

merge r1745711 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1745806 13f79535-47bb-0310-9956-ffa450edef68
parent a061e4ad
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -35,14 +35,15 @@
    module="mod_userdir">UserDir</directive> directive.</p>
<p>Note that, by default, access to these directories is <strong>not</strong>
    enabled. You can enable access when using <directive module="mod_userdir"
    >UserDir</directive> by uncommenting the line</p>
    <example>
    >UserDir</directive> by uncommenting the line:</p>
    <highlight language="config">
      #Include conf/extra/httpd-userdir.conf
    </example>
    </highlight>
    <p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code
    >httpd-userdir.conf</code>
    file as necessary, or by including the appropriate directives in a
    <code>Directory</code> block within the main config file.</p>
    <directive module="core" type="section">Directory</directive> block
    within the main config file.</p>
</summary>

<seealso><a href="../urlmapping.html">Mapping URLs to the Filesystem</a></seealso>
+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ host</context></contextlist>

    <p>If neither the <code>enabled</code> nor the
    <code>disabled</code> keywords appear in the
    <code>Userdir</code> directive, the argument is treated as a
    <directive>Userdir</directive> directive, the argument is treated as a
    filename pattern, and is used to turn the name into a directory
    specification. A request for
    <code>http://www.example.com/~bob/one/two.html</code> will be
@@ -156,7 +156,7 @@ UserDir enabled user1 user2 user3

    <p>User directory substitution is not active by default in versions
    2.1.4 and later.  In earlier versions, <code>UserDir public_html</code>
    was assumed if no <directive module="mod_userdir">UserDir</directive>
    was assumed if no <directive>UserDir</directive>
    directive was present.</p>

    <note><title>Merging details</title>