You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2008/09/24 11:41:48 UTC
svn commit: r698483 - in /httpd/httpd/trunk/docs/manual/mod: mod_suexec.xml
mod_userdir.xml
Author: nilgun
Date: Wed Sep 24 02:41:47 2008
New Revision: 698483
URL: http://svn.apache.org/viewvc?rev=698483&view=rev
Log:
pre-translation improvements
Modified:
httpd/httpd/trunk/docs/manual/mod/mod_suexec.xml
httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml
Modified: httpd/httpd/trunk/docs/manual/mod/mod_suexec.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_suexec.xml?rev=698483&r1=698482&r2=698483&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_suexec.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_suexec.xml Wed Sep 24 02:41:47 2008
@@ -42,7 +42,7 @@
<directivesynopsis>
<name>SuexecUserGroup</name>
-<description>User and group permissions for CGI programs</description>
+<description>User and group for CGI programs to run as</description>
<syntax>SuexecUserGroup <em>User Group</em></syntax>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
@@ -52,9 +52,10 @@
<usage>
<p>The <directive>SuexecUserGroup</directive> directive allows you
to specify a user and group for CGI programs to run as. Non-CGI
- requests are still processes with the user specified in the User
- directive. This directive replaces the Apache 1.3 configuration of
- using the User and Group directives inside of VirtualHosts.</p>
+ requests are still processes with the user specified in the <directive
+ module="mpm_common">User</directive> directive. This directive replaces
+ the Apache 1.3 configuration of using the <code>User</code> and
+ <code>Group</code> directives inside of VirtualHosts.</p>
<example>
<title>Example</title>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml?rev=698483&r1=698482&r2=698483&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml Wed Sep 24 02:41:47 2008
@@ -84,27 +84,31 @@
<code>http://www.example.com/~bob/one/two.html</code> will be
translated to:</p>
-<table>
-<tr><th>UserDir directive used</th>
-<th>Translated path</th></tr>
-<tr><td>UserDir public_html</td><td>~bob/public_html/one/two.html</td></tr>
-<tr><td>UserDir /usr/web</td><td>/usr/web/bob/one/two.html</td></tr>
-<tr><td>UserDir /home/*/www</td><td>/home/bob/www/one/two.html</td></tr>
-</table>
-
- <p>The following directives will send redirects to the client:</p>
-
-<table>
-<tr><th>UserDir directive used</th>
-<th>Translated path</th></tr>
-<tr><td>UserDir http://www.example.com/users</td><td>http://www.example.com/users/bob/one/two.html</td></tr>
-<tr><td>UserDir
-http://www.example.com/*/usr</td><td>http://www.example.com/bob/usr/one/two.html</td></tr>
-<tr><td>UserDir
-http://www.example.com/~*/</td><td>http://www.example.com/~bob/one/two.html</td></tr>
-</table>
+ <table>
+ <tr><th>UserDir directive used</th>
+ <th>Translated path</th></tr>
+ <tr><td>UserDir public_html</td>
+ <td>~bob/public_html/one/two.html</td></tr>
+ <tr><td>UserDir /usr/web</td>
+ <td>/usr/web/bob/one/two.html</td></tr>
+ <tr><td>UserDir /home/*/www</td>
+ <td>/home/bob/www/one/two.html</td></tr>
+ </table>
+
+ <p>The following directives will send redirects to the client:</p>
+
+ <table>
+ <tr><th>UserDir directive used</th>
+ <th>Translated path</th></tr>
+ <tr><td>UserDir http://www.example.com/users</td>
+ <td>http://www.example.com/users/bob/one/two.html</td></tr>
+ <tr><td>UserDir http://www.example.com/*/usr</td>
+ <td>http://www.example.com/bob/usr/one/two.html</td></tr>
+ <tr><td>UserDir http://www.example.com/~*/</td>
+ <td>http://www.example.com/~bob/one/two.html</td></tr>
+ </table>
-<note>
+ <note>
<strong>Be careful when using this directive; for instance,
<code>"UserDir ./"</code> would map <code>"/~root"</code> to
<code>"/"</code> - which is probably undesirable. It is strongly
@@ -113,49 +117,54 @@
module="core">Directory</directive> directive and the <a
href="../misc/security_tips.html">Security Tips</a> page for
more information.</strong>
-</note>
+ </note>
-<p>Additional examples:</p>
+ <p>Additional examples:</p>
-<p>To allow a few users to have <code>UserDir</code> directories, but
-not anyone else, use the following:</p>
+ <p>To allow a few users to have <code>UserDir</code> directories, but
+ not anyone else, use the following:</p>
-<example>
-UserDir disabled<br />
-UserDir enabled user1 user2 user3
-</example>
-
-<p>To allow most users to have <code>UserDir</code> directories, but
-deny this to a few, use the following:</p>
-
-<example>
-UserDir enabled<br />
-UserDir disabled user4 user5 user6
-</example>
-
-<p>It is also possible to specify alternative user directories.
-If you use a command like:</p>
-<example>
-Userdir public_html /usr/web http://www.example.com/
-</example>
-<p>With a request for http://www.example.com/~bob/one/two.html, will try to
-find the page at ~bob/public_html/one/two.html first, then
-/usr/web/bob/one/two.html, and finally it will send a redirect
-to http://www.example.com/bob/one/two.html.</p>
-<p>If you add a redirect, it must be the last alternative in the list.
-Apache cannot determine if the redirect succeeded or not, so if you have
-the redirect earlier in the list, that will always be the alternative
-that is used.</p>
-
-<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>
-directive was present.</p>
+ <example>
+ UserDir disabled<br />
+ UserDir enabled user1 user2 user3
+ </example>
+
+ <p>To allow most users to have <code>UserDir</code> directories, but
+ deny this to a few, use the following:</p>
+
+ <example>
+ UserDir enabled<br />
+ UserDir disabled user4 user5 user6
+ </example>
+
+ <p>It is also possible to specify alternative user directories.
+ If you use a command like:</p>
+
+ <example>
+ Userdir public_html /usr/web http://www.example.com/
+ </example>
+
+ <p>With a request for
+ <code>http://www.example.com/~bob/one/two.html</code>, will try to
+ find the page at <code>~bob/public_html/one/two.html</code> first, then
+ <code>/usr/web/bob/one/two.html</code>, and finally it will send a
+ redirect to <code>http://www.example.com/bob/one/two.html</code>.</p>
+
+ <p>If you add a redirect, it must be the last alternative in the list.
+ Apache cannot determine if the redirect succeeded or not, so if you have
+ the redirect earlier in the list, that will always be the alternative
+ that is used.</p>
+
+ <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>
+ directive was present.</p>
</usage>
-<seealso><a href="../howto/public_html.html">public_html
-tutorial</a></seealso>
+<seealso>
+ <a href="../howto/public_html.html">public_html tutorial</a>
+</seealso>
</directivesynopsis>
</modulesynopsis>