[deployment-guide/comm-rel-14: 649/677] Merge branch 'ent' into ent-rel-6

[Jaromir Hradilek]

commit 3eafa35fb874720dde02b98777cabc0bf5b9d170
Merge: 5f95338... db33011...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Wed Nov 3 18:21:03 2010 +0100

    Merge branch 'ent' into ent-rel-6
    
    Conflicts:
    	publican.cfg

 en-US/ABRT.xml                                     |  191 +-
 en-US/AUTHORS                                      |   14 +-
 en-US/Authentication_Configuration.xml             |    3 +-
 en-US/Automated_Tasks.xml                          |    4 +-
 en-US/Book_Info.xml                                |    2 +-
 en-US/Controlling_Access_to_Services.xml           |    2 +-
 en-US/Date_and_Time_Configuration.xml              |    2 +-
 en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml |    5 +-
 en-US/Email.xml                                    |   47 +-
 en-US/FTP.xml                                      |   36 +-
 en-US/Gathering_System_Information.xml             |   93 +-
 .../Lightweight_Directory_Access_Protocol_LDAP.xml | 1676 ++++----
 en-US/Log_Files.xml                                |  784 +++-
 en-US/Network_Configuration.xml                    |    2 +-
 en-US/Network_Interfaces.xml                       |    6 +-
 en-US/OProfile.xml                                 |   35 -
 en-US/Printer_Configuration.xml                    |    2 +-
 en-US/RPM.xml                                      |    4 +-
 en-US/SSSD.xml                                     |   30 +-
 en-US/Samba.xml                                    |  136 +-
 en-US/The_Apache_HTTP_Server.xml                   | 4730 +++++++++++++-------
 en-US/The_X_Window_System.xml                      |  186 +-
 en-US/The_kdump_Crash_Recovery_Service.xml         |   35 +-
 en-US/The_proc_File_System.xml                     |  145 +-
 en-US/The_sysconfig_Directory.xml                  |  180 -
 en-US/Users_and_Groups.xml                         | 2937 +++++++------
 en-US/Working_with_Kernel_Modules.xml              | 1746 ++++----
 en-US/Yum.xml                                      |   38 +-
 en-US/icons/icon.svg                               | 4073 +----------------
 en-US/images/ABRT-Notification_Area_alarm_icon.png |  Bin 1009 -> 1187 bytes
 en-US/images/apache-mod_ssl-genkey-01.png          |  Bin 0 -> 139602 bytes
 en-US/images/apache-mod_ssl-genkey-02.png          |  Bin 0 -> 145185 bytes
 en-US/images/apache-mod_ssl-genkey-03.png          |  Bin 0 -> 91440 bytes
 en-US/images/apache-mod_ssl-genkey-04.png          |  Bin 0 -> 147106 bytes
 en-US/images/apache-mod_ssl-genkey-05.png          |  Bin 0 -> 137555 bytes
 en-US/images/apache-mod_ssl-genkey-06.png          |  Bin 0 -> 148690 bytes
 en-US/images/apache-mod_ssl-genkey-07.png          |  Bin 0 -> 144241 bytes
 en-US/images/authentication_configuration.png      |  Bin 0 -> 24892 bytes
 en-US/images/genkey1.png                           |  Bin 9587 -> 0 bytes
 en-US/images/genkey10.png                          |  Bin 16485 -> 0 bytes
 en-US/images/genkey11.png                          |  Bin 7436 -> 0 bytes
 en-US/images/genkey2.png                           |  Bin 10374 -> 0 bytes
 en-US/images/genkey3.png                           |  Bin 18324 -> 0 bytes
 en-US/images/genkey4.png                           |  Bin 6604 -> 0 bytes
 en-US/images/genkey5.png                           |  Bin 9053 -> 0 bytes
 en-US/images/genkey6.png                           |  Bin 12479 -> 0 bytes
 en-US/images/genkey7.png                           |  Bin 17567 -> 0 bytes
 en-US/images/genkey8.png                           |  Bin 10794 -> 0 bytes
 en-US/images/genkey9.png                           |  Bin 11766 -> 0 bytes
 en-US/images/gnome-system-monitor-filesystems.png  |  Bin 23184 -> 65650 bytes
 en-US/images/gnome-system-monitor-memory.png       |  Bin 11217 -> 139795 bytes
 en-US/images/gnome-system-monitor-processes.png    |  Bin 14094 -> 110184 bytes
 en-US/images/redhat-filter-enable.png              |  Bin 0 -> 194249 bytes
 en-US/images/redhat-filter-sample.png              |  Bin 0 -> 16132 bytes
 en-US/images/redhat-filters.png                    |  Bin 0 -> 9495 bytes
 en-US/images/redhat-logviewer-add.png              |  Bin 13899 -> 147036 bytes
 en-US/images/redhat-logviewer-monitoring.png       |  Bin 0 -> 159116 bytes
 en-US/images/redhat-logviewer-monitoring1.png      |  Bin 20495 -> 0 bytes
 en-US/images/redhat-logviewer-monitoring2.png      |  Bin 27489 -> 0 bytes
 en-US/images/redhat-logviewer-monitoring3.png      |  Bin 26805 -> 0 bytes
 en-US/images/redhat-logviewer-prefs.png            |  Bin 27983 -> 0 bytes
 en-US/images/redhat-logviewer-sample.png           |  Bin 21035 -> 0 bytes
 en-US/images/redhat-logviewer.png                  |  Bin 26264 -> 166037 bytes
 publican.cfg                                       |    2 +-
 64 files changed, 7853 insertions(+), 9293 deletions(-)
---