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

[Jaromir Hradilek]

commit 47be9a5f6e3b1118ee5326b1faddc56981822bf0
Merge: 670560b... 6abfe33...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Aug 3 11:19:59 2010 +0200

    Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide

 en-US/Automated_Tasks.xml                          |   18 ++--
 en-US/Controlling_Access_to_Services.xml           |    2 +-
 en-US/Deployment_Guide.xml                         |   84 +++++++-------------
 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                  |   10 +--
 en-US/Users_and_Groups.xml                         |    7 +-
 ...Modules.xml => Working_with_Kernel_Modules.xml} |    4 +-
 14 files changed, 69 insertions(+), 121 deletions(-)
---