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

[Jaromir Hradilek]

commit 1b72c3870f0c375337209781aacbe8e4d11fd0ea
Merge: 6d41db7... 502d686...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Fri Jun 25 16:20:14 2010 +0200

    Merge branch 'master' into ent

 .gitignore                                         |    1 +
 en-US/Console_Access.xml                           |    8 +--
 en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml |   28 ++++++------
 en-US/Log_Files.xml                                |    6 +-
 en-US/Samba.xml                                    |    2 +-
 en-US/The_BIND_DNS_Server.xml                      |    6 +-
 en-US/The_proc_File_System.xml                     |   45 ++++++++++++++++++--
 en-US/The_sysconfig_Directory.xml                  |    2 +-
 8 files changed, 67 insertions(+), 31 deletions(-)
---