en-US/Display.xml en-US/Mouse.xml en-US/Release_Notes.xml en-US/Xorg.xml

[John J. McDonough]

 en-US/Display.xml       |   12 ------------
 en-US/Mouse.xml         |   20 --------------------
 en-US/Release_Notes.xml |    2 ++
 en-US/Xorg.xml          |   46 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 47 insertions(+), 33 deletions(-)

New commits:
commit 8149bed4d3428cd3234ee43a8e05520379e33ef6
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date:   Fri Oct 15 09:31:52 2010 -0400

    Incorporate Mouse and Display additions
    
    Added text from Mouse.xml and Display.xml to Xorg.xml
    Corrected tagging errors in Mouse.xml
    Deleted separate Mouse.xml and Display.xml files
    Uncomment inclusion of Xorg in Release_Notes.xml

diff --git a/en-US/Display.xml b/en-US/Display.xml
deleted file mode 100644
index 613b51d..0000000
--- a/en-US/Display.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Release_Notes.ent">
-%BOOK_ENTITIES;
-]>
-
-<section id="sect-Release_Notes-Display_Adaptor">
-  <title>vbetool not installed by default</title>
-  <para>
-   Due to problems with <package>vbetool</package>, this package has been removed from the default installation of Fedora.  This change may impact users with suspending and resuming their computers.  These problems should only affect users of uncommon VGA adaptors and not users of nVidia, ati, or Intel adaptors.
-  </para>
-</section>
diff --git a/en-US/Mouse.xml b/en-US/Mouse.xml
deleted file mode 100644
index de3eccc..0000000
--- a/en-US/Mouse.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook EBNF Module V1.1CR1//EN"
-"http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd">
-<section id="sect-Release_Notes-Mouse_Behavior">
-  <title>Mouse Behavior</title>
-    <para>
-      The latest version of <package>evdev</package>, version 2.5, changed the default for the middle mouse button emulation code.  This change has disabled emulation of the middle mouse button by clicking the left and right mouse buttons.
-    </para>
-  <section>
-    <title>Enabling the middle mouse button emulation.</title>
-    <para>
-     Middle mouse button emulation can be enabled by the addition of a xorg.conf snippet:
-     <code>Section "InputClass"
-    Identifier "middle button emulation class"
-    MatchIsPointer "on"
-    Option "Emulate3Buttons" "on"
-EndSection</code>
-    </para>
-  </section>
-</section>
diff --git a/en-US/Release_Notes.xml b/en-US/Release_Notes.xml
index 11662c9..8ab4ad3 100644
--- a/en-US/Release_Notes.xml
+++ b/en-US/Release_Notes.xml
@@ -96,9 +96,11 @@
     <xi:include href="File_Systems.xml"
 		xmlns:xi="http://www.w3.org/2001/XInclude">
     </xi:include>
+-->
     <xi:include href="Xorg.xml"
 		xmlns:xi="http://www.w3.org/2001/XInclude">
     </xi:include>
+<!--
     <xi:include href="Cluster.xml"
 		xmlns:xi="http://www.w3.org/2001/XInclude">
     </xi:include>
diff --git a/en-US/Xorg.xml b/en-US/Xorg.xml
index 778cdd8..89952d2 100644
--- a/en-US/Xorg.xml
+++ b/en-US/Xorg.xml
@@ -6,5 +6,49 @@
 
 <section id="sect-Release_Notes-Xorg">
   <title>X Display System</title>
-  <para>&nbsp;</para>
+
+  <section>
+    <title>vbetool not installed by default</title>
+    <indexterm><primary>vbetool</primary></indexterm>
+    <indexterm><primary>suspending</primary></indexterm>
+    <indexterm>
+      <primary>Adapters</primary>
+      <secondary>Display</secondary>
+    </indexterm>
+    <para>
+      Due to problems with <package>vbetool</package>, this package
+      has been removed from the default installation of Fedora.  This
+      change may impact users with suspending and resuming their
+      computers.  These problems should only affect users of uncommon
+      VGA adaptors and not users of nVidia, ATI, or Intel adaptors.
+    </para>
+  </section>
+
+  <section>
+    <title>Mouse Behavior</title>
+    <indexterm><primary>evdev</primary></indexterm>
+    <indexterm><primary>Mouse</primary></indexterm>
+    <para>
+      The latest version of <package>evdev</package>, version 2.5,
+      changed the default for the middle mouse button emulation code.
+      This change has disabled emulation of the middle mouse button by
+      clicking the left and right mouse buttons.
+    </para>
+    <section>
+      <title>Enabling the middle mouse button emulation</title>
+      <indexterm><primary>Mouse</primary></indexterm>
+      <para>
+	Middle mouse button emulation can be enabled by the addition
+	of a xorg.conf snippet:
+	<screen>
+        Section "InputClass"
+	  Identifier "middle button emulation class"
+	  MatchIsPointer "on"
+	  Option "Emulate3Buttons" "on"
+	EndSection
+      </screen>
+      </para>
+    </section>
+  </section>
+
 </section>