A couple small tweaks to the public_html tutorial.

1. Add a <seealso> to urlmapping.html.

2. Take some markup out of a <title>.  It is technically allowed,
but probably not a good idea.

3. Replace <DirectoryMatch /home/*/cgi-bin> with <Directory /home/*/cgi-bin>
since that is a shell-style wildcard and not a regular expression.  Also
replace Options +ExecCGI with Options ExecCGI, because it is safest to turn
off non-CGI Options in a cgi-bin directory.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96691 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index 8fa48f51ea8559e7ca55928d0c134672f50003d3..a9857380a06d11784ed406a0a84b184d0f63548a 100644 (file)
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -11,11 +11,11 @@
     out of the home directory of the user "<code>username</code>", out of
     the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>
 
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li><li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></a></li><li><img alt="" src="../images/down.gif" /> <a href="#enable">Restricting what users are permitted to use this 
-    feature</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">Enabling a cgi directory for each user</a></li><li><img alt="" src="../images/down.gif" /> <a href="#htaccess">Allowing users to alter configuration</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="related" id="related">Per-user web directories</a></h2>
+</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li><li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li><li><img alt="" src="../images/down.gif" /> <a href="#enable">Restricting what users are permitted to use this 
+    feature</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">Enabling a cgi directory for each user</a></li><li><img alt="" src="../images/down.gif" /> <a href="#htaccess">Allowing users to alter configuration</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../urlmapping.html">Mapping URLs to the Filesystem</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="related" id="related">Per-user web directories</a></h2>
     
     <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></li><li><code class="directive"><a href="../mod/core.html#directorymatch">DirectoryMatch</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="userdir" id="userdir">Setting the file path with <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></a></h2>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="userdir" id="userdir">Setting the file path with UserDir</a></h2>
     
 
     <p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
@@ -86,13 +86,13 @@
   
 
    <p>In order to give each user their own cgi-bin directory, you can use
-    a <code class="directive"><a href="../mod/core.html#directorymatch">DirectoryMatch</a></code>
+    a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 
     <div class="example"><p><code>
-      &lt;DirectoryMatch /home/*/cgi-bin/&gt;<br />
-       Options +ExecCGI<br />
+      &lt;Directory /home/*/cgi-bin/&gt;<br />
+       Options ExecCGI<br />
        SetHandler cgi-script<br />
        &lt;/DirectoryMatch&gt;
     </code></p></div>

diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index b2bf17d60631cad4b80fad616d02593800ac798b..94aa62edf15ede6cf1dc5d5dc32ec173221a9856 100644 (file)
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -17,6 +17,8 @@
 
 </summary>
 
+<seealso><a href="../urlmapping.html">Mapping URLs to the Filesystem</a></seealso>
+
   <section id="related">
     <title>Per-user web directories</title>
     <related>
@@ -32,8 +34,7 @@
     </section>
 
     <section id="userdir">
-    <title>Setting the file path with <directive
-    module="mod_userdir">UserDir</directive></title>
+    <title>Setting the file path with UserDir</title>
 
     <p>The <directive module="mod_userdir">UserDir</directive>
     directive specifies a directory out of which per-user
@@ -107,13 +108,13 @@
   <title>Enabling a cgi directory for each user</title>
 
    <p>In order to give each user their own cgi-bin directory, you can use
-    a <directive module="core">DirectoryMatch</directive>
+    a <directive module="core" type="section">Directory</directive>
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 
     <example>
-      &lt;DirectoryMatch /home/*/cgi-bin/&gt;<br />
-       Options +ExecCGI<br />
+      &lt;Directory /home/*/cgi-bin/&gt;<br />
+       Options ExecCGI<br />
        SetHandler cgi-script<br />
        &lt;/DirectoryMatch&gt;
     </example>