Commit bd08c98d authored by Nilgun Belma Buguner's avatar Nilgun Belma Buguner
Browse files

pre-translation improvements

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@698483 13f79535-47bb-0310-9956-ffa450edef68
parent daf0644b
Loading
Loading
Loading
Loading
+5 −4
Changes for docs/manual/mod/mod_suexec.xml: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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>
+23 −14
Changes for docs/manual/mod/mod_userdir.xml: 23 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -87,9 +87,12 @@ host</context></contextlist>
    <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>
      <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>
@@ -97,11 +100,12 @@ host</context></contextlist>
    <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>
      <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>
@@ -135,13 +139,17 @@ UserDir disabled user4 user5 user6

    <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>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
@@ -154,8 +162,9 @@ 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>