lots of updates. Check individual ChangeLogs for documents for details.

2006-02-12  Brent Smith  <gnome@nextreality.net>
        * gnome2-accessibility-guide/C/ChangeLog:
        * gnome2-accessibility-guide/C/gnome-access-guide-C.omf:
        * gnome2-accessibility-guide/C/gnome-access-guide.xml:
        * gnome2-accessibility-guide/C/preface.xml:
        * gnome2-system-admin-guide/C/ChangeLog:
        * gnome2-system-admin-guide/C/system-admin-guide-C.omf:
        * gnome2-system-admin-guide/C/system-admin-guide.xml:
        * gnome2-user-guide/C/ChangeLog:
        * gnome2-user-guide/C/Makefile.am:
        * gnome2-user-guide/C/user-guide-C.omf:
        * gnome2-user-guide/C/user-guide.xml:
        lots of updates.  Check individual ChangeLogs for documents
        for details.

12 files changed, 338 insertions, 213 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f80d7f..b35086d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,22 @@
 2006-02-12  Brent Smith  <gnome@nextreality.net>
 
 	* gnome2-accessibility-guide/C/ChangeLog:
+	* gnome2-accessibility-guide/C/gnome-access-guide-C.omf:
+	* gnome2-accessibility-guide/C/gnome-access-guide.xml:
+	* gnome2-accessibility-guide/C/preface.xml:
+	* gnome2-system-admin-guide/C/ChangeLog:
+	* gnome2-system-admin-guide/C/system-admin-guide-C.omf:
+	* gnome2-system-admin-guide/C/system-admin-guide.xml:
+	* gnome2-user-guide/C/ChangeLog:
+	* gnome2-user-guide/C/Makefile.am:
+	* gnome2-user-guide/C/user-guide-C.omf:
+	* gnome2-user-guide/C/user-guide.xml:
+	lots of updates.  Check individual ChangeLogs for documents
+	for details.
+
+2006-02-12  Brent Smith  <gnome@nextreality.net>
+
+	* gnome2-accessibility-guide/C/ChangeLog:
 	* gnome2-accessibility-guide/C/Makefile.am:
 	* gnome2-user-guide/C/ChangeLog:
 	* gnome2-user-guide/C/user-guide.xml:
diff --git a/gnome2-accessibility-guide/C/ChangeLog b/gnome2-accessibility-guide/C/ChangeLog
index 405e1d0..23bc3a4 100644
--- a/gnome2-accessibility-guide/C/ChangeLog
+++ b/gnome2-accessibility-guide/C/ChangeLog
@@ -1,5 +1,14 @@
 2006-02-12  Brent Smith  <gnome@nextreality.net>
 
+	* gnome-access-guide-C.omf:
+	provided more verbose description to scrollkeeper.
+	* gnome-access-guide.xml:
+	updated revision, history, and included abstract 
+	* preface.xml:
+	Remove ^M carriage returns from file.
+
+2006-02-12  Brent Smith  <gnome@nextreality.net>
+
 	* Makefile.am:
 	add the ats.xml and sysadmin.xml files to the entities variable,
 	otherwise they are not installed.
diff --git a/gnome2-accessibility-guide/C/gnome-access-guide-C.omf b/gnome2-accessibility-guide/C/gnome-access-guide-C.omf
index c939aaa..d1f71bd 100755
--- a/gnome2-accessibility-guide/C/gnome-access-guide-C.omf
+++ b/gnome2-accessibility-guide/C/gnome-access-guide-C.omf
@@ -1,36 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<omf>

-  <resource>

-    <creator>

-      gdocteam@sun.com (Sun Java Desktop System Documentation Team)

-    </creator>

-    <maintainer>

+<?xml version="1.0" encoding="UTF-8"?>
+<omf>
+  <resource>
+    <creator>
       gdocteam@sun.com (Sun Java Desktop System Documentation Team)
-    </maintainer>

+    </creator>
+    <maintainer>
+      gdocteam@sun.com (Sun Java Desktop System Documentation Team)
+    </maintainer>
 <!--
-    <title>

+    <title>
       GNOME 2.10 Desktop Accessibility Guide V2.10.1
     </title>
 -->
-    <title>

+    <title>
       Accessibility Guide
-    </title>

-    <date>

-      2005-07-29
-    </date>

-    <version identifier="2.10.1" date="2005-07-29" description="Multiplatform accessibility guide"/>

-    <subject category="GNOME|Desktop"/>

-    <description>

-      Accessibility Guide for the GNOME 2.10 Desktop
-    </description>

-    <type>

-      accessibility guide

-    </type>

-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>

-    <identifier url="gnome-access-guide.xml"/>

-    <language code="C"/>

-    <relation seriesid="0f5d3d30-28c5-11d7-9d8d-bd839db251e3"/>

+    </title>
+    <date>
+      2006-02-12
+    </date>
+    <version identifier="2.14" date="2006-02-12" description="Multiplatform accessibility guide"/>
+    <subject category="GNOME|Desktop"/>
+    <description>
+      The GNOME Accessibility Guide is for users, system administrators, and anyone who is interested
+      in how the GNOME Desktop supports people with disabilities and addresses the requirements
+      of Section 508 of the U.S. Rehabilitation Act.
+    </description>
+    <type>
+      accessibility guide
+    </type>
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
+    <identifier url="gnome-access-guide.xml"/>
+    <language code="C"/>
+    <relation seriesid="0f5d3d30-28c5-11d7-9d8d-bd839db251e3"/>
     <rights type="GNU FDL" license.version="1.1" 
-    holder="Sun Microsystems, Inc."/>

-  </resource>

+    holder="Sun Microsystems, Inc."/>
+  </resource>
 </omf>
diff --git a/gnome2-accessibility-guide/C/gnome-access-guide.xml b/gnome2-accessibility-guide/C/gnome-access-guide.xml
index b8fc71b..7231fbf 100644
--- a/gnome2-accessibility-guide/C/gnome-access-guide.xml
+++ b/gnome2-accessibility-guide/C/gnome-access-guide.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>

+<?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY gnomeversion "2.10">

-  <!ENTITY manrevision "2.10.1">

-  <!ENTITY date "July 2005">

-  <!ENTITY LEGAL SYSTEM "legal.xml">

-  <!ENTITY dtconfig SYSTEM "dtconfig.xml">

-  <!ENTITY keynav SYSTEM "keynav.xml">  

+  <!ENTITY gnomeversion "2.14">
+  <!ENTITY manrevision "2.14.0">
+  <!ENTITY date "February 2006">
+  <!ENTITY LEGAL SYSTEM "legal.xml">
+  <!ENTITY dtconfig SYSTEM "dtconfig.xml">
+  <!ENTITY keynav SYSTEM "keynav.xml">  
   <!ENTITY themes SYSTEM "themes.xml">  
   <!ENTITY preface SYSTEM "preface.xml">
   <!ENTITY accessintro SYSTEM "accessintro.xml">
@@ -14,112 +14,125 @@
   <!ENTITY ats SYSTEM "ats.xml">
   <!ENTITY author1 "Sun">
   <!ENTITY author2 "Java Desktop System Documentation Team">
-]>

-<book id="index"> 

-  <title>GNOME &gnomeversion; Desktop Accessibility Guide</title> 

-  <bookinfo> 

+]>
+<book id="index"> 
+  <title>GNOME &gnomeversion; Desktop Accessibility Guide</title> 
+  <bookinfo> 
+    <abstract role="description">
+    <para>The GNOME Accessibility Guide is for users, system administrators, and anyone who is interested
+    in how the GNOME Desktop supports people with disabilities and addresses the requirements
+    of Section 508 of the U.S. Rehabilitation Act.</para>
+    </abstract>
 	 <copyright> 
-		<year>2005</year>

+		<year>2005</year>
 		<year>2004</year>
 		<year>2003</year>
-		<year>2002</year>

-		<holder>Sun Microsystems, Inc.</holder> 

-	 </copyright>

-

-<!--  translators: uncomment this:

-  <copyright>

-   <year>2002</year>

-   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>

-  </copyright>

--->

-	 <publisher> 

-		<publishername>GNOME Documentation Project</publishername> 

-	 </publisher> &LEGAL; 

-

-	 <authorgroup> 

-		<author> 

-		  <firstname>&author1;</firstname> 

-		  <surname>&author2;</surname> 

-		  <affiliation> 

-			 <orgname>Sun Microsystems, Inc.</orgname>  

-		  </affiliation> 

-		</author> 

-	 </authorgroup>

-

+		<year>2002</year>
+		<holder>Sun Microsystems, Inc.</holder> 
+	 </copyright>
+
+<!--  translators: uncomment this:
+  <copyright>
+   <year>2002</year>
+   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+  </copyright>
+-->
+	 <publisher> 
+		<publishername>GNOME Documentation Project</publishername> 
+	 </publisher> &LEGAL; 
+
+	 <authorgroup> 
+		<author> 
+		  <firstname>&author1;</firstname> 
+		  <surname>&author2;</surname> 
+		  <affiliation> 
+			 <orgname>Sun Microsystems, Inc.</orgname>  
+		  </affiliation> 
+		</author> 
+	 </authorgroup>
+
 	 <revhistory>
-	   <revision> 

-		  <revnumber>GNOME &gnomeversion; Desktop Accessibility Guide V&manrevision;</revnumber> 

-		  <date>&date;</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME &gnomeversion; Desktop Accessibility Guide V&manrevision;</revnumber> 
+		  <date>&date;</date> 
+		  <revdescription> 
+			 <para role="author">GNOME Documentation Project</para> 
+			 <para role="publisher">GNOME Documentation Project</para> 
+		  </revdescription> 
+		</revision>
+	   <revision> 
+		  <revnumber>GNOME 2.10 Desktop Accessibility Guide V2.10.1</revnumber> 
+		  <date>July 2005</date> 
+		  <revdescription> 
 			 <para role="author">Sun Java Desktop System Documentation Team</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-	   <revision> 

-		  <revnumber>GNOME 2.10 Desktop Accessibility Guide V2.10.0</revnumber> 

-		  <date>March 2005</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME 2.10 Desktop Accessibility Guide V2.10.0</revnumber> 
+		  <date>March 2005</date> 
+		  <revdescription> 
 			 <para role="author">Sun Java Desktop System Documentation Team</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-	   <revision> 

-		  <revnumber>GNOME 2.8 Desktop Accessibility Guide V2.8.0</revnumber> 

-		  <date>September 2004</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME 2.8 Desktop Accessibility Guide V2.8.0</revnumber> 
+		  <date>September 2004</date> 
+		  <revdescription> 
 			 <para role="author">Sun Java Desktop System Documentation Team</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-	   <revision> 

-		  <revnumber>GNOME 2.6 Desktop Accessibility Guide V2.6.0</revnumber> 

-		  <date>March 2004</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME 2.6 Desktop Accessibility Guide V2.6.0</revnumber> 
+		  <date>March 2004</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-	   <revision> 

-		  <revnumber>GNOME 2.4 Desktop Accessibility Guide V2.4.0</revnumber> 

-		  <date>October 2003</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME 2.4 Desktop Accessibility Guide V2.4.0</revnumber> 
+		  <date>October 2003</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-	   <revision> 

-		  <revnumber>GNOME 2.2 Desktop Accessibility Guide V2.2.0</revnumber> 

-		  <date>February 2003</date> 

-		  <revdescription> 

+	   <revision> 
+		  <revnumber>GNOME 2.2 Desktop Accessibility Guide V2.2.0</revnumber> 
+		  <date>February 2003</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
-		</revision>

-		<revision> 

-		  <revnumber>GNOME 2.0 Desktop for the Solaris Operating Environment Accessibility Guide V2.1</revnumber> 

-		  <date>January 2003</date> 

-		  <revdescription> 

+		</revision>
+		<revision> 
+		  <revnumber>GNOME 2.0 Desktop for the Solaris Operating Environment Accessibility Guide V2.1</revnumber> 
+		  <date>January 2003</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision>
-		<revision> 

-		  <revnumber>GNOME 2.0 Desktop for the Solaris Operating Environment Accessibility Guide V2.0</revnumber> 

-		  <date>December 2002</date> 

-		  <revdescription> 

+		<revision> 
+		  <revnumber>GNOME 2.0 Desktop for the Solaris Operating Environment Accessibility Guide V2.0</revnumber> 
+		  <date>December 2002</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
-		</revision>  

-	 </revhistory> 

-	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME Desktop.

-		</releaseinfo> 

-	 <legalnotice> 

-		<title>Feedback</title> 

-		<para> To report a bug or make a suggestion regarding the GNOME Desktop or this

+		</revision>  
+	 </revhistory> 
+	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME Desktop.
+		</releaseinfo> 
+	 <legalnotice> 
+		<title>Feedback</title> 
+		<para> To report a bug or make a suggestion regarding the GNOME Desktop or this
 		  manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
-	  type="help">GNOME Feedback Page</ulink>. </para>

-	 </legalnotice> 

+	  type="help">GNOME Feedback Page</ulink>. </para>
+	 </legalnotice> 
   </bookinfo>
 &preface;
 &accessintro;
@@ -127,4 +140,4 @@
 &keynav;
 &themes;
 &ats;
-&sysadmin;
</book> 

+&sysadmin;</book> 
diff --git a/gnome2-accessibility-guide/C/preface.xml b/gnome2-accessibility-guide/C/preface.xml
index b395286..944eefd 100644
--- a/gnome2-accessibility-guide/C/preface.xml
+++ b/gnome2-accessibility-guide/C/preface.xml
@@ -1,16 +1,61 @@
-
-<preface id="preface-0"><title>Preface</title><para>The <citetitle>GNOME 2.10 Desktop Accessibility
+<preface id="preface-0">
+  <title>Preface</title>
+  <para>The <citetitle>GNOME 2.10 Desktop Accessibility
 Guide</citetitle> describes how to configure, customize,
 and use the accessibility features of the GNOME 2.10
 Desktop.</para>
-<sect1 id="preface-1"><title>Who Should Read This Guide</title><para>This guide is for users, system administrators, and anyone who is interested
-in how the GNOME 2.10 Desktop supports people with disabilities and addresses the requirements
-of Section 508 of the U.S. Rehabilitation Act.</para></sect1><sect1 id="preface-2"><title>How This Guide Is Organized</title><para>This guide is structured in the following manner:</para><itemizedlist><listitem><para><xref linkend="accessintro-1"/> introduces you to accessibility
-in the GNOME Desktop.</para></listitem><listitem><para><xref linkend="dtconfig-0"/> describes how to configure the
-mouse and keyboard to make these devices accessible to more users.</para></listitem><listitem><para><xref linkend="keynav-0"/> describes how to navigate the GNOME
-Desktop from the keyboard.</para></listitem><listitem><para><xref linkend="themes-0"/> describes the methods you can use
+  <sect1 id="preface-1">
+    <title>Who Should Read This Guide</title>
+    <para>This guide is for users, system administrators, and anyone who is interested
+in how the GNOME &gnomeversion; Desktop supports people with disabilities and addresses the requirements
+of Section 508 of the U.S. Rehabilitation Act.</para>
+  </sect1>
+  <sect1 id="preface-2">
+    <title>How This Guide Is Organized</title>
+    <para>This guide is structured in the following manner:</para>
+    <itemizedlist>
+      <listitem>
+        <para><xref linkend="accessintro-1"/> introduces you to accessibility
+in the GNOME Desktop.</para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="dtconfig-0"/> describes how to configure the
+mouse and keyboard to make these devices accessible to more users.</para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="keynav-0"/> describes how to navigate the GNOME
+Desktop from the keyboard.</para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="themes-0"/> describes the methods you can use
 to change the appearance of the GNOME Desktop to enhance the accessibility of the desktop for users with
-visual impairments.</para></listitem><listitem><para><xref linkend="ats-0"/> introduces you to the assistive technologies
-that are available from the GNOME Desktop.</para></listitem><listitem><para><xref linkend="sysadmin-0"/> describes the system administrator
+visual impairments.</para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="ats-0"/> introduces you to the assistive technologies
+that are available from the GNOME Desktop.</para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="sysadmin-0"/> describes the system administrator
 tasks that you need to perform before you can use the assistive technologies
-for the GNOME Desktop.</para></listitem></itemizedlist></sect1><sect1 id="preface-3"><title>Related Documentation</title><para>The following manuals are related to this guide:</para><itemizedlist><listitem><para><citetitle>GNOME 2.10 Desktop System Administration Guide</citetitle></para></listitem><listitem><para><citetitle>GNOME 2.10 Desktop User Guide</citetitle></para></listitem></itemizedlist></sect1></preface>
+for the GNOME Desktop.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="preface-3">
+    <title>Related Documentation</title>
+    <para>The following manuals are related to this guide:</para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <citetitle>GNOME 2.10 Desktop System Administration Guide</citetitle>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <citetitle>GNOME 2.10 Desktop User Guide</citetitle>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+</preface>
diff --git a/gnome2-system-admin-guide/C/ChangeLog b/gnome2-system-admin-guide/C/ChangeLog
index c203e22..3776a43 100644
--- a/gnome2-system-admin-guide/C/ChangeLog
+++ b/gnome2-system-admin-guide/C/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-12  Brent Smith  <gnome@nextreality.net>
+
+	* system-admin-guide-C.omf:
+	added more verbose description to be registered in scrollkeeper
+	* system-admin-guide.xml:
+	updated version, revision, and added abstract
+
 2004-08-27  Shaun McCance  <shaunm@gnome.org>
 
 	* system-admin-guide-C.omf:
diff --git a/gnome2-system-admin-guide/C/system-admin-guide-C.omf b/gnome2-system-admin-guide/C/system-admin-guide-C.omf
index de29e7a..34c3f36 100755
--- a/gnome2-system-admin-guide/C/system-admin-guide-C.omf
+++ b/gnome2-system-admin-guide/C/system-admin-guide-C.omf
@@ -11,13 +11,14 @@
       System Administration Guide
     </title>
     <date>
-      2004-03-16
+      2006-02-12
     </date>
-    <version identifier="2.3" date="2004-03-16" 
-	     description="GNOME 2.6 version"/>
+    <version identifier="2.4" date="2006-02-12" 
+	     description="GNOME 2.14 version"/>
     <subject category="GNOME|Desktop"/>
     <description>
-      System Administration Guide for GNOME 2.6. 
+    The GNOME System Administration Guide provides information to administrators
+    on how to configure and manage different aspects of the desktop environment for users.
     </description>
     <type>administrator's guide</type>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
diff --git a/gnome2-system-admin-guide/C/system-admin-guide.xml b/gnome2-system-admin-guide/C/system-admin-guide.xml
index 80f3a1a..4a986ea 100644
--- a/gnome2-system-admin-guide/C/system-admin-guide.xml
+++ b/gnome2-system-admin-guide/C/system-admin-guide.xml
@@ -1,101 +1,113 @@
-<?xml version="1.0"?>

+<?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY gnomeversion "2.6">

-  <!ENTITY manrevision "2.3">

-  <!ENTITY date "March 2004">

-  <!ENTITY LEGAL SYSTEM "legal.xml">

-  <!ENTITY gconf SYSTEM "gconf.xml">

-  <!ENTITY menustructure SYSTEM "menustructure.xml">
-  <!ENTITY themes SYSTEM "themes.xml">
-  <!ENTITY fontconfig SYSTEM "fontconfig.xml">
-  <!ENTITY mimetypes SYSTEM "mimetypes.xml">
-  <!ENTITY gdm SYSTEM "gdm.xml">
-  <!ENTITY screensavers SYSTEM "screensavers.xml">
-  <!ENTITY sessions SYSTEM "sessions.xml">
-  <!ENTITY help SYSTEM "help.xml">
-  <!ENTITY performance SYSTEM "performance.xml">
-  <!ENTITY lockdown SYSTEM "lockdown.xml">
-  <!ENTITY appendixa SYSTEM "appendixa.xml">
-  <!ENTITY appendixb SYSTEM "appendixb.xml">
-  <!ENTITY gloss SYSTEM "glossary.xml">
-]>

-<book id="index"> 

-  <title>GNOME &gnomeversion; Desktop System Administration Guide</title> 

-  <bookinfo> 

-	 <copyright> 

-		<year>2004</year> 

-		<holder>Sun Microsystems</holder> 

-	 </copyright>

-	 <copyright> 

-		<year>2003</year> 

-		<holder>Sun Microsystems</holder> 

+  <!ENTITY gnomeversion "2.14">
+  <!ENTITY manrevision "2.4">
+  <!ENTITY date "March 2004">
+  <!ENTITY LEGAL SYSTEM             "legal.xml">
+  <!ENTITY gconf SYSTEM             "gconf.xml">
+  <!ENTITY menustructure SYSTEM     "menustructure.xml">
+  <!ENTITY themes SYSTEM            "themes.xml">
+  <!ENTITY fontconfig SYSTEM        "fontconfig.xml">
+  <!ENTITY mimetypes SYSTEM         "mimetypes.xml">
+  <!ENTITY gdm SYSTEM               "gdm.xml">
+  <!ENTITY screensavers SYSTEM      "screensavers.xml">
+  <!ENTITY sessions SYSTEM          "sessions.xml">
+  <!ENTITY help SYSTEM              "help.xml">
+  <!ENTITY performance SYSTEM       "performance.xml">
+  <!ENTITY lockdown SYSTEM          "lockdown.xml">
+  <!ENTITY appendixa SYSTEM         "appendixa.xml">
+  <!ENTITY appendixb SYSTEM         "appendixb.xml">
+  <!ENTITY gloss SYSTEM             "glossary.xml">
+]>
+<book id="index"> 
+  <title>GNOME &gnomeversion; Desktop System Administration Guide</title> 
+  <bookinfo> 
+    <abstract role="description">
+    <para>The GNOME System Administration Guide provides information to administrators
+    on how to configure and manage different aspects of the desktop environment for users.</para>
+    </abstract>
+	 <copyright> 
+		<year>2004</year> 
+		<holder>Sun Microsystems</holder> 
 	 </copyright>
-

-<!-- translators: uncomment this:

-  <copyright>

-   <year>2002</year>

-   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>

-  </copyright>

--->

-	 <publisher> 

-		<publishername> GNOME Documentation Project </publishername> 

-	 </publisher> &LEGAL; 

-

-	 <authorgroup> 

-		<author> 

-		  <firstname>Sun</firstname> 

-		  <surname>GNOME Documentation Team</surname> 

-		  <affiliation> 

-			 <orgname>Sun Microsystems</orgname> 

-		  </affiliation> 

-		</author> 

-	 </authorgroup>

-

-	 <revhistory>

-		<revision> 

-		  <revnumber>GNOME &gnomeversion; Desktop System Administration Guide V&manrevision;</revnumber> 

-		  <date>&date;</date> 

-		  <revdescription> 

+	 <copyright> 
+		<year>2003</year> 
+		<holder>Sun Microsystems</holder> 
+	 </copyright>
+
+<!-- translators: uncomment this:
+  <copyright>
+   <year>2002</year>
+   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+  </copyright>
+-->
+	 <publisher> 
+		<publishername> GNOME Documentation Project </publishername> 
+	 </publisher> &LEGAL; 
+
+	 <authorgroup> 
+		<author> 
+		  <firstname>Sun</firstname> 
+		  <surname>GNOME Documentation Team</surname> 
+		  <affiliation> 
+			 <orgname>Sun Microsystems</orgname> 
+		  </affiliation> 
+		</author> 
+	 </authorgroup>
+
+	 <revhistory>
+		<revision> 
+		  <revnumber>GNOME &gnomeversion; Desktop System Administration Guide V&manrevision;</revnumber> 
+		  <date>&date;</date> 
+		  <revdescription> 
+			 <para role="author">GNOME Documentation Project</para> 
+			 <para role="publisher">GNOME Documentation Project</para> 
+		  </revdescription> 
+		</revision> 
+		<revision> 
+		  <revnumber>GNOME 2.6 Desktop System Administration Guide V2.3</revnumber> 
+		  <date>March 2004</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision> 
-		<revision> 

-		  <revnumber>GNOME 2.4 Desktop System Administration Guide V2.2</revnumber> 

-		  <date>September 2003</date> 

-		  <revdescription> 

+		<revision> 
+		  <revnumber>GNOME 2.4 Desktop System Administration Guide V2.2</revnumber> 
+		  <date>September 2003</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision> 
-		<revision> 

-		  <revnumber>GNOME 2.2 Desktop System Administration Guide V2.1</revnumber> 

-		  <date>January 2003</date> 

-		  <revdescription> 

+		<revision> 
+		  <revnumber>GNOME 2.2 Desktop System Administration Guide V2.1</revnumber> 
+		  <date>January 2003</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
-		</revision> 

-		<revision> 

-		  <revnumber>GNOME 2.0 Desktop System Administration Guide V2.0</revnumber> 

-		  <date>December 2002</date> 

-		  <revdescription> 

+		</revision> 
+		<revision> 
+		  <revnumber>GNOME 2.0 Desktop System Administration Guide V2.0</revnumber> 
+		  <date>December 2002</date> 
+		  <revdescription> 
 			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
-		</revision> 

-	 </revhistory> 

-	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME Desktop.

-		</releaseinfo> 

-	 <legalnotice> 

-		<title>Feedback</title> 

-		<para> To report a bug or make a suggestion regarding the GNOME Desktop or this

+		</revision> 
+	 </revhistory> 
+	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME Desktop.
+		</releaseinfo> 
+	 <legalnotice> 
+		<title>Feedback</title> 
+		<para> To report a bug or make a suggestion regarding the GNOME Desktop or this
 		  manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
-	  type="help">GNOME Feedback Page</ulink>. </para>

-	 </legalnotice> 

+	  type="help">GNOME Feedback Page</ulink>. </para>
+	 </legalnotice> 
   </bookinfo>
-&gconf;

+&gconf;
 &menustructure;
 &themes;
 &fontconfig;
@@ -108,4 +120,4 @@
 &appendixa;
 &appendixb;
 &gloss;
-
</book> 

+</book> 
diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 77d0bab..28292a7 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,5 +1,17 @@
 2006-02-12  Brent Smith  <gnome@nextreality.net>
 
+	* Makefile.am:
+	added gostools.xml to entities variable so that it gets installed.
+	removed part1.xml and part2.xml since these files don't exist in cvs.
+	* user-guide-C.omf:
+	added more verbose description of document to scrollkeeper
+	* user-guide.xml:
+	re-added gostools entity reference (assuming that it will be expanded
+	upon before release)
+	updated version, and added abstract
+
+2006-02-12  Brent Smith  <gnome@nextreality.net>
+
 	* gnome2-user-guide/C/gospanel.xml:
 	small validation fix (previous commit, moved to this ChangeLog instead
 	of top-level ChangeLog)
diff --git a/gnome2-user-guide/C/Makefile.am b/gnome2-user-guide/C/Makefile.am
index ade81e6..50dc59f 100644
--- a/gnome2-user-guide/C/Makefile.am
+++ b/gnome2-user-guide/C/Makefile.am
@@ -1,4 +1,4 @@
-entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml plaingnomestartpreftools.xml goscustdesk-remotedesktop.xml
+entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml plaingnomestartpreftools.xml goscustdesk-remotedesktop.xml gostools.xml
 
 figdir = figures
 docname = user-guide
diff --git a/gnome2-user-guide/C/user-guide-C.omf b/gnome2-user-guide/C/user-guide-C.omf
index d411f32..2560193 100644
--- a/gnome2-user-guide/C/user-guide-C.omf
+++ b/gnome2-user-guide/C/user-guide-C.omf
@@ -2,7 +2,7 @@
 <omf>
   <resource>
     <creator>
-      gdocteam@sun.com (Sun Microsystems)

+      gdocteam@sun.com (Sun Microsystems)
     </creator>
     <maintainer>
       gnome-doc-list@gnome.org (GNOME Documentation Project)
@@ -11,13 +11,15 @@
       User Guide
     </title>
     <date>
-      2004-03-09
+      2006-02-12
     </date>
-    <version identifier="2.8" date="2004-03-09" 
-	     description="Updates for GNOME 2.6"/>
+    <version identifier="2.14" date="2006-02-12" 
+	     description="Updates for GNOME 2.14"/>
     <subject category="GNOME|Desktop"/>
     <description>
-      User Guide for GNOME 2.6.
+      The GNOME User Guide is a collection of documentation which details general use of the
+      GNOME Desktop environment.  Topics covered include sessions, panels, menus, file management,
+      and preferences.
     </description>
     <type>user's guide</type>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index f86305e..fcaabb4 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0"?><!-- -*- indent-tabs-mode: nil -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY gnomeversion "2.10">
-  <!ENTITY manrevision "2.10.0">
+  <!ENTITY gnomeversion "2.14">
+  <!ENTITY manrevision "2.14.0">
   <!ENTITY LEGAL SYSTEM             "legal.xml">
-  <!ENTITY gosbasic SYSTEM          "gosbasic.xml">                   <!-- basic skills -->
+  <!ENTITY gosbasic SYSTEM          "gosbasic.xml">                   <!-- Basic skills -->
   <!ENTITY gosoverview SYSTEM       "gosoverview.xml">                <!-- Overview-->
   <!ENTITY gosstartsession SYSTEM   "gosstartsession.xml">            <!-- Sessions -->
   <!ENTITY gospanel SYSTEM          "gospanel.xml">                   <!-- Panels -->
   <!ENTITY goseditmainmenu SYSTEM   "goseditmainmenu.xml">            <!-- Menus -->
   <!ENTITY gosnautilus SYSTEM       "gosnautilus.xml">                <!-- Nautilus -->  
   <!ENTITY gosremotedesktop SYSTEM  "goscustdesk-remotedesktop.xml">  <!-- Remote sessions ?? -->
-  <!ENTITY gostools SYSTEM          "gostools.xml">                   <!-- Tools and utilities ?? -->
+  <!ENTITY gostools SYSTEM          "gostools.xml">                   <!-- Tools and utilities -->
   <!ENTITY goscustdesk SYSTEM       "goscustdesk.xml">                <!-- Preferences -->
-  <!ENTITY gloss SYSTEM             "glossary.xml">
+  <!ENTITY gloss SYSTEM             "glossary.xml">                   <!-- Glossary -->
 ]>
 <?db.chunk.max_depth 3?>
 <?yelp:chunk-depth 3?>
 <book id="index"> 
   <title>Desktop User Guide</title> 
   <bookinfo>
+    <abstract role="description">
+      <para>The GNOME User Guide is a collection of documentation which details general use of the
+      GNOME Desktop environment.  Topics covered include sessions, panels, menus, file management,
+      and preferences.</para>
+    </abstract>
     <copyright>
       <year>2005</year>
       <holder>Shaun McCance</holder>
@@ -186,6 +191,7 @@
 &goseditmainmenu;
 &gosnautilus;
 &gosremotedesktop;
+&gostools;
 &goscustdesk;
 &gloss;