Add id's to general docs for better cross linking, less randomization of output

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

10 files changed, 131 insertions, 131 deletions

diff --git a/general/License.xml b/general/License.xml
index fc24c25..a386cdb 100644
--- a/general/License.xml
+++ b/general/License.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='License'>
 
 <articleinfo>
 
@@ -14,7 +14,7 @@
 <pubdate>&reldate;</pubdate>
 </articleinfo>
 
-<sect1>
+<sect1 id='Introduction'>
 <title>Introduction</title>
 
 <para>
@@ -51,7 +51,7 @@ possible of the code's licenses in the distribution into compliance with the
 
 </sect1>
 
-<sect1>
+<sect1 id='X.Org_Preferred_License'>
 <title>X.Org Preferred License</title>
 
 <para>
@@ -102,7 +102,7 @@ before Daniel Stone).
 
 </sect1>
 
-<sect1>
+<sect1 id='XFree86_License_1.0'>
 <title>XFree86 License 1.0</title>
 
 <para>
@@ -153,7 +153,7 @@ No software incorporating the XFree86 1.1 license has been incorporated.
 
 </sect1>
 
-<sect1>
+<sect1 id='Other_Licenses'>
 <title>Other Licenses</title>
 
 <para>
@@ -161,10 +161,10 @@ Portions of code are covered by the following licenses/copyrights.  See
 individual files for the copyright dates.
 </para>
 
-<sect2>
+<sect2 id='X_MIT_Copyrights'>
 <title>X/MIT Copyrights</title>
 
-<sect3>
+<sect3 id='X_Consortium'>
 <title>X Consortium</title>
 
 <para>
@@ -208,7 +208,7 @@ X Window System is a trademark of X Consortium, Inc.
 
 </sect3>
 
-<sect3>
+<sect3 id='The_Open_Group'>
 <title>The Open Group</title>
 
 <para>
@@ -247,10 +247,10 @@ in this Software without prior written authorization from The Open Group.
 
 </sect2>
 
-<sect2>
-<title>Berkeley-based copyrights:</title>
+<sect2 id='Berkeley-based_copyrights'>
+<title>Berkeley-based copyrights</title>
 
-<sect3>
+<sect3 id='General'>
 <title>General</title>
 
 <para>
@@ -304,7 +304,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 </sect3>
 
-<sect3>
+<sect3 id='UCB_LBL'>
 <title>UCB/LBL</title>
 
 <para>
@@ -387,7 +387,7 @@ SUCH DAMAGE.
 
 </sect3>
 
-<sect3>
+<sect3 id='The_NetBSD_Foundation_Inc.'>
 <title>The NetBSD Foundation, Inc.</title>
 
 <para>
@@ -442,8 +442,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 </sect3>
 
-<sect3>
-<title>Theodore Ts'o.</title>
+<sect3 id='Theodore_Tso'>
+<title>Theodore Ts'o</title>
 
 <para>
 Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All
@@ -502,7 +502,7 @@ DAMAGE.
 
 </sect3>
 
-<sect3>
+<sect3 id='Theo_de_Raadt_and_Damien_Miller'>
 <title>Theo de Raadt and Damien Miller</title>
 
 <para>
@@ -551,7 +551,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 </sect3>
 
-<sect3>
+<sect3 id='Todd_C._Miller'>
 <title>Todd C. Miller</title>
 
 <para>
@@ -576,7 +576,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 </sect3>
 
-<sect3>
+<sect3 id='Thomas_Winischhofer'>
 <title>Thomas Winischhofer</title>
 
 <para>
@@ -636,7 +636,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 </sect2>
 
-<sect2>
+<sect2 id='SGI_Free_Software_License_B'>
 <title>SGI Free Software License B</title>
 
 <para>
@@ -675,7 +675,7 @@ SOFTWARE.
 
 </sect2>
 
-<sect2>
+<sect2 id='Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license'>
 <title>Bigelow &amp; Holmes Inc and URW++ GmbH Luxi font license</title>
 
 <para>
diff --git a/general/README.xml b/general/README.xml
index 1f4f387..a9cf5d0 100644
--- a/general/README.xml
+++ b/general/README.xml
@@ -4,7 +4,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='README'>
 
 <articleinfo>
 
@@ -31,7 +31,7 @@ the X11 standard.
 
 </articleinfo>
 
-<sect1>
+<sect1 id='What_is_X11R&relvers;'>
 <title>What is X11R&relvers;?</title>
 
 <!-- We only do release notes for full releases now.
@@ -128,7 +128,7 @@ users alike.
 
 <!--
 <![ %snapshot [
-<sect1>
+<sect1 id='Redistribution_of_Snapshots'>
 <title>Redistribution of Snapshots</title>
 <para>
 While the X.Org Foundation <ulink
@@ -141,7 +141,7 @@ release, we don't recommend including them in production releases.
 ]]>
  -->
 
-<sect1>
+<sect1 id='Licensing'>
 <title>Licensing</title>
 
 <para>
@@ -207,7 +207,7 @@ possible of the code's licenses in the distribution into compliance with the
 
 </sect1>
 
-<sect1>
+<sect1 id='Pointers_to_additional_information'>
 <title>Pointers to additional information</title>
 
 <para>
@@ -227,7 +227,7 @@ Additional information may be available at the <ulink url="http://wiki.x.org/"
 
 </sect1>
 
-<sect1>
+<sect1 id='The_Public_Mailing_Lists'>
 <title>The Public Mailing Lists</title>
 
 <para>
@@ -241,7 +241,7 @@ page</ulink>.
 
 </sect1>
 
-<sect1>
+<sect1 id='Contributing_to_the_X.Org_Foundations_X_efforts.'>
 <title>Contributing to the X.Org Foundation's X efforts.</title>
 
 <para>
@@ -258,7 +258,7 @@ SubmittingPatches</ulink> page of the X.Org wiki.
 
 </sect1>
 
-<sect1>
+<sect1 id='How_to_get_the_release'>
 <title>How to get the release</title>
 
 <!--
@@ -282,7 +282,7 @@ mirrors of this server.
 ]]>
  -->
 
-<sect2>
+<sect2 id='X11R&relvers;'>
 <title>X11R&relvers;</title>
 
 <para>
@@ -305,7 +305,7 @@ build system and modular code base.
 
 </sect2>
 
-<sect2>
+<sect2 id='The_current_development_tree'>
 <title>The current development tree</title>
 
 <para>
@@ -325,7 +325,7 @@ To check out the latest development version, don't specify any tag.
 
 </sect1>
 
-<sect1>
+<sect1 id='Reporting_Bugs'>
 <title>Reporting Bugs</title>
 
 <para>
diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index 14b2944..f0f10aa 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='ReleaseNotes'>
 
   <articleinfo>
 
@@ -30,7 +30,7 @@
 
   </articleinfo>
 
-  <sect1>
+  <sect1 id='Dedication'>
     <title>Dedication</title>
 
     <para><emphasis>
@@ -43,7 +43,7 @@
     </emphasis></para>
   </sect1>
 
-  <sect1>
+  <sect1 id='Introduction_to_the_X11R&relvers;_Release'>
     <title>Introduction to the X11R&relvers; Release</title>
 
     <para>
@@ -148,7 +148,7 @@ The next section describes what is new in the latest version
 
 <!--
 <![ %updaterel [
-<sect1>
+<sect1 id='Summary_of_updates_in_&relvers;'>
     <title>Summary of updates in &relvers;</title>
     <para>
     </para>
@@ -156,7 +156,7 @@ The next section describes what is new in the latest version
 ]]>
 -->
 
-<sect1>
+<sect1 id='Summary_of_new_features_in_X11R&relvers;'>
     <title>Summary of new features in X11R&relvers;</title>
 
     <para>
@@ -249,7 +249,7 @@ The next section describes what is new in the latest version
     </para>
   </sect1>
 
-  <sect1>
+  <sect1 id='Overview_of_X11R&relvers;'>
     <title>Overview of X11R&relvers;</title>
 
     <para>
@@ -330,10 +330,10 @@ The next section describes what is new in the latest version
     </para>
   </sect1>
 
-  <sect1>
+  <sect1 id='Details_of_X11R&relvers;_components'>
     <title>Details of X11R&relvers; components</title>
 
-    <sect2>
+    <sect2 id='Video_Drivers'>
     <title>Video Drivers</title>
 
     <para>
@@ -604,7 +604,7 @@ The next section describes what is new in the latest version
     </para>
     </sect2>
 
-    <sect2>
+    <sect2 id='Input_Drivers'>
     <title>Input Drivers</title>
 
     <para>
@@ -683,9 +683,9 @@ The next section describes what is new in the latest version
 
     </sect2>
 
-    <sect2>
+    <sect2 id='Xorg_server'>
       <title>Xorg server</title>
-      <sect3>
+      <sect3 id='Loader_and_Modules'>
         <title>Loader and Modules</title>
 
         <para>
@@ -754,7 +754,7 @@ The next section describes what is new in the latest version
 
       </sect3>
 
-      <sect3>
+      <sect3 id='Command_Line_Options'>
         <title>Command Line Options</title>
 
         <para>
@@ -765,7 +765,7 @@ The next section describes what is new in the latest version
         </para>
       </sect3>
 
-      <sect3>
+      <sect3 id='Multi-head'>
         <title>Multi-head</title>
 
         <para>
@@ -787,7 +787,7 @@ The next section describes what is new in the latest version
         </para>
       </sect3>
 
-      <sect3>
+      <sect3 id='Xinerama'>
         <title>Xinerama</title>
         <para>
         <firstterm>Xinerama</firstterm> is an X server extension that
@@ -807,7 +807,7 @@ The next section describes what is new in the latest version
         </para>
       </sect3>
 
-      <sect3>
+      <sect3 id='DDC'>
         <title>DDC</title>
 
         <para>
@@ -835,7 +835,7 @@ The next section describes what is new in the latest version
         configuration file don't match those that are detected.
         </para>
 
-        <sect4>
+        <sect4 id='Changed_behavior_caused_by_DDC.'>
             <title>Changed behavior caused by DDC.</title>
 
             <para>
@@ -850,7 +850,7 @@ The next section describes what is new in the latest version
         </sect4>
       </sect3>
 
-      <sect3>
+      <sect3 id='GLX_and_the_Direct_Rendering_Infrastructure_DRI'>
         <title>GLX and the Direct Rendering Infrastructure (DRI)</title>
 
         <para>
@@ -872,7 +872,7 @@ The next section describes what is new in the latest version
         </para>
       </sect3>
 
-      <sect3>
+      <sect3 id='Terminate_Server_keystroke'>
 	<title>Terminate Server keystroke</title>
 
 	<para>
@@ -908,7 +908,7 @@ The next section describes what is new in the latest version
       </sect3>
 
 
-      <sect3>
+      <sect3 id='X_Server_startup_state'>
 	<title>X Server startup state</title>
 
 	<para>
@@ -922,14 +922,14 @@ The next section describes what is new in the latest version
     </sect2>
 
 <!--
-    <sect2>
+    <sect2 id='Other_extensions'>
         <title>Other extensions</title>
         <para></para>
     </sect2>
 -->
 
 <!--
-<sect1>
+<sect1 id='X_libraries_and_clients'>
 <title>X libraries and clients</title>
 <para>
 </para>
@@ -937,7 +937,7 @@ The next section describes what is new in the latest version
 -->
 
 <!--
-<sect1>
+<sect1 id='Fonts_and_Internationalisation'>
 <title>Fonts and Internationalisation</title>
 <para>
 </para>
@@ -953,7 +953,7 @@ The next section describes what is new in the latest version
 	   >Fonts in X11R&relvers;</ulink></quote> document.
         </para>
 
-	<sect3>
+	<sect3 id='Default_font_installation_directory'>
 	  <title>Default font installation directory</title>
 
 	  <para>
@@ -978,7 +978,7 @@ The next section describes what is new in the latest version
 	  </para>
 	</sect3>
 
-	<sect3>
+	<sect3 id='Bitmap_font_compression_methods'>
 	  <title>Bitmap font compression methods</title>
 
 	  <para>
@@ -1001,7 +1001,7 @@ The next section describes what is new in the latest version
 	  </para>
 	</sect3>
 
-	<sect3>
+	<sect3 id='Type1_Font_support'>
 	  <title>Type1 Font support</title>
 
 	  <para>
@@ -1012,7 +1012,7 @@ The next section describes what is new in the latest version
 	  </para>
 	</sect3>
 
-	<sect3>
+	<sect3 id='CID_Font_support'>
 	  <title>CID Font support</title>
 
 	  <para>
@@ -1028,10 +1028,10 @@ The next section describes what is new in the latest version
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Build_changes_and_issues'>
     <title>Build changes and issues</title>
 
-    <sect2>
+    <sect2 id='Silent_build_rules'>
       <title>Silent build rules</title>
 
       <para>
@@ -1049,7 +1049,7 @@ The next section describes what is new in the latest version
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id='New_configure_options_for_font_modules'>
       <title>New configure options for font modules</title>
 
       <para>
@@ -1061,7 +1061,7 @@ The next section describes what is new in the latest version
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id='New_configure_options_for_documentation_in_modules'>
       <title>New configure options for documentation in modules</title>
 
       <para>
@@ -1134,7 +1134,7 @@ The next section describes what is new in the latest version
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Miscellaneous'>
     <title>Miscellaneous</title>
 
     <para>
@@ -1142,7 +1142,7 @@ The next section describes what is new in the latest version
     X11R&relvers; release.
     </para>
 
-    <sect2>
+    <sect2 id='Socket_directory_ownership_and_permissions'>
         <title>Socket directory ownership and permissions</title>
 
       <para>
@@ -1184,7 +1184,7 @@ The next section describes what is new in the latest version
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Deprecated_components_and_removal_plans'>
     <title>Deprecated components and removal plans</title>
 
     <para>
@@ -1202,7 +1202,7 @@ The next section describes what is new in the latest version
     </para>
 
 
-    <sect2>
+    <sect2 id='Future_Removals'>
       <title>Future Removals</title>
 
       <variablelist>
@@ -1243,7 +1243,7 @@ The next section describes what is new in the latest version
       </variablelist>
     </sect2>
 
-    <sect2>
+    <sect2 id='Removed_in_this_Release'>
       <title>Removed in this Release</title>
 	<para>
 	  <variablelist>
@@ -1286,7 +1286,7 @@ The next section describes what is new in the latest version
     </sect2>
   </sect1>
 
-  <sect1>
+  <sect1 id='Attributions_Acknowledgements_Credits'>
     <title>Attributions/Acknowledgements/Credits</title>
 
 <!--
diff --git a/general/Versions.xml b/general/Versions.xml
index 913b562..9c3f338 100644
--- a/general/Versions.xml
+++ b/general/Versions.xml
@@ -2,7 +2,7 @@
 	  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<article>
+<article id='Versions'>
 
 <articleinfo>
 
@@ -27,7 +27,7 @@ basic scheme is the same.  This document reflects the policy that X.Org uses.
 
 </articleinfo>
 
-<sect1>
+<sect1 id='Module_Versions'>
 <title>Module Versions</title>
 
 <para>
@@ -52,8 +52,8 @@ from 7.2 to 1.3.
 </para>
 </sect1>
 
-<sect1>
-<title>Releases, Development Streams and Branches</title>
+<sect1 id='Releases_Development_Streams_and_Branches'>
+<title>Releases, Development Streams, and Branches</title>
 
 <para>
 X.Org has two release branches for the X server software, and several
@@ -95,7 +95,7 @@ has an identifiable version number.
 
 </sect1>
 
-<sect1>
+<sect1 id='Current_Version_Numbering_Scheme'>
 <title>Current Version Numbering Scheme</title>
 
 <para>
@@ -116,7 +116,7 @@ present only for between-release snapshots of the development and
 stable branches.
 </para>
 
-<sect2>
+<sect2 id='Development_Branch'>
 <title>Development Branch</title>
 
 <para>
@@ -198,7 +198,7 @@ branch snapshot after creating the 1.8 stable branch.
 
 </sect2>
 
-<sect2>
+<sect2 id='Stable_Branch'>
 <title>Stable Branch</title>
 
 <para>
@@ -276,7 +276,7 @@ The 1.8.2 release.
 
 </sect1>
 
-<sect1>
+<sect1 id='Finding_the_X.Org_X_Server_Version_From_a_Client'>
 <title>Finding the X.Org X Server Version From a Client</title>
 
 <para>
diff --git a/general/fonts/fonts.xml b/general/fonts/fonts.xml
index 6508033..386eb0d 100644
--- a/general/fonts/fonts.xml
+++ b/general/fonts/fonts.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='fonts'>
 
 <articleinfo>
 
@@ -18,7 +18,7 @@
 
 </articleinfo>
 
-<sect1>
+<sect1 id='Introduction'>
 <title>Introduction</title>
 
 <para>
@@ -34,7 +34,7 @@ clear to you, please consult <xref linkend='Appendix_background_and_terminology'
 end of this document for background information.
 </para>
 
-<sect2>
+<sect2 id='Two_font_systems'>
 <title>Two font systems</title>
 
 <para>
@@ -92,7 +92,7 @@ not specific to the X Window system, and does not rely on any
 particular font output mechanism.
 </para>
 
-<sect3>
+<sect3 id='Installing_fonts_in_Xft'>
 <title>Installing fonts in Xft</title>
 
 <para>
@@ -129,7 +129,7 @@ $ su -c fc-cache
 
 </sect3>
 
-<sect3>
+<sect3 id='Fine-tuning_Xft'>
 <title>Fine-tuning Xft</title>
 
 <para>
@@ -234,7 +234,7 @@ counterclockwise).
 
 </sect3>
 
-<sect3>
+<sect3 id='Configuring_applications'>
 <title>Configuring applications</title>
 
 <para>
@@ -275,7 +275,7 @@ Gnome applications and Mozilla Firefox will use Xft by default.
 
 </sect2>
 
-<sect2>
+<sect2 id='Configuring_the_core_X11_fonts_system'>
 <title>Configuring the core X11 fonts system</title>
 
 <para>
@@ -286,7 +286,7 @@ inform the X server of the existence of this new directory by
 including it in the <emphasis remap="it">font path</emphasis>.
 </para>
 
-<sect3>
+<sect3 id='Installing_bitmap_fonts'>
 <title>Installing bitmap fonts</title>
 
 <para>
@@ -339,7 +339,7 @@ new font directory; see <xref linkend='Setting_the_servers_font_path' xrefstyle=
 
 </sect3>
 
-<sect3>
+<sect3 id='Installing_scalable_fonts'>
 <title>Installing scalable fonts</title>
 
 <para>
@@ -427,7 +427,7 @@ $ xset q
 
 </para>
 
-<sect4>
+<sect4 id='Font_path_catalogue_directories'>
 <title>Font path catalogue directories</title>
 
 <para>
@@ -472,7 +472,7 @@ setting the following font path:
 </para>
 </sect4>
 
-<sect4>
+<sect4 id='Temporary_modification_of_the_font_path'>
 <title>Temporary modification of the font path</title>
 
 <para>
@@ -504,7 +504,7 @@ url="xset.1.html"
 
 </sect4>
 
-<sect4>
+<sect4 id='Permanent_modification_of_the_font_path'>
 <title>Permanent modification of the font path</title>
 
 <para>
@@ -592,10 +592,10 @@ these modules:
 
 </sect1>
 
-<sect1>
+<sect1 id='Fonts_included_with_X11'>
 <title>Fonts included with X11R&relvers;</title>
 
-<sect2>
+<sect2 id='Standard_bitmap_fonts'>
 <title>Standard bitmap fonts</title>
 
 <para>
@@ -663,7 +663,7 @@ The standard short name `<literal remap="tt">fixed</literal>' is normally an ali
 
 </sect2>
 
-<sect2>
+<sect2 id='The_ClearlyU_Unicode_font_family'>
 <title>The ClearlyU Unicode font family</title>
 
 <para>
@@ -722,14 +722,14 @@ may be useful for improved presentation of text.
 
 </sect2>
 
-<sect2>
+<sect2 id='Standard_scalable_fonts'>
 <title>Standard scalable fonts</title>
 
 <para>
 X11R&relvers; includes all the scalable fonts distributed with X11R6.
 </para>
 
-<sect3>
+<sect3 id='Standard_Type1_fonts'>
 <title>Standard Type&nbsp;1 fonts</title>
 
 <para>
@@ -786,7 +786,7 @@ and reside in the font files
 
 </sect2>
 
-<sect2>
+<sect2 id='The_Bigelow_and__Holmes_Luxi_family'>
 <title>The Bigelow &amp; Holmes Luxi family</title>
 
 <para>
@@ -1073,7 +1073,7 @@ and <xref linkend='Format_of_encoding_files' xrefstyle='select: title'/> later i
 
 </sect3>
 
-<sect3>
+<sect3 id='Backend-specific_notes_about_fontenc'>
 <title>Backend-specific notes about fontenc</title>
 
 <sect4 id='The_FreeType_backend'>
@@ -1434,7 +1434,7 @@ encoding they were designed for, and creating an <emphasis remap="it">ad hoc</em
 file.
 </para>
 
-<sect4>
+<sect4 id='Using_fonts_with_the_designers_encoding'>
 <title>Using fonts with the designer's encoding</title>
 
 <para>
@@ -1458,7 +1458,7 @@ results.
 
 </sect4>
 
-<sect4>
+<sect4 id='Specifying_an_ad_hoc_encoding_file'>
 <title>Specifying an <emphasis remap="it">ad hoc</emphasis> encoding file</title>
 
 <para>
@@ -1469,7 +1469,7 @@ in a font in any desired order. Again, see the
 
 </sect4>
 
-<sect4>
+<sect4 id='Specifying_font_aliases'>
 <title>Specifying font aliases</title>
 
 <para>
@@ -1504,11 +1504,11 @@ url="mkfontdir.1.html"
 
 </sect2>
 
-<sect2>
+<sect2 id='Additional_notes_about_scalable_core_fonts'>
 <title>Additional notes about scalable core fonts</title>
 
 
-<sect3>
+<sect3 id='About_the_FreeType_backend'>
 <title>About the <emphasis remap="it">FreeType</emphasis> backend</title>
 
 <para>
@@ -1601,7 +1601,7 @@ and especially <xref linkend='The_FreeType_backend' xrefstyle='select: title'/>
 
 </sect3>
 
-<sect3>
+<sect3 id='Delayed_glyph_rasterisation'>
 <title>Delayed glyph rasterisation</title>
 
 <para>
@@ -1680,7 +1680,7 @@ that not all monospaced fonts are character-cell fonts.
 <sect1 id='Appendix_background_and_terminology'>
 <title>Appendix: background and terminology</title>
 
-<sect2>
+<sect2 id='Characters_and_glyphs'>
 <title>Characters and glyphs</title>
 
 <para>
@@ -1805,7 +1805,7 @@ standard `<literal remap="tt">fixed</literal>' and `<literal remap="tt">cursor</
 
 </sect2>
 
-<sect2>
+<sect2 id='Unicode'>
 <title>Unicode</title>
 
 <para>
@@ -1843,7 +1843,7 @@ have the last two fields of their XLFD set to `<literal remap="tt">iso10646-1</l
 
 </sect1>
 
-<sect1>
+<sect1 id='References'>
 <title>References</title>
 
 <para>
diff --git a/general/graphics/dps.xml b/general/graphics/dps.xml
index ebb30f7..89a542a 100644
--- a/general/graphics/dps.xml
+++ b/general/graphics/dps.xml
@@ -3,7 +3,7 @@
           "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<article>
+<article id='dps'>
 
 <articleinfo>
 
@@ -28,7 +28,7 @@ Updated by Jim Gettys and Juliusz Chroboczek.
 
 </para>
 
-<sect1>
+<sect1 id='Notice_of_Obsolescence_and_Removal_from_X.Org_Releases'>
 <title>Notice of Obsolescence and Removal from X.Org Releases</title>
 
 <para>
diff --git a/general/input/XKB-Config.xml b/general/input/XKB-Config.xml
index 7dac34c..b544745 100644
--- a/general/input/XKB-Config.xml
+++ b/general/input/XKB-Config.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='XKB-Config'>
 
   <articleinfo>
 
@@ -39,7 +39,7 @@ url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 
   </articleinfo>
 
-  <sect1>
+  <sect1 id='Overview'>
     <title>Overview</title>
 
     <para>
@@ -60,7 +60,7 @@ than those tools provide.
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Selecting_XKB_Configuration'>
     <title>Selecting XKB Configuration</title>
 
     <para>
@@ -135,7 +135,7 @@ the xkb configuration subdirectory <filename>rules</filename>
 (for example <filename>/usr/share/X11/xkb/rules</filename>).
     </para>
 
-    <sect2>
+    <sect2 id='Basic_Configuration'>
       <title>Basic Configuration</title>
 
       <para>
@@ -202,7 +202,7 @@ setxkbmap -option "terminate:ctrl_alt_bksp"
 
     </sect2>
 
-    <sect2>
+    <sect2 id='Advanced_Configuration'>
       <title>Advanced Configuration</title>
 
       <para>
@@ -248,7 +248,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \
 
     </sect2>
 
-    <sect2>
+    <sect2 id='Even_More_Advanced_Configuration'>
       <title>Even More Advanced Configuration</title>
 
       <para>
@@ -288,7 +288,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \
 
     </sect2>
 
-    <sect2>
+    <sect2 id='Basic_Global_Options'>
       <title>Basic Global Options</title>
 
       <para>
@@ -305,7 +305,7 @@ see the section starting with <quote><literal>! option</literal></quote> in the
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Keymap_XKB_Configuration'>
     <title>Keymap XKB Configuration</title>
 
     <para>
diff --git a/general/input/XKB-Enhancing.xml b/general/input/XKB-Enhancing.xml
index 4f78e98..dca12a5 100644
--- a/general/input/XKB-Enhancing.xml
+++ b/general/input/XKB-Enhancing.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='XKB-Enhancing'>
 
   <articleinfo>
 
@@ -32,7 +32,7 @@ keyboard layout. Unlike other documents this guide accents the keymap developer'
 
   </articleinfo>
 
-  <sect1>
+  <sect1 id='Overview'>
     <title>Overview</title>
 
     <para>
@@ -62,7 +62,7 @@ are to be made to XFree86 version 4.3 and X11R6.7.0 and above.
 
   </sect1>
 
-  <sect1>
+  <sect1 id='The_Basics'>
     <title>The Basics</title>
 
     <para>
@@ -168,7 +168,7 @@ in subdirectories with the same names (usually in
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Enhancing_XKB_Configuration'>
     <title>Enhancing XKB Configuration</title>
 
     <para>
@@ -208,7 +208,7 @@ Even if there is nothing similar you may get some ideas about basic
 concepts and used tricks.
     </para>
 
-    <sect2>
+    <sect2 id='Levels_And_Groups'>
       <title>Levels And Groups</title>
 
       <para>
@@ -324,7 +324,7 @@ behaviour
 
   </sect1>
 
-  <sect1>
+  <sect1 id='Defining_New_Layouts'>
     <title>Defining New Layouts</title>
 
 <!--
@@ -345,7 +345,7 @@ See <ulink url="http://www.tsu.ru/~pascal/en/xkb/gram-common.html"
 syntax of xkb configuration files.
     </para>
 
-    <sect2>
+    <sect2 id='Predefined_XKB_Symbol_Sets'>
       <title>Predefined XKB Symbol Sets</title>
 
       <para>
@@ -613,7 +613,7 @@ Don't alter any of existing key types. If you need a different behaviour
 create a new one.
       </para>
 
-      <sect3>
+      <sect3 id='More_On_Definitions_Of_Types'>
 	<title>More On Definitions Of Types</title>
 
 	<para>
@@ -702,7 +702,7 @@ type definitions.
 
     </sect2>
 
-    <sect2>
+    <sect2 id='Rules'>
       <title>Rules</title>
 
       <para>
@@ -814,7 +814,7 @@ symbols in appropriate variants as a default.
   TODO: better and more complex explanation of rules
 -->
 
-    <sect2>
+    <sect2 id='Descriptive_Files_of_Rules'>
       <title>Descriptive Files of Rules</title>
 
       <para>
@@ -828,7 +828,7 @@ this file) know what is your work about.
     TODO: format and semantics
 -->
 
-      <sect3>
+      <sect3 id='Old_Descriptive_Files'>
 	<title>Old Descriptive Files</title>
 
 	<para>
diff --git a/general/platforms/Darwin.xml b/general/platforms/Darwin.xml
index 567ebe2..38e6801 100644
--- a/general/platforms/Darwin.xml
+++ b/general/platforms/Darwin.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='Darwin'>
 
   <articleinfo>
 
@@ -15,7 +15,7 @@
 
   </articleinfo>
 
-  <sect1>
+  <sect1 id='Introduction'>
     <title>Introduction</title>
 
     <para>
diff --git a/general/platforms/Solaris.xml b/general/platforms/Solaris.xml
index a9662fb..24cbc11 100644
--- a/general/platforms/Solaris.xml
+++ b/general/platforms/Solaris.xml
@@ -5,7 +5,7 @@
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
-<article>
+<article id='Solaris'>
 
 <!-- Title information -->
 <articleinfo>
@@ -38,7 +38,7 @@
 <!-- Table of contents -->
 
 <!-- Begin the document -->
-<sect1>
+<sect1 id='The_VT-switching_sub-system_in_Solaris'>
 <title>The VT-switching sub-system in Solaris</title>
 
 <para>
@@ -66,7 +66,7 @@ most other VT sub-systems.
 
 </sect1>
 
-<sect1>
+<sect1 id='Notes_for_building_X11R&relvers;_on_Solaris'>
 <title>Notes for building X11R&relvers; on Solaris</title>
 
 <para>
@@ -118,7 +118,7 @@ these programs must be found before any possible GNU versions.
 
 </sect1>
 
-<sect1>
+<sect1 id='Notes_for_running_Xorg_on_Solaris'>
 <title>Notes for running Xorg on Solaris</title>
 
 <para>
@@ -159,7 +159,7 @@ Xqueue is <emphasis remap="bf">NOT</emphasis> supported under Solaris.
 </sect1>
 
 
-<sect1>
+<sect1 id='Bug_Notification'>
 <title>Bug Notification</title>
 
 <para>