[deployment-guide/comm-rel: 234/727] Merge branch 'ent' into ent-rel-6

[Jaromir Hradilek]

commit 7d7b499584f1d4004346b085366ed8418435c3d8
Merge: ce62f72... 6ba66d5...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Mon Aug 2 21:44:43 2010 +0200

    Merge branch 'ent' into ent-rel-6
    
    Conflicts:
    	en-US/The_sysconfig_Directory.xml

 en-US/Automated_Tasks.xml                          |   18 ++--
 en-US/Controlling_Access_to_Services.xml           |    2 +-
 en-US/Deployment_Guide.xml                         |   82 +++++++-------------
 en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml |    5 +-
 en-US/Email.xml                                    |    6 +-
 en-US/FTP.xml                                      |   12 +--
 en-US/Introduction.xml                             |   15 +---
 .../Lightweight_Directory_Access_Protocol_LDAP.xml |    6 +-
 en-US/Network_Interfaces.xml                       |   12 +--
 en-US/RPM.xml                                      |    3 +-
 en-US/Samba.xml                                    |    6 +-
 en-US/The_sysconfig_Directory.xml                  |   15 +---
 en-US/Users_and_Groups.xml                         |    7 +-
 13 files changed, 67 insertions(+), 122 deletions(-)
---
diff --cc en-US/The_sysconfig_Directory.xml
index ecace54,a6b1340..f9ffe6b
--- a/en-US/The_sysconfig_Directory.xml
+++ b/en-US/The_sysconfig_Directory.xml
@@@ -2043,22 -1552,14 +2042,21 @@@
            <filename>/etc/sysconfig/system-config-securitylevel</filename>
          </secondary>
        </indexterm>
-       <para
-         lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN">
+       <para>
          The <filename>/etc/sysconfig/system-config-securitylevel</filename> file contains all options chosen by the user the last time the <application>Security Level Configuration Tool</application> (<command>system-config-securitylevel</command>) was run. Users should not modify this file by hand. For more information about the <application>Security Level Configuration Tool</application>, refer to <xref linkend="s1-basic-firewall" /> .</para>
      </section>-->
 -    <section id="s2-sysconfig-rcu">
 -      <title><filename>/etc/sysconfig/system-config-users</filename></title>
 +    <section
 +      id="s2-sysconfig-rcu">
 +      <title>
 +        <filename>/etc/sysconfig/system-config-users</filename>
 +      </title>
        <indexterm>
 -        <primary><filename class="directory">sysconfig</filename> directory</primary>
 -        <secondary><filename>/etc/sysconfig/system-config-users</filename></secondary>
 +        <primary>
 +          <filename
 +            class="directory">sysconfig</filename> directory</primary>
 +        <secondary>
 +          <filename>/etc/sysconfig/system-config-users</filename>
 +        </secondary>
        </indexterm>
        <para>
          The <filename>/etc/sysconfig/system-config-users</filename> file is the configuration file for the <application>User Manager</application> utility, and should not be edited by hand. By default, it contains the following options:
@@@ -2162,19 -1636,11 +2160,18 @@@
          </varlistentry>
        </variablelist>
      </section>
 -    <section id="s2-sysconfig-xinetd">
 -      <title><filename>/etc/sysconfig/xinetd</filename></title>
 +    <section
-       id="s2-sysconfig-xinetd"
-       lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN">
++      id="s2-sysconfig-xinetd">
 +      <title>
 +        <filename>/etc/sysconfig/xinetd</filename>
 +      </title>
        <indexterm>
 -        <primary><filename class="directory">sysconfig</filename> directory</primary>
 -        <secondary><filename>/etc/sysconfig/xinetd</filename></secondary>
 +        <primary>
 +          <filename
 +            class="directory">sysconfig</filename> directory</primary>
 +        <secondary>
 +          <filename>/etc/sysconfig/xinetd</filename>
 +        </secondary>
        </indexterm>
        <para>
          The <filename>/etc/sysconfig/xinetd</filename> file is used to pass arguments to the <command>xinetd</command> daemon at boot time. By default, it contains the following options:
@@@ -2371,14 -1788,11 +2368,12 @@@
        </indexterm>
        <variablelist>
          <varlistentry>
 -          <term><filename>/usr/share/doc/initscripts-<replaceable>version</replaceable>/sysconfig.txt</filename></term>
 +          <term>
 +            <filename>/usr/share/doc/initscripts-<replaceable>version</replaceable>/sysconfig.txt</filename>
 +          </term>
            <listitem>
--            <para>
-               A more authoritative listing of the files found in the <filename
-                 class="directory">/etc/sysconfig/</filename> directory and the configuration options available for them.
-             </para>
 -              A more authoritative listing of the files found in the <filename class="directory">/etc/sysconfig/</filename> directory and the configuration options available for them.
 -            </para>
++            <para>A more authoritative listing of the files found in the <filename
++                class="directory">/etc/sysconfig/</filename> directory and the configuration options available for them.</para>
            </listitem>
          </varlistentry>
        </variablelist>