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

[Jaromir Hradilek]

commit b80d717c8afee3b99dd1e83077962f6c6bb733d6
Merge: 85283eb... 93dcecf...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Thu Oct 7 01:21:03 2010 +0200

    Merge branch 'master' into ent

 en-US/ABRT.xml                                     |   29 +-
 en-US/Automated_Tasks.xml                          |    4 +-
 en-US/Book_Info.xml                                |    2 +-
 en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml |    2 +-
 en-US/FTP.xml                                      |    4 +-
 en-US/Gathering_System_Information.xml             |   25 +-
 .../Lightweight_Directory_Access_Protocol_LDAP.xml |  761 ++++--
 en-US/Log_Files.xml                                |  473 +++-
 en-US/Network_Configuration.xml                    |    2 +-
 en-US/Printer_Configuration.xml                    |    2 +-
 en-US/RPM.xml                                      |    2 +-
 en-US/The_Apache_HTTP_Server.xml                   |   36 +-
 en-US/The_X_Window_System.xml                      |    2 +-
 en-US/Users_and_Groups.xml                         | 2588 +++++++++++---------
 en-US/Working_with_Kernel_Modules.xml              |    2 +-
 en-US/Yum.xml                                      |    2 +-
 16 files changed, 2397 insertions(+), 1539 deletions(-)
---