[deployment-guide/comm-rel: 569/727] Updated the User directive description.

[Jaromir Hradilek]

commit a4efacd8816483d502224dbc6eed83d67ac896a5
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Thu Sep 2 17:48:31 2010 +0200

    Updated the User directive description.

 en-US/The_Apache_HTTP_Server.xml |   51 ++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index ae735d1..686333d 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -972,10 +972,10 @@ ErrorDocument 404 /404-not_found.html</screen>
             </para>
             <screen>Group <replaceable>group</replaceable></screen>
             <para>
-              The <replaceable>group</replaceable> has to be an existing UNIX group. The default option is <systemitem class="groupname">apache</systemitem>.
+              The <replaceable>group</replaceable> has to be an existing UNIX group. The default option is <option>apache</option>.
             </para>
             <para>
-              Note that this directive is no longer supported inside <option>&lt;VirtualHost&gt;</option>.
+              Note that <option>Group</option> is no longer supported inside <option>&lt;VirtualHost&gt;</option>, and has been replaced by the <option>SuexecUserGroup</option> directive.
             </para>
             <example id="example-apache-httpdconf-group">
               <title>Using the <option>Group</option> directive</title>
@@ -2010,7 +2010,7 @@ ErrorDocument 404 /404-not_found.html</screen>
               The <replaceable>user</replaceable> has to be an existing user, and the <replaceable>group</replaceable> must be a valid UNIX group.
             </para>
             <para>
-              Note that for security reasons, the CGI scripts should not be run with root privileges. In <option>&lt;VirtualHost&gt;</option>, this directive replaces the <option>User</option> and <option>Group</option> directives.
+              For security reasons, the CGI scripts should not be run with root privileges. Note that in <option>&lt;VirtualHost&gt;</option>, <option>SuexecUserGroup</option> replaces the <option>User</option> and <option>Group</option> directives.
             </para>
             <example id="example-apache-httpdconf-suexecusergroup">
               <title>Using the <option>SuexecUserGroup</option> directive</title>
@@ -2112,6 +2112,25 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>User</option></term>
+          <listitem>
+            <para>
+              The <option>User</option> directive allows you to specify the user under which the <systemitem class="service">httpd</systemitem> service will run. It takes the following form: 
+            </para>
+            <screen>User <replaceable>user</replaceable></screen>
+            <para>
+              The <replaceable>user</replaceable> has to be an existing UNIX user. The default option is <option>apache</option>.
+            </para>
+            <para>
+              For security reasons, the <systemitem class="service">httpd</systemitem> service should not be run with root privileges. Note that <option>User</option> is no longer supported inside <option>&lt;VirtualHost&gt;</option>, and has been replaced by the <option>SuexecUserGroup</option> directive.
+            </para>
+            <example id="example-apache-httpdconf-user">
+              <title>Using the <option>User</option> directive</title>
+              <screen>User apache</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
       <formalpara id="s2-apache-indexoptions">
         <title>IndexOptions</title>
@@ -2139,32 +2158,6 @@ ErrorDocument 404 /404-not_found.html</screen>
       <para>
         <command>IndexOptions</command> has a number of other parameters which can be set to control the appearance of server generated directories. The <command>IconHeight</command> and <command>IconWidth</command> parameters require the server to include HTML <command>HEIGHT</command> and <command>WIDTH</command> tags for the icons in server generated webpages. The <command>IconsAreLinks</command> parameter combines the graphical icon with the HTML link anchor, which contains the URL link target.
       </para>
-      <formalpara id="s2-apache-user">
-        <title>User</title>
-        <indexterm>
-          <primary><command>User</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>User</command></secondary>
-        </indexterm>
-        <para>
-          The <command>User</command> directive sets the username of the server process and determines what files the server is allowed to access. Any files inaccessible to this user are also inaccessible to clients connecting to the Apache HTTP Server.
-        </para>
-      </formalpara>
-      <para>
-        By default <command>User</command> is set to <command>apache</command>.
-      </para>
-      <para>
-        This directive has been deprecated for the configuration of virtual hosts.
-      </para>
-      <note>
-        <title>Note</title>
-        <para>
-          For security reasons, the Apache HTTP Server does not run as the root user.
-        </para>
-      </note>
       <formalpara id="s2-apache-userdir">
         <title>UserDir</title>
         <indexterm>