[deployment-guide/comm-rel-14: 662/677] Merge branch 'ent-rel-6_0_GA' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deploym

[Jaromir Hradilek]

commit e8f70b6e8f054f9003f95931942860e3b2ea0078
Merge: d27139b... 3327762...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Tue Nov 9 18:53:40 2010 +0100

    Merge branch 'ent-rel-6_0_GA' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide into ent-rel-6_0_GA

 en-US/ABRT.xml                         |    2 +-
 en-US/Authentication_Configuration.xml |    7 +++++--
 en-US/Date_and_Time_Configuration.xml  |    2 +-
 en-US/Deployment_Guide.xml             |   24 ++++++++++++------------
 en-US/Email.xml                        |    4 ++++
 en-US/The_sysconfig_Directory.xml      |    4 ++++
 6 files changed, 27 insertions(+), 16 deletions(-)
---