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

[Jaromir Hradilek]

commit 56bfc836ec5933637e46f50308125690a4748fbe
Merge: 5c4bafe... 81466e7...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Jul 28 16:27:45 2010 +0200

    Merge branch 'master' into ent
    
    Conflicts:
    	en-US/The_BIND_DNS_Server.xml

 .gitignore                                         |    1 +
 en-US/ABRT.xml                                     |  264 ++-
 en-US/Automated_Tasks.xml                          |   12 +-
 en-US/Book_Info.xml                                |    2 +-
 en-US/Deployment_Guide.xml                         |   18 +-
 en-US/General_Parameters_and_Modules.xml           |  171 +-
 en-US/Manually_Upgrading_the_Kernel.xml            |  191 +-
 en-US/RPM.xml                                      |    2 +-
 en-US/SSSD.xml                                     |   57 +-
 en-US/The_BIND_DNS_Server.xml                      | 2594 ++++++++++---------
 en-US/The_kdump_Crash_Recovery_Service.xml         |  202 ++
 en-US/The_proc_File_System.xml                     |    2 +-
 en-US/Yum.xml                                      |    4 +-
 en-US/images/ABRT-Main_Window.png                  |  Bin 70322 -> 62743 bytes
 en-US/images/abrt_main.png                         |  Bin 45328 -> 0 bytes
 ...nel_dump_configuration-authentication_query.png |  Bin 0 -> 21238 bytes
 ...p-kernel_dump_configuration-expert_settings.png |  Bin 0 -> 103326 bytes
 ...ernel_dump_configuration-filtering_settings.png |  Bin 0 -> 81998 bytes
 ...kernel_dump_configuration-not_enough_memory.png |  Bin 0 -> 8602 bytes
 ...mp-kernel_dump_configuration-reboot_request.png |  Bin 0 -> 67042 bytes
 ...p-kernel_dump_configuration-target_settings.png |  Bin 0 -> 82693 bytes
 en-US/images/kdump-kernel_dump_configuration.png   |  Bin 0 -> 85823 bytes
 .../recently_removed_files}/Console_Access.xml     |    0 
 .../recently_removed_files}/Red_Hat_Network.xml    |    0 
 24 files changed, 2062 insertions(+), 1458 deletions(-)
---