From 49c9566c833ee055666ed7a44e8bbc8aa3f2f259 Mon Sep 17 00:00:00 2001
From: Douglas Silas <dhensley@redhat.com>
Date: Apr 19 2010 02:28:23 +0000
Subject: XWin: comment out refs to s-c-display, ConfigXWin


---

diff --git a/en-US/The_X_Window_System.xml b/en-US/The_X_Window_System.xml
index 113c5e0..be463c2 100644
--- a/en-US/The_X_Window_System.xml
+++ b/en-US/The_X_Window_System.xml
@@ -45,6 +45,7 @@
       <secondary>X server</secondary>
       <tertiary>features of</tertiary>
     </indexterm>
+    <!-- silas: s-c-display removed from RHEL6
     <indexterm
       significance="normal">
       <primary>X</primary>
@@ -52,7 +53,7 @@
       <tertiary>
         <application>system-config-display</application>
       </tertiary>
-    </indexterm>
+    </indexterm>-->
 		<!-- RHEL5:  	ddomingo@redhat.com: replacement, mostly from http://ftp.x.org/pub/X11R7.1/doc/RELNOTES1.html#1  -->
     <para>&MAJOROSVER; uses the X11R7.1 release as the base X Window System, which includes several video driver, EXA, and platform support enhancements over the previous release, among others. In addition, this release also includes several automatic configuration features for the X server.</para>
     <para>X11R7.1 is the first release to take specific advantage of the modularization of the X Window System. This modularization, which splits X into logically distinct modules, makes it easier for open source developers to contribute code to the system.</para>
@@ -91,14 +92,13 @@
 		</variablelist>
 		  -->
     <para>Because the X server performs advanced tasks on a wide array of hardware, it requires detailed information about the hardware it works on. The X server automatically detects some of this information; other details must be configured.</para>
-    <para>The installation program installs and configures X automatically, unless the X11R7.1 release packages are not selected for installation. However, if there are any changes to the monitor, video card or other devices managed by the X server, X must be reconfigured. The best way to do this is to use the <application>X Configuration Tool</application> (<command>system-config-display</command>), particularly for devices that are not detected manually.</para>
-		<!-- RHEL5:  	ddomingo@redhat.com: above replaces below, edits as per kem@redhat.com
-		<para>The installation program installs and configures X automatically, unless the X11R7.1 release packages are not selected for installation. However, if the monitor or video card changes, X must be reconfigured. The best way to do this is to use the <application>&RHXFREE86TOOL;</application> (<command>system-config-display</command>).</para>
-		  -->
+    <para>The installation program installs and configures X automatically, unless the X11R7.1 release packages are not selected for installation. However, if there are any changes to the monitor, video card or other devices managed by the X server, X must be reconfigured.</para>
+    <!-- silas: s-c-display not in RHEL6; following section removed
+    The best way to do this is to use the <application>X Configuration Tool</application> (<command>system-config-display</command>), particularly for devices that are not detected manually.</para>
     <para>In &MAJOROS;'s default graphical environment, the <application>X Configuration Tool</application> is available at System (on the panel) &gt; <guimenu>Administration</guimenu> &gt; <guimenu>Display</guimenu>.</para>
     <para>Changes made with the <application>X Configuration Tool</application> take effect after logging out and logging back in.</para>
     <para>For more information about <application>X Configuration Tool</application>, refer to <xref
-        linkend="ch-Configuring_the_X_Window_System"/>.</para>
+        linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
 		<!-- RHEL5:  	peer review: above 3 para replaces below
 		<para>To start the <application>&RHXFREE86TOOL;</application> while in an active X session, go to &RHTHIRDMENU; &gt; <guimenu>Administration</guimenu> &gt;
 			<guimenu>Display</guimenu>. After using the <application>&RHXFREE86TOOL;</application> during an X session, changes takes effect after logging out and logging back in. For more about using the
@@ -728,8 +728,9 @@ EndSection</command>
           </tertiary>
         </indexterm>
         <para>Each <command>Monitor</command> section configures one type of monitor used by the system. This is an optional entry as well, as most monitors are now automatically detected.</para>
+        <!-- silas: s-c-display removed from RHEL6
         <para>The easiest way to configure a monitor is to configure X during the installation process or by using the <application>X Configuration Tool</application>. For more information about using the <application>X Configuration Tool</application>, refer to <xref
-            linkend="ch-Configuring_the_X_Window_System"/>.</para>
+            linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
         <para>This example illustrates a typical <command>Monitor</command> section for a monitor:</para>
         <screen>
 <command>Section "Monitor" Identifier "Monitor0" VendorName "Monitor Vendor" ModelName "DDC Probed Monitor - ViewSonic G773-2" DisplaySize 320 240 HorizSync 30.0 - 70.0 VertRefresh 50.0 - 180.0 EndSection</command>
@@ -790,8 +791,9 @@ EndSection</command>
           </tertiary>
         </indexterm>
         <para>Each <command>Device</command> section configures one video card on the system. While one <command>Device</command> section is the minimum, additional instances may occur for each video card installed on the machine.</para>
+        <!-- silas: s-c-display removed from RHEL6
         <para>The best way to configure a video card is to configure X during the installation process or by using the <application>X Configuration Tool</application>. For more about using the <application>X Configuration Tool</application>, refer to <xref
-            linkend="ch-Configuring_the_X_Window_System"/>.</para>
+            linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
         <para>The following example illustrates a typical <command>Device</command> section for a video card:</para>
         <screen>
 <command>Section "Device" Identifier "Videocard0" Driver "mga" VendorName "Videocard vendor" BoardName "Matrox Millennium G200" VideoRam 8192 Option "dpms" EndSection</command>