pre-translation improvements

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

diff --git a/docs/manual/mod/mod_suexec.xml b/docs/manual/mod/mod_suexec.xml
index f6517a7d28afc5c0e27f8f3859c64eb589cd9559..75e9d07c542d7452f17d711604715ebee80fb27f 100644 (file)
--- a/docs/manual/mod/mod_suexec.xml
+++ b/docs/manual/mod/mod_suexec.xml
@@ -42,7 +42,7 @@ and Group</description>
 <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 @@ later.</compatibility>
 <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>

diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 71989d0e2a2bc3641fb2128bef597afa4ee7ea7d..98f4a916577976f363fe537136ad7cc870169966 100644 (file)
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -84,27 +84,31 @@ host</context></contextlist>
     <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> 
-
-<note>
+    <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>
       <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 @@ http://www.example.com/~*/</td><td>http://www.example.com/~bob/one/two.html</td>
       module="core">Directory</directive> directive and the <a
       href="../misc/security_tips.html">Security Tips</a> page for
       more information.</strong>
-</note>
-
-<p>Additional examples:</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>
+    </note>
+
+    <p>Additional examples:</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
+    <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>