[deployment-guide/comm-rel: 715/727] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[Jaromir Hradilek]

commit 93dcecf18efe07201e07a9ef8413173485d82a17
Merge: e86ecf8... ce2545a...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Thu Oct 7 01:18:34 2010 +0200

    Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide
    
    Conflicts:
    	en-US/Lightweight_Directory_Access_Protocol_LDAP.xml

 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 +-
 .../Lightweight_Directory_Access_Protocol_LDAP.xml |    6 +-
 en-US/Log_Files.xml                                |  470 +++--
 en-US/Network_Configuration.xml                    |    2 +-
 en-US/Printer_Configuration.xml                    |    2 +-
 en-US/RPM.xml                                      |    2 +-
 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 +-
 14 files changed, 1779 insertions(+), 1338 deletions(-)
---