[deployment-guide/comm-rel: 179/727] (multiple): remove RHN, Console Access chapters; comment out links

[Jaromir Hradilek]

commit 4daa2bb6c14a77cf9391460106b829086f958259
Author: Douglas Silas <dhensley at redhat.com>
Date:   Wed Jul 28 01:42:47 2010 +0200

    (multiple): remove RHN, Console Access chapters; comment out links
    
    bz 561643: obsolete: move Console Access chapter out of DG into var/recently_replaced_files. Chapter replacement candidate tracker bugs: (BZ#617222), (BZ#617221), (BZ#617224).
    bz 618878: obsolete: mv current RHEL5 Red Hat Network chapter out of DG into var/recently_replaced_files. (BZ#618878) is chapter replacement tracker bug. Replace links to RHN chapter in RPM, Kernel chapters with TBD6_1 comments for later re-inclusion.

 en-US/Deployment_Guide.xml                         |   15 +++++++++------
 en-US/Manually_Upgrading_the_Kernel.xml            |    5 +++--
 en-US/RPM.xml                                      |    2 +-
 .../recently_removed_files}/Console_Access.xml     |    0 
 .../recently_removed_files}/Red_Hat_Network.xml    |    0 
 5 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/en-US/Deployment_Guide.xml b/en-US/Deployment_Guide.xml
index 8aa4706..ab5e15d 100644
--- a/en-US/Deployment_Guide.xml
+++ b/en-US/Deployment_Guide.xml
@@ -29,9 +29,10 @@
     <xi:include
       xmlns:xi="http://www.w3.org/2001/XInclude"
       href="RPM.xml"/>
+    <!-- RHEL6: silas: removing outdated RHEL5 RHN chapter: see bug 618878 for replacement chapter progress
     <xi:include
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="Red_Hat_Network.xml"/>
+      href="Red_Hat_Network.xml"/>-->
   </part>
   <part
     id="pt-network-related-config"
@@ -96,14 +97,16 @@
     <partintro>
       <para>Part of a system administrator's job is configuring the system for various tasks, types of users, and hardware configurations. This section explains how to configure a &MAJOROS; system.</para>
     </partintro>
+    <!-- RHEL6: silas: removing the Console Access chapter as per BZ#561643
+    This chapter will be replaced by one or more (of a combination of) ConsoleKit, PolicyKit and sudo chapters/sections (bugs 617222, 617221, 617224)
     <xi:include
       xmlns:xi="http://www.w3.org/2001/XInclude"
       href="Console_Access.xml"
-      lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"/>
-      <xi:include
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"
-        href="The_proc_File_System.xml" />
+      lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"/>-->
+    <xi:include
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"
+      href="The_proc_File_System.xml" />
     <xi:include
       xmlns:xi="http://www.w3.org/2001/XInclude"
       href="The_sysconfig_Directory.xml"
diff --git a/en-US/Manually_Upgrading_the_Kernel.xml b/en-US/Manually_Upgrading_the_Kernel.xml
index 2966738..d60e714 100644
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@ -44,8 +44,9 @@
     <secondary>installing kernel packages</secondary>
   </indexterm>
   <para>For more information on installing kernel packages with <application>Yum</application>, refer to <xref
-      linkend="sec-Updating_Packages"/>. For information on Red Hat Network, refer to <xref
-      linkend="ch-rhnetwork"/>.</para>
+      linkend="sec-Updating_Packages"/>.</para>
+      <!-- TBD6_1: silas: re-include link to RHN chapter
+      <para>For information on Red Hat Network, refer to <xref linkend="ch-rhnetwork"/>.</para>-->
   <section
     id="s1-kernel-packages">
     <title>Overview of Kernel Packages</title>
diff --git a/en-US/RPM.xml b/en-US/RPM.xml
index 33e457e..f3252a1 100644
--- a/en-US/RPM.xml
+++ b/en-US/RPM.xml
@@ -154,7 +154,7 @@
               url="http://www.redhat.com/apps/support/errata/"/>
           </para>
         </listitem>
-				<!-- TBD6: re-include for RHEL once RHN chapter is incorporated
+				<!-- TBD6_1: silas: re-include link to RHN chapter
 				<listitem>
 					<para>Red Hat Network — Refer to <xref
 							linkend="ch-rhnetwork"/> for more details on Red Hat Network.</para>
diff --git a/en-US/Console_Access.xml b/var/recently_removed_files/Console_Access.xml
similarity index 100%
rename from en-US/Console_Access.xml
rename to var/recently_removed_files/Console_Access.xml
diff --git a/en-US/Red_Hat_Network.xml b/var/recently_removed_files/Red_Hat_Network.xml
similarity index 100%
rename from en-US/Red_Hat_Network.xml
rename to var/recently_removed_files/Red_Hat_Network.xml