[deployment-guide/comm-rel: 233/727] Merge branch 'master' into ent

[Jaromir Hradilek]

commit 6ba66d536cb6e7e536a3c7e0b9be5c81b899d26f
Merge: 97c4faa... 6abfe33...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Mon Aug 2 21:41:58 2010 +0200

    Merge branch 'master' into ent

 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                  |   10 +--
 en-US/Users_and_Groups.xml                         |    7 +-
 13 files changed, 66 insertions(+), 118 deletions(-)
---