commit 77cda48556df57cc6c8241fbed8ec08285cdb6ed
Merge: 5356105... 502d686...
Author: Jaromir Hradilek <jhradile(a)redhat.com>
Date: Mon Jun 28 14:47:43 2010 +0200
Merge branch 'master' of
git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide
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 +-
6 files changed, 63 insertions(+), 26 deletions(-)
---