Cleanup IDs and links in doc

1 - fix the capitalization of the ID attributes to match
    either the <title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
    will become an olink.

Signed-off-by: Matt Dew <marcoz@osource.org>

10 files changed, 473 insertions, 558 deletions

diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index c0d0c97..17cb399 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -713,8 +713,8 @@ The next section describes what is new in the latest version
         </para></warning>
       </sect3>
 
-      <sect3 id="config">
-        <title>Configuration File</title>
+      <sect3 id='Configuration_File'>
+<title>Configuration File</title>
 
         <para>
         The Xorg server uses a configuration file as the primary mechanism
@@ -939,8 +939,8 @@ The next section describes what is new in the latest version
 </sect1>
 -->
 
-    <sect2 id="font">
-        <title>Font support</title>
+    <sect2 id='Font_support'>
+<title>Font support</title>
 
         <para>
         Details about the font support in X11R&relvers; can be
diff --git a/general/fonts/fonts.xml b/general/fonts/fonts.xml
index fefef2f..6508033 100644
--- a/general/fonts/fonts.xml
+++ b/general/fonts/fonts.xml
@@ -23,14 +23,14 @@
 
 <para>
 This document describes the support for fonts in X11R&relvers;.
-<xref linkend="sec-installing"/> is aimed at the
+<xref linkend='Installing_fonts' xrefstyle='select: title'/> is aimed at the
 casual user wishing to install fonts in X11R&relvers; the rest of the
 document describes the font support in more detail.
 </para>
 
 <para>
 We assume some familiarity with digital fonts.  If anything is not
-clear to you, please consult <xref linkend="sec-background" /> at the
+clear to you, please consult <xref linkend='Appendix_background_and_terminology' xrefstyle='select: title'/> at the
 end of this document for background information.
 </para>
 
@@ -73,7 +73,7 @@ possible.
 
 </sect1>
 
-<sect1 id="sec-installing" xreflabel="Installing fonts">
+<sect1 id='Installing_fonts'>
 <title>Installing fonts</title>
 
 <para>
@@ -81,7 +81,7 @@ This section explains how to configure both Xft and the core fonts
 system to access newly-installed fonts.
 </para>
 
-<sect2 id="sec-configuring-xft">
+<sect2 id='Configuring_Xft'>
 <title>Configuring Xft</title>
 
 <para>
@@ -334,7 +334,7 @@ $ mkfontdir /usr/local/share/fonts/bitmap/
 
 <para>
 All that remains is to tell the X server about the existence of the
-new font directory; see <xref linkend="sec-set-font-path"/> below.
+new font directory; see <xref linkend='Setting_the_servers_font_path' xrefstyle='select: title'/> below.
 </para>
 
 </sect3>
@@ -375,14 +375,14 @@ url="mkfontdir.1.html"
 > and <ulink
 url="mkfontscale.1.html"
 >mkfontscale(1)</ulink
-> manual pages and <xref linkend="sec-internationalisation"/>
+> manual pages and <xref linkend='Core_fonts_and_internationalisation' xrefstyle='select: title'/>
 later in this document.
 </para>
 
 </sect3>
 
-<sect3 id="sec-cid-fonts" xreflabel="Installing CIDFonts">
-<title>CID-keyed fonts </title>
+<sect3 id='CID_keyed_fonts'>
+<title>CID-keyed fonts</title>
 
 <para>
 The CID-keyed font format was designed by Adobe Systems for fonts
@@ -393,8 +393,8 @@ support for CID-keyed fonts has been removed from X11.
 
 </sect3>
 
-<sect3 id="sec-set-font-path" xreflabel="Setting the server font path">
-<title>Setting the server's font path </title>
+<sect3 id='Setting_the_servers_font_path'>
+<title>Setting the server's font path</title>
 
 <para>
 The list of directories where the server looks for fonts is known
@@ -535,8 +535,8 @@ url="xorg.conf.5.html"
 
 </sect3>
 
-<sect3 id="sec-troubleshooting-core">
-<title>Troubleshooting </title>
+<sect3 id='Troubleshooting'>
+<title>Troubleshooting</title>
 
 <para>
 If you seem to be unable to use some of the fonts you have
@@ -873,17 +873,16 @@ name have been removed from X11R&relvers;.
 
 </sect1>
 
-<sect1 id="sec-more-core">
-<title>More about core fonts </title>
+<sect1 id='More_about_core_fonts'>
+<title>More about core fonts</title>
 
 <para>
 This section describes X11R&relvers;-specific enhancements to the core
 X11 fonts system.
 </para>
 
-<sect2 id="sec-internationalisation" xreflabel="Core fonts and
-internationalisation">
-<title>Core fonts and internationalisation </title>
+<sect2 id='Core_fonts_and_internationalisation'>
+<title>Core fonts and internationalisation</title>
 
 <para>
 The scalable font backends (Type&nbsp;1 and TrueType) can
@@ -900,8 +899,8 @@ which will lead to the font being recoded to ISO&nbsp;8859-1 and
 ISO&nbsp;8859-2 respectively.
 </para>
 
-<sect3 id="sec-fontenc">
-<title>The <emphasis remap="it">fontenc</emphasis> layer </title>
+<sect3 id='The_fontenc_layer'>
+<title>The <emphasis remap="it">fontenc</emphasis> layer</title>
 
 <para>
 Two of the scalable backends (Type&nbsp;1 and the
@@ -1068,7 +1067,8 @@ manual page for more details.
 <para>
 A number of encoding files for common encodings are included with
 X11R&relvers;.  Information on writing new encoding files can be found in
-<xref linkend="sec-format-encoding-directory-files"/> and <xref linkend="sec-format-encoding-files"/> later in this document.
+<xref linkend='Format_of_encoding_directory_files' xrefstyle='select: title'/>
+and <xref linkend='Format_of_encoding_files' xrefstyle='select: title'/> later in this document.
 </para>
 
 </sect3>
@@ -1076,8 +1076,8 @@ X11R&relvers;.  Information on writing new encoding files can be found in
 <sect3>
 <title>Backend-specific notes about fontenc</title>
 
-<sect4 id="sec-fontenc-freetype">
-<title>The <emphasis remap="it">FreeType</emphasis> backend </title>
+<sect4 id='The_FreeType_backend'>
+<title>The <emphasis remap="it">FreeType</emphasis> backend</title>
 
 <para>
 For TrueType and OpenType fonts, the FreeType backend scans the
@@ -1098,7 +1098,8 @@ points that have been assigned names by Adobe.
 <para>
 Specifying an encoding value of <literal remap="tt">adobe-fontspecific</literal> for a
 Type&nbsp;1 font disables the encoding mechanism.  This is useful with
-symbol and incorrectly encoded fonts (see <xref linkend="sec-incorrect-encoding"/> below).
+symbol and incorrectly encoded fonts (see 
+<xref linkend='Hints_about_using_badly_encoded_fonts' xrefstyle='select: title'/> below).
 </para>
 
 <para>
@@ -1110,9 +1111,8 @@ ISO&nbsp;8859-1.
 
 </sect3>
 
-<sect3 id="sec-format-encoding-directory-files" xreflabel="Format of
-encodings directory files">
-<title>Format of encoding directory files </title>
+<sect3 id='Format_of_encoding_directory_files'>
+<title>Format of encoding directory files</title>
 
 <para>
 In order to use a font in an encoding that the font backend does
@@ -1162,8 +1162,8 @@ url="mkfontdir.1.html"
 
 </sect3>
 
-<sect3 id="sec-format-encoding-files" xreflabel="Format of encoding files">
-<title>Format of encoding files </title>
+<sect3 id='Format_of_encoding_files'>
+<title>Format of encoding files</title>
 
 <para>
 The encoding files are ``free form,'' <emphasis remap="it">i.e.</emphasis> any string of
@@ -1389,8 +1389,8 @@ sections with an unknown target.
 
 </sect3>
 
-<sect3 id="sec-symbol-fonts">
-<title>Using symbol fonts </title>
+<sect3 id='Using_symbol_fonts'>
+<title>Using symbol fonts</title>
 
 <para>
 Type&nbsp;1 symbol fonts should be installed using the
@@ -1415,8 +1415,8 @@ for the <literal remap="tt">ZapfDingbats</literal> font; see the file
 
 </sect3>
 
-<sect3 id="sec-incorrect-encoding" xreflabel="Incorrectly encoded fonts">
-<title>Hints about using badly encoded fonts </title>
+<sect3 id='Hints_about_using_badly_encoded_fonts'>
+<title>Hints about using badly encoded fonts</title>
 
 <para>
 A number of text fonts are incorrectly encoded. Incorrect encoding
@@ -1522,7 +1522,8 @@ Project (see <ulink
 url="http://x-tt.sourceforge.jp/"
 >the After X-TT Project web site</ulink
 >).  The <emphasis remap="it">FreeType</emphasis> backend has support for the
-``fontenc'' style of internationalisation (see <xref linkend="sec-fontenc"/>).  This backend supports TrueType font files
+``fontenc'' style of internationalisation (see
+<xref linkend='The_fontenc_layer' xrefstyle='select: title'/>).  This backend supports TrueType font files
 (`<filename>*.ttf</filename>'), OpenType font files (`<filename>*.otf</filename>'), TrueType Collections
 (`<filename>*.ttc</filename>'), OpenType Collections (`<filename>*.otc</filename>') and Type 1 font
 files (`<filename>*.pfa</filename>' and `<filename>*.pfb</filename>').
@@ -1594,7 +1595,8 @@ url="http://x-tt.sourceforge.jp/"
 
 <para>
 The <emphasis remap="it">FreeType</emphasis> backend uses the <emphasis remap="it">fontenc</emphasis> layer in order to support
-recoding of fonts; this was described in <xref linkend="sec-fontenc"/> and especially <xref linkend="sec-fontenc-freetype"/> earlier in this document.
+recoding of fonts; this was described in <xref linkend='The_fontenc_layer' xrefstyle='select: title'/>
+and especially <xref linkend='The_FreeType_backend' xrefstyle='select: title'/> earlier in this document.
 </para>
 
 </sect3>
@@ -1675,8 +1677,8 @@ that not all monospaced fonts are character-cell fonts.
 
 </sect1>
 
-<sect1 id="sec-background" xreflabel="Appendix: Background">
-<title>Appendix: background and terminology </title>
+<sect1 id='Appendix_background_and_terminology'>
+<title>Appendix: background and terminology</title>
 
 <sect2>
 <title>Characters and glyphs</title>
@@ -1717,8 +1719,8 @@ character sets are necessary for ideographic writing systems.
 
 </sect2>
 
-<sect2 id="sec-xlfd">
-<title>Font files, fonts, and XLFD </title>
+<sect2 id='Font_files_fonts_and_XLFD'>
+<title>Font files, fonts, and XLFD</title>
 
 <para>
 Traditionally, typographers speak about <emphasis remap="it">typefaces</emphasis> and
diff --git a/general/input/XKB-Enhancing.xml b/general/input/XKB-Enhancing.xml
index 4273549..4f78e98 100644
--- a/general/input/XKB-Enhancing.xml
+++ b/general/input/XKB-Enhancing.xml
@@ -240,7 +240,7 @@ modifiers so it its row has only one column defined.
 
       <para>
 Note that in XKB there is no prior assumption that certain modifiers are bound
-to certain columns. By editing proper files (see <xref linkend="keytypes" />)
+to certain columns. By editing proper files (see <xref linkend='Key_Types' xrefstyle='select: title'/>)
 this mapping can be changed as well.
       </para>
 
@@ -419,8 +419,8 @@ definition and altering what may be needed.
 
     </sect2>
 
-    <sect2 id="keytypes" xreflabel="keytypes">
-      <title>Key Types</title>
+    <sect2 id='Key_Types'>
+<title>Key Types</title>
 
       <para>
 The differences in the number of columns (shift levels) are caused by
diff --git a/specs/ICCCM/icccm.xml b/specs/ICCCM/icccm.xml
index 02d8919..f3b4f74 100644
--- a/specs/ICCCM/icccm.xml
+++ b/specs/ICCCM/icccm.xml
@@ -194,7 +194,7 @@ John Interrante   John Thomas
 </literallayout>
 </preface>
 
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 <para>
 It was an explicit design goal of X Version 11 to specify mechanism,
@@ -256,7 +256,7 @@ and to the equivalent interfaces for other languages
 is the subject of other documents.
 </para>
 
-<sect1 id="evolution_of_the_conventions">
+<sect1 id='Evolution_of_the_Conventions'>
 <title>Evolution of the Conventions</title>
 <para>
 In the interests of timely acceptance,
@@ -297,7 +297,7 @@ appropriate to protocol minor revision
 </para>
 </sect1>
 
-<sect1 id="atoms">
+<sect1 id='Atoms'>
 <title>Atoms</title>
 <para>
 Many of the conventions use atoms.
@@ -305,7 +305,7 @@ To assist the reader,
 the following sections attempt to amplify the description of atoms
 that is provided in the protocol specification.
 </para>
-<sect2 id="what_are_atoms">
+<sect2 id='What_Are_Atoms'>
 <title>What Are Atoms?</title>
 <para>
 At the conceptual level,
@@ -343,7 +343,7 @@ The inverse operator is also available
 </para>
 </sect2>
 
-<sect2 id="predefined_atoms">
+<sect2 id='Predefined_Atoms'>
 <title>Predefined Atoms</title>
 <para>
 The protocol specifies a number of atoms as being predefined:
@@ -379,7 +379,7 @@ and will typically initialize this cache with the predefined atoms.
 </para>
 </sect2>
 
-<sect2 id="naming_conventions">
+<sect2 id='Naming_Conventions'>
 <title>Naming Conventions</title>
 <para>
 The built-in atoms are composed of uppercase ASCII characters with the
@@ -401,7 +401,7 @@ special quoting conventions would have to be used.
 </para>
 </sect2>
 
-<sect2 id="semantics">
+<sect2 id='Semantics'>
 <title>Semantics</title>
 <para>
 The core protocol imposes no semantics on atoms except as they are used in
@@ -410,7 +410,7 @@ For further information on FONTPROP semantics,
 see the <emphasis remap='I'>X Logical Font Description Conventions</emphasis>.
 </para>
 </sect2>
-<sect2 id="name_spaces">
+<sect2 id='Name_Spaces'>
 <title>Name Spaces</title>
 <para>
 The protocol defines six distinct spaces in which atoms are interpreted.
@@ -467,7 +467,7 @@ with respect to each of these name spaces.
 </informaltable>
 </sect2>
 
-<sect2 id="discriminated_names">
+<sect2 id='Discriminated_Names'>
 <title>Discriminated Names</title>
 <para>
 Sometimes a protocol requires an arbitrary number of similar
@@ -582,7 +582,7 @@ conventions.
 </sect1>
 </chapter>
 
-<chapter id="peer_to_peer_communication_by_means_of_selections">
+<chapter id='Peer_to_Peer_Communication_by_Means_of_Selections'>
 <title>Peer-to-Peer Communication by Means of Selections</title>
 <para>
 Selections are the primary mechanism that X Version 11 defines
@@ -590,8 +590,7 @@ for the exchange of information between clients,
 for example, by cutting and pasting between windows.
 Note that there can be an arbitrary number of selections
 (each named by an atom) and that they are global to the server.
-<link linkend="use_of_selection_atoms">
-<xref linkend="use_of_selection_atoms"></xref></link>.
+<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/>.
 discusses the choice of an atom.
 Each selection is owned by a client and is attached to a window.
 </para>
@@ -673,7 +672,7 @@ Thus, passing indirect references to data
 is permitted only if both clients specifically agree.
 </para>
 
-<sect1 id="acquiring_selection_ownership">
+<sect1 id='Acquiring_Selection_Ownership'>
 <title>Acquiring Selection Ownership</title>
 <para>
 A client wishing to acquire ownership of a particular selection
@@ -824,7 +823,7 @@ of the selection for the time period starting at the specified time.
 </para>
 </sect1>
 
-<sect1 id="responsibilities_of_the_selection_owner">
+<sect1 id='Responsibilities_of_the_Selection_Owner'>
 <title>Responsibilities of the Selection Owner</title>
 <para>
 When a requestor wants the value of a selection,
@@ -943,8 +942,7 @@ the owner must refuse the
 <function>SelectionRequest</function>,
 as previously described.
 See also
-<link linkend="large_data_transfers">
-<xref linkend="large_data_transfers"></xref></link>.
+<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>.
 
 </para>
 
@@ -1050,8 +1048,7 @@ Selection requestors are responsible for deleting properties whose
 names they receive in
 <function>SelectionNotify</function>
 events (See
-<link linkend="requesting_a_selection">
-<xref linkend="requesting_a_selection"></xref></link>
+<xref linkend='Requesting_a_Selection' xrefstyle='select: title'/>
 ) or in properties with type MULTIPLE.
 </para>
 </blockquote>
@@ -1144,14 +1141,14 @@ the owner should take no action.
 
 </sect1>
 
-<sect1 id="giving_up_selection_ownership">
+<sect1 id='Giving_Up_Selection_Ownership'>
 <title>Giving Up Selection Ownership</title>
 <para>
 Clients may either give up selection ownership voluntarily
 or lose it forcibly as the result of some other client's actions.
 </para>
 
-<sect2 id="voluntarily_giving_up_selection_ownership">
+<sect2 id='Voluntarily_Giving_Up_Selection_Ownership'>
 <title>Voluntarily Giving Up Selection Ownership</title>
 <para>
 To relinquish ownership of a selection voluntarily,
@@ -1173,7 +1170,7 @@ the ownership of the selection involved will revert to
 </para>
 </sect2>
 
-<sect2 id="forcibly_giving_up_selection_ownership">
+<sect2 id='Forcibly_Giving_Up_Selection_Ownership'>
 <title>Forcibly Giving Up Selection Ownership</title>
 <para>
 If a client gives up ownership of a selection
@@ -1185,8 +1182,7 @@ the previous owner will receive a
 event. For the definition of a
 <function>SelectionClear</function>
 event, see
-<link linkend="responsibilities_of_the_selection_owner">
-<xref linkend="responsibilities_of_the_selection_owner"></xref></link>
+<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>
 </para>
 
 <para>
@@ -1199,7 +1195,7 @@ request.
 </sect2>
 </sect1>
 
-<sect1 id="requesting_a_selection">
+<sect1 id='Requesting_a_Selection'>
 <title>Requesting a Selection</title>
 <para>
 A client that wishes to obtain the value of a selection in a particular
@@ -1249,8 +1245,7 @@ The selection argument specifies the particular selection involved,
 and the target argument specifies the required form of the information.
 For information about the choice of suitable atoms to use,
 see
-<link linkend="use_of_selection_atoms">
-<xref linkend="use_of_selection_atoms"></xref></link>
+<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/>
 The requestor should set the requestor argument to a window that it created;
 the owner will place the reply property there.
 The requestor should set the time argument to the timestamp on the event
@@ -1363,8 +1358,7 @@ event will be received.
 For the definition of a
 <function>SelectionNotify</function>
 event, see
-<link linkend="responsibilities_of_the_selection_owner">
-<xref linkend="responsibilities_of_the_selection_owner"></xref></link>.
+<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -1474,8 +1468,7 @@ Several
 requests may be needed to retrieve all the data in the selection;
 each should set the long-offset argument to the amount of data received so far,
 and the size argument to some reasonable buffer size (see
-<link linkend="large_data_transfers">
-<xref linkend="large_data_transfers"></xref></link>.
+<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>.
 ).
 If the returned value of bytes-after is zero, <!-- xref -->
 the whole property has been transferred.
@@ -1485,8 +1478,7 @@ the whole property has been transferred.
 Once all the data in the selection has been retrieved
 (which may require getting the values of several properties --
 see
-<link linkend="use_of_selection_properties">
-<xref linkend="use_of_selection_properties"></xref></link>.
+<xref linkend='Use_of_Selection_Properties' xrefstyle='select: title'/>.
 ),
 the requestor should delete the property in the
 <function>SelectionNotify</function>
@@ -1512,14 +1504,13 @@ The requestor should invoke either
 after it has successfully retrieved all the data in the selection.
 For further information,
 see
-<link linkend="large_data_transfers">
-<xref linkend="large_data_transfers"></xref></link>.
+<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>.
 
 </para>
 </blockquote>
 </sect1>
 
-<sect1 id="large_data_transfers">
+<sect1 id='Large_Data_Transfers'>
 <title>Large Data Transfers</title>
 <para>
 Selections can get large, which poses two problems:
@@ -1559,8 +1550,7 @@ Selection owners should transfer the data describing a large selection
 (relative to the maximum-request-size they received
 in the connection handshake) using the INCR property mechanism
 (see
-<link linkend="incr_properties">
-<xref linkend="incr_properties"></xref></link>.
+<xref linkend='INCR_Properties' xrefstyle='select: title'/>.
 ). <!-- xref -->
     </para>
   </listitem>
@@ -1573,7 +1563,7 @@ to acquire selection ownership should arrange to process
 errors in property change requests.
 For clients using Xlib,
 this involves using the
-<function>XSetErrorHandler</function>
+<olink targetdoc='libX11' targetptr='XSetErrorHandler'><function>XSetErrorHandler</function></olink>
 function to override the default handler.
     </para>
   </listitem>
@@ -1607,8 +1597,7 @@ all properties stored for this selection should be deleted
 and the
 <function>ConvertSelection</function>
 request should be refused (see
-<link linkend="responsibilities_of_the_selection_owner">
-<xref linkend="responsibilities_of_the_selection_owner"></xref></link>.
+<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>.
 ). <!-- xref -->
     </para>
   </listitem>
@@ -1632,7 +1621,7 @@ data transfers.
 </blockquote>
 </sect1>
 
-<sect1 id="use_of_selection_atoms">
+<sect1 id='Use_of_Selection_Atoms'>
 <title>Use of Selection Atoms</title>
 <para>
 Defining a new atom consumes resources in the server
@@ -1641,7 +1630,7 @@ Thus, reducing the need for newly minted atoms is an important goal
 for the use of the selection atoms.
 </para>
 
-<sect2 id="selection_atoms">
+<sect2 id='Selection_Atoms'>
 <title>Selection Atoms</title>
 <para>
 There can be an arbitrary number of selections, each named by an atom.
@@ -1671,7 +1660,7 @@ Other selections may be used freely for private communication among
 related groups of clients.
 </para>
 
-<sect3 id="the_primary_Selection">
+<sect3 id='The_PRIMARY_Selection'>
 <title>The PRIMARY Selection</title>
 <para>
 The selection named by the atom PRIMARY is used for all commands
@@ -1680,7 +1669,7 @@ between clients that use the selection mechanism.
 </para>
 </sect3>
 
-<sect3 id="the_secondary_Selection">
+<sect3 id='The_SECONDARY_Selection'>
 <title>The SECONDARY Selection</title>
 <para>
 The selection named by the atom SECONDARY is used:
@@ -1701,7 +1690,7 @@ and the user does not want to disturb it
 </itemizedlist>
 
 </sect3>
-<sect3 id="the_clipboard_selection">
+<sect3 id='The_CLIPBOARD_Selection'>
 <title>The CLIPBOARD Selection</title>
 <para>
 The selection named by the atom CLIPBOARD is used to hold data
@@ -1847,7 +1836,7 @@ Flexibility - The clipboard data may be available as more than one target.
 </sect3>
 </sect2>
 
-<sect2 id="target_atoms">
+<sect2 id='Target_Atoms'>
 <title>Target Atoms</title>
 <para>
 The atom that a requestor supplies as the target of a
@@ -1910,8 +1899,7 @@ dinked around with after the end of the table.
       <entry>CLASS</entry>
       <entry>TEXT</entry>
       <entry>(see
-<link linkend="wm_class_property">
-<xref linkend="wm_class_property"></xref></link>.
+<xref linkend='WM_CLASS_Property' xrefstyle='select: title'/>.
 )</entry> <!-- xref -->
     </row>
     <row rowsep="0">
@@ -1938,8 +1926,7 @@ dinked around with after the end of the table.
       <entry>DELETE</entry>
       <entry>NULL</entry>
       <entry>(see
-<link linkend="delete">
-<xref linkend="delete"></xref></link>.
+<xref linkend='DELETE' xrefstyle='select: title'/>.
 )</entry>
     </row>
     <row rowsep="0">
@@ -1978,24 +1965,21 @@ type as well to allow for compatibility with older clients.
       <entry>HOST_NAME</entry>
       <entry>TEXT</entry>
       <entry>(see
-<link linkend="wm_client_machine_property">
-<xref linkend="wm_client_machine_property"></xref></link>.
+<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>.
 )</entry>
     </row>
     <row rowsep="0">
       <entry>INSERT_PROPERTY</entry>
       <entry>NULL</entry>
       <entry>(see
-<link linkend="insert_property">
-<xref linkend="insert_property"></xref></link>.
+<xref linkend='INSERT_PROPERTY' xrefstyle='select: title'/>.
 )</entry>
     </row>
     <row rowsep="0">
       <entry>INSERT_SELECTION</entry>
       <entry>NULL</entry>
       <entry>(see
-<link linkend="insert_selection">
-<xref linkend="insert_selection"></xref></link>.
+<xref linkend='INSERT_SELECTION' xrefstyle='select: title'/>.
 )</entry>
     </row>
     <row rowsep="0">
@@ -2035,8 +2019,7 @@ backward compatibility.
       <entry>NAME</entry>
       <entry>TEXT</entry>
       <entry>(see
-<link linkend="wm_name_property">
-<xref linkend="wm_name_property"></xref></link>.
+<xref linkend='WM_NAME_Property' xrefstyle='select: title'/>.
 )</entry> <!-- xref -->
     </row>
     <row rowsep="0">
@@ -2244,8 +2227,7 @@ The entries in a MULTIPLE property must be processed in the order
 they appear in the property.
 For further information,
 see
-<link linkend="selection_targets_with_side_effects">
-<xref linkend="selection_targets_with_side_effects"></xref></link>.
+<xref linkend='Selection_Targets_with_Side_Effects' xrefstyle='select: title'/>.
         </para>
     </blockquote>
     <para>
@@ -2278,7 +2260,7 @@ returning the timestamp they used to obtain the selection.
 </itemizedlist>
 </sect2>
 
-<sect2 id="selection_targets_with_side_effects">
+<sect2 id='Selection_Targets_with_Side_Effects'>
 <title>Selection Targets with Side Effects</title>
 <para>
 Some targets (for example, DELETE) have side effects.
@@ -2339,7 +2321,7 @@ These side-effect targets are used to implement operations such as
 "exchange PRIMARY and SECONDARY selections."
 </para>
 
-<sect3 id="delete">
+<sect3 id='DELETE'>
 <title>DELETE</title>
 <para>
 When the owner of a selection receives a request to convert it to DELETE,
@@ -2349,7 +2331,7 @@ and return a zero-length property of type NULL if the deletion was successful.
 </para>
 </sect3>
 
-<sect3 id="insert_selection">
+<sect3 id='INSERT_SELECTION'>
 <title>INSERT_SELECTION</title>
 <para>
 When the owner of a selection receives a request to convert it to
@@ -2363,7 +2345,7 @@ for which it got the INSERT_SELECTION request
 (whatever doing so means for its internal data structures).
 </para>
 </sect3>
-<sect3 id="insert_property">
+<sect3 id='INSERT_PROPERTY'>
 <title>INSERT_PROPERTY</title>
 <para>
 When the owner of a selection receives a request to convert it to
@@ -2376,7 +2358,7 @@ of the selection for which it got the INSERT_SELECTION request
 </sect2>
 </sect1>
 
-<sect1 id="use_of_selection_properties">
+<sect1 id='Use_of_Selection_Properties'>
 <title>Use of Selection Properties</title>
 <para>
 The names of the properties used in selection data transfer are chosen by
@@ -2519,7 +2501,7 @@ the separators are also listed.
 It is expected that this table will grow over time.
 </para>
 
-<sect2 id="text_properties">
+<sect2 id='TEXT_Properties'>
 <title>TEXT Properties</title>
 <para>
 In general,
@@ -2548,8 +2530,7 @@ it should request conversion into the name of that encoding.
 
 <para>
 In the table in
-<link linkend="target_atoms">
-<xref linkend="target_atoms"></xref></link>,
+<xref linkend='Target_Atoms' xrefstyle='select: title'/>,
 the word TEXT (in the Type column) is used to indicate one
 of the registered encoding names.
 The type would not actually be TEXT;
@@ -2608,7 +2589,7 @@ specify an appropriate list format.
 </para>
 </sect2>
 
-<sect2 id="incr_properties">
+<sect2 id='INCR_Properties'>
 <title>INCR Properties</title>
 <para>
 Requestors may receive a property of type INCR
@@ -2720,7 +2701,7 @@ The remaining partial properties must have the same type.
 </para>
 </sect2>
 
-<sect2 id="drawable_properties">
+<sect2 id='DRAWABLE_Properties'>
 <title>DRAWABLE Properties</title>
 <para>
 Requestors may receive properties of type PIXMAP, BITMAP, DRAWABLE, or WINDOW,
@@ -2752,8 +2733,7 @@ Colormap ID
 <para>
 In general,
 requestors converting into targets whose returned type in the table in
-<link linkend="target_atoms">
-<xref linkend="target_atoms"></xref></link>
+<xref linkend='Target_Atoms' xrefstyle='select: title'/>
 is one of the DRAWABLE types should expect to convert also
 into the following targets (using the MULTIPLE mechanism):
 </para>
@@ -2779,7 +2759,7 @@ COLORMAP returns a colormap ID.
 
 </sect2>
 
-<sect2 id="span_properties">
+<sect2 id='SPAN_Properties'>
 <title>SPAN Properties</title>
 <para>
 Properties with type SPAN contain a list of cardinal-pairs
@@ -2795,18 +2775,16 @@ such as LINE_NUMBER or CHARACTER_POSITION.
 </sect2>
 </sect1>
 
-<sect1 id="manager_selections">
+<sect1 id='Manager_Selections'>
 <title>Manager Selections</title>
 <para>
 Certain clients, often called managers, take on responsibility
 for managing shared resources.  A client that manages a shared
 resource should take ownership of an appropriate selection,
 named using the conventions described in
-<link linkend="naming_conventions">
-<xref linkend="naming_conventions"></xref></link>
+<xref linkend='Naming_Conventions' xrefstyle='select: title'/>
 and
-<link linkend="discriminated_names">
-<xref linkend="discriminated_names"></xref></link>.
+<xref linkend='Discriminated_Names' xrefstyle='select: title'/>.
 A client that manages multiple
 shared resources (or groups of resources) should take
 ownership of a selection for each one.
@@ -2830,15 +2808,12 @@ replace the old one.  If so, it may then take ownership of the selection.
 Managers should acquire the selection using a window created expressly for
 this purpose.  Managers must conform to the rules for selection owners
 described in
-<link linkend="acquiring_selection_ownership">
-<xref linkend="acquiring_selection_ownership"></xref></link>
+<xref linkend='Acquiring_Selection_Ownership' xrefstyle='select: title'/>
 and
-<link linkend="responsibilities_of_the_selection_owner">
-<xref linkend="responsibilities_of_the_selection_owner"></xref></link>
+<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>
 , and they must also support the required
 targets listed in
-<link linkend="use_of_selection_atoms">
-<xref linkend="use_of_selection_atoms"></xref></link>.
+<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -2990,7 +2965,7 @@ on the appropriate root window and should watch for the appropriate MANAGER
 </sect1>
 </chapter>
 
-<chapter id="peer_to_peer_communication_by_means_of_cut_buffers">
+<chapter id='Peer_to_Peer_Communication_by_Means_of_Cut_Buffers'>
 <title>Peer-to-Peer Communication by Means of Cut Buffers</title>
 <para>
 The cut buffer mechanism is much simpler but much less powerful
@@ -3022,7 +2997,7 @@ and CUT_BUFFER7 to CUT_BUFFER0.
 It then must store the data into CUT_BUFFER0 by using a
 <function>ChangeProperty</function>
 request in mode
-<function>Replace</function>.
+<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink>.
 </para>
 
 <para>
@@ -3048,7 +3023,7 @@ and need to be able to identify operations that transfer data to and fro.
 </para>
 </chapter>
 
-<chapter id="client_to_window_manager_communication">
+<chapter id='Client_to_Window_Manager_Communication'>
 <title>Client-to-Window-Manager Communication</title>
 <para>
 To permit window managers to perform their role of mediating the competing
@@ -3109,7 +3084,7 @@ and it should be run under a window manager that allows other windows
 (for example, the debugger) to appear on top.
 </para>
 
-<sect1 id="clients_ctions">
+<sect1 id='Clients_Actions'>
 <title>Client's Actions</title>
 <para>
 In general,
@@ -3137,7 +3112,7 @@ Being prepared for resource allocations to change at any time
   </listitem>
 </itemizedlist>
 
-<sect2 id="creating_a_top_level_window">
+<sect2 id='Creating_a_Top_Level_Window'>
 <title>Creating a Top-Level Window</title>
 <para>
 A client's
@@ -3212,15 +3187,13 @@ Newly created windows start in the Withdrawn state.
 Transitions between states happen when the top-level window is mapped
 and unmapped and when the window manager receives certain messages.
 For further details, see
-<link linkend="wm_hints_property">
-<xref linkend="wm_hints_property"></xref></link>.
+<xref linkend='WM_HINTS_Property' xrefstyle='select: title'/>.
  and
-<link linkend="changing_window_state">
-<xref linkend="changing_window_state"></xref></link>.
+<xref linkend='Changing_Window_State' xrefstyle='select: title'/>.
 </para>
 </sect2>
 
-<sect2 id="client_properties">
+<sect2 id='Client_Properties'>
 <title>Client Properties</title>
 <para>
 Once the client has one or more top-level windows,
@@ -3238,11 +3211,11 @@ and will monitor some properties for changes while the window is
 in the Iconic or Normal state.
 When the client changes one of these properties,
 it must use
-<function>Replace</function>
+<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink>
 mode to overwrite the entire property with new data;
 the window manager will retain no memory of the old value of the property.
 All fields of the property must be set to suitable values in a single
-<function>Replace</function>
+<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink>
 mode <function>ChangeProperty</function>
 request.
 This ensures that the full contents of the property will be
@@ -3274,8 +3247,7 @@ should take place using separate properties.
 The only exception to this rule is the WM_PROTOCOLS property, which may be
 of arbitrary length and which may contain atoms representing private
 protocols (see
-<link linkend="wm_protocols_property">
-<xref linkend="wm_protocols_property"></xref></link>
+<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/>
 ).
 </para>
 
@@ -3283,12 +3255,11 @@ protocols (see
 The next sections describe each of the properties the clients
 need to set, in turn.
 They are summarized in the table in
-<link linkend="summary_of_window_manager_property_types">
-<xref linkend="summary_of_window_manager_property_types"></xref></link>
+<xref linkend='Summary_of_Window_Manager_Property_Types' xrefstyle='select: title'/>
 
 </para>
 
-<sect3 id="wm_name_property">
+<sect3 id='WM_NAME_Property'>
 <title>WM_NAME Property</title>
 <para>
 The WM_NAME property is an uninterpreted string
@@ -3300,8 +3271,7 @@ The encoding used for this string
 (and all other uninterpreted string properties)
 is implied by the type of the property.
 The type atoms to be used for this purpose are described in
-<link linkend="text_properties">
-<xref linkend="text_properties"></xref></link>.
+<xref linkend='TEXT_Properties' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -3333,7 +3303,7 @@ brevity here will pay dividends.
 </para>
 </sect3>
 
-<sect3 id="wm_icon_name_property">
+<sect3 id='WM_ICON_NAME_Property'>
 <title>WM_ICON_NAME Property</title>
 <para>
 The WM_ICON_NAME property is an uninterpreted string
@@ -3351,7 +3321,7 @@ or windows; rather, they should rely on the window manager to do so.
 </para>
 </sect3>
 
-<sect3 id="wm_normal_hints_property">
+<sect3 id='WM_NORMAL_HINTS_Property'>
 <title>WM_NORMAL_HINTS Property</title>
 <para>
 The type of the WM_NORMAL_HINTS property is WM_SIZE_HINTS.
@@ -3619,7 +3589,7 @@ place of the base size for this purpose.)
 </para>
 </sect3>
 
-<sect3 id="wm_hints_property">
+<sect3 id='WM_HINTS_Property'>
 <title>WM_HINTS Property</title>
 <para>
 The WM_HINTS property (whose type is WM_HINTS)
@@ -3769,8 +3739,7 @@ the WM_HINTS property if a window is mapped without one.
 <para>
 The input field is used to communicate to the window manager the input focus
 model used by the client (see
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>
+<xref linkend='Input_Focus' xrefstyle='select: title'/>
 ).
 </para>
 
@@ -3809,8 +3778,7 @@ Withdrawn
 
 <para>
 The semantics of these states are described in
-<link linkend="changing_window_state">
-<xref linkend="changing_window_state"></xref></link>.
+<xref linkend='Changing_Window_State' xrefstyle='select: title'/>.
 Newly created windows start in the Withdrawn state.
 Transitions between states happen when a
 top-level window is mapped and unmapped
@@ -3860,8 +3828,7 @@ This pixmap should be:
     <para>
 One of the sizes specified in the WM_ICON_SIZE property
 on the root if it exists (see
-<link linkend="wm_icon_size_property">
-<xref linkend="wm_icon_size_property"></xref></link>
+<xref linkend='WM_ICON_SIZE_Property' xrefstyle='select: title'/>
 ).
     </para>
   </listitem>
@@ -3891,8 +3858,7 @@ Clients should not attempt to remedy the omission by working around it.
 Clients that need more capabilities from the icons than a simple 2-color
 bitmap should use icon windows.
 Rules for clients that do are set out in
-<link linkend="icons">
-<xref linkend="icons"></xref></link>.
+<xref linkend='Icons' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -3950,8 +3916,7 @@ in a backwards compatibility mode.
 </para>
 </footnote>
 rather than the WM_PROTOCOLS mechanism of
-<link linkend="wm_protocols_property">
-<xref linkend="wm_protocols_property"></xref></link>
+<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/>
 </para>
 
 <para>
@@ -3987,7 +3952,7 @@ window is iconic) or by raising it to the top of the stack.
 </blockquote>
 </sect3>
 
-<sect3 id="wm_class_property">
+<sect3 id='WM_CLASS_Property'>
 <title>WM_CLASS Property</title>
 <para>
 The WM_CLASS property (of type STRING without control characters)
@@ -4059,7 +4024,7 @@ This inconsistency is necessary for backwards compatibility.
 </para>
 </sect3>
 
-<sect3 id="wm_transient_for_property">
+<sect3 id='WM_TRANSIENT_FOR_Property'>
 <title>WM_TRANSIENT_FOR Property</title>
 <para>
 The WM_TRANSIENT_FOR property (of type WINDOW)
@@ -4086,7 +4051,7 @@ use override-redirect and grab the pointer while the window is mapped.
 </para>
 </sect3>
 
-<sect3 id="wm_protocols_property">
+<sect3 id='WM_PROTOCOLS_Property'>
 <title>WM_PROTOCOLS Property</title>
 <para>
 The WM_PROTOCOLS property (of type ATOM) is a list of atoms.
@@ -4102,8 +4067,7 @@ involve the window manager sending the client a
 event and the client taking appropriate action.
 For details of the contents of the event,
 see
-<link linkend="clientmessage_events">
-<xref linkend="clientmessage_events"></xref></link>
+<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>
 In each case,
 the protocol transactions are initiated by the window manager.
 </para>
@@ -4134,8 +4098,7 @@ The following table lists the protocols that have been defined to date.
     <row rowsep="0">
       <entry>WM_TAKE_FOCUS</entry>
       <entry>
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>
+<xref linkend='Input_Focus' xrefstyle='select: title'/>
       </entry>
       <entry>Assignment of input focus</entry>
     </row>
@@ -4147,8 +4110,7 @@ The following table lists the protocols that have been defined to date.
     <row rowsep="0">
       <entry>WM_DELETE_WINDOW</entry>
       <entry>
-<link linkend="window_deletion">
-<xref linkend="window_deletion"></xref></link>
+<xref linkend='Window_Deletion' xrefstyle='select: title'/>
       </entry>
       <entry>Request to delete top-level window</entry>
     </row>
@@ -4161,7 +4123,7 @@ It is expected that this table will grow over time.
 </para>
 </sect3>
 
-<sect3 id="wm_colormap_windows_property">
+<sect3 id='WM_COLORMAP_WINDOWS_Property'>
 <title>WM_COLORMAP_WINDOWS Property</title>
 <para>
 The WM_COLORMAP_WINDOWS property (of type WINDOW) on a top-level window
@@ -4172,12 +4134,11 @@ colormap attributes.
 The top-level window is always (implicitly or explicitly) on the watch list.
 For the details of this mechanism,
 see
-<link linkend="colormaps">
-<xref linkend="colormaps"></xref></link>
+<xref linkend='Colormaps' xrefstyle='select: title'/>
 </para>
 </sect3>
 
-<sect3 id="wm_client_machine_property">
+<sect3 id='WM_CLIENT_MACHINE_Property'>
 <title>WM_CLIENT_MACHINE Property</title>
 <para>
 The client should set the WM_CLIENT_MACHINE property (of one of the TEXT
@@ -4187,7 +4148,7 @@ seen from the machine running the server.
 </sect3>
 </sect2>
 
-<sect2 id="window_manager_properties">
+<sect2 id='Window_Manager_Properties'>
 <title>Window Manager Properties</title>
 <para>
 The properties that were described in the previous section are those
@@ -4196,7 +4157,7 @@ This section describes the properties that the window manager places on
 client's top-level windows and on the root.
 </para>
 
-<sect3 id="wm_state_property">
+<sect3 id='WM_STATE_Property'>
 <title>WM_STATE Property</title>
 <para>
 The window manager will place a WM_STATE property (of type WM_STATE) on each
@@ -4322,7 +4283,7 @@ client's icon window.
 </para>
 </sect3>
 
-<sect3 id="wm_icon_size_property">
+<sect3 id='WM_ICON_SIZE_Property'>
 <title>WM_ICON_SIZE Property</title>
 <para>
 A window manager that wishes to place constraints on the sizes of icon
@@ -4379,7 +4340,7 @@ For more details see section 14.1.12 in  <!-- xref -->
 </sect3>
 </sect2>
 
-<sect2 id="changing_window_state">
+<sect2 id='Changing_Window_State'>
 <title>Changing Window State</title>
 <para>
 From the client's point of view,
@@ -4593,8 +4554,7 @@ on a window for which they have not yet received a real
 When a client withdraws a window,
 the window manager will then update or remove the WM_STATE
 property as described in
-<link linkend="wm_state_property">
-<xref linkend="wm_state_property"></xref></link>.
+<xref linkend='WM_STATE_Property' xrefstyle='select: title'/>.
 Clients that want to re-use a client window (e.g., by mapping it again or
 reparenting it elsewhere) after withdrawing it must wait for the
 withdrawal to be complete before proceeding.  The preferred method for
@@ -4658,8 +4618,7 @@ The format of this
 event does not match the format of
 <function>ClientMessages</function>
 in
-<link linkend="clientmessage_events">
-<xref linkend="clientmessage_events"></xref></link>.
+<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>.
 This is because they are sent by the window manager to clients,
 and this message is sent by clients to the window manager.
 </para>
@@ -4704,7 +4663,7 @@ advised to withdraw transients for the window.
 
 </sect2>
 
-<sect2 id="configuring_the_window">
+<sect2 id='Configuring_the_Window'>
 <title>Configuring the Window</title>
 <para>
 Clients can resize and reposition their top-level windows by using the
@@ -4746,8 +4705,7 @@ to be used are those most recently requested by the client.
 Client configure requests are interpreted by the window manager
 in the same manner as the initial window geometry mapped from
 the Withdrawn state, as described in
-<link linkend="wm_normal_hints_property">
-<xref linkend="wm_normal_hints_property"></xref></link>
+<xref linkend='WM_NORMAL_HINTS_Property' xrefstyle='select: title'/>
 Clients must be aware that there is no guarantee that the window manager
 will allocate them the requested size or location and must be prepared to
 deal with any size and location.
@@ -4974,7 +4932,7 @@ contain useful information.
 </para>
 </sect2>
 
-<sect2 id="changing_window_attributes">
+<sect2 id='Changing_Window_Attributes'>
 <title>Changing Window Attributes</title>
 <para>
 The attributes that may be supplied when a window is created may be
@@ -5085,18 +5043,16 @@ windows.
     <para>
 Clients can set override-redirect on top-level windows but are
 encouraged not to do so except as described in
-<link linkend="pop_up_windows">
-<xref linkend="pop_up_windows"></xref></link>.
+<xref linkend='Pop_up_Windows' xrefstyle='select: title'/>.
 and
-<link linkend="redirecting_requests">
-<xref linkend="redirecting_requests"></xref></link>.
+<xref linkend='Redirecting_Requests' xrefstyle='select: title'/>.
 <!-- xref -->
     </para>
   </listitem>
 </itemizedlist>
 </sect2>
 
-<sect2 id="input_focus">
+<sect2 id='Input_Focus'>
 <title>Input Focus</title>
 <para>
 There are four models of input handling:
@@ -5274,8 +5230,7 @@ Windows with the atom WM_TAKE_FOCUS in their WM_PROTOCOLS property
 may receive a
 <function>ClientMessage</function>
 event from the window manager (as described in
-<link linkend="clientmessage_events">
-<xref linkend="clientmessage_events"></xref></link>.
+<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>.
 )
 with WM_TAKE_FOCUS in its data[0] field and a valid timestamp
 (i.e., not
@@ -5289,8 +5244,7 @@ that last had the input focus or to their default input window,
 and the time field set to the timestamp in the message.
 For further information,
 see
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>
+<xref linkend='Input_Focus' xrefstyle='select: title'/>
 </para>
 <para>
 <!-- .LP -->
@@ -5387,7 +5341,7 @@ They should ignore input that they receive instead.
 </blockquote>
 </sect2>
 
-<sect2 id="colormaps">
+<sect2 id='Colormaps'>
 <title>Colormaps</title>
 <para>
 The window manager is responsible for installing and uninstalling
@@ -5432,8 +5386,7 @@ WM_COLORMAP_WINDOWS property.  This property contains a list of IDs for
 windows whose colormaps the window manager should attempt to have installed
 when, in the course of its individual colormap focus policy, it assigns the
 colormap focus to the top-level window (see
-<link linkend="wm_colormap_windows_property">
-<xref linkend="wm_colormap_windows_property"></xref></link>
+<xref linkend='WM_COLORMAP_WINDOWS_Property' xrefstyle='select: title'/>
 ).  The list is
 ordered by the importance to the client of having the colormaps installed.
 The window manager will track changes to this property and will track
@@ -5590,8 +5543,7 @@ This feature was introduced in version 2.0 of this document, and there will
 be a significant period of time before all window managers can be expected
 to implement this feature.  Before using this feature, clients must check
 the compliance level of the window manager (using the mechanism described in
-<link linkend="communication_with_the_window_manager_by_means_of_selections">
-<xref linkend="communication_with_the_window_manager_by_means_of_selections"></xref></link>
+<xref linkend='Communication_with_the_Window_Manager_by_Means_of_Selections' xrefstyle='select: title'/>
 ) to verify that it supports this feature.  This is necessary to
 prevent colormap installation conflicts between clients and older window
 managers.
@@ -5639,7 +5591,7 @@ colormap installation policy in response to a command from the user.
 </blockquote>
 </sect2>
 
-<sect2 id="icons">
+<sect2 id='Icons'>
 <title>Icons</title>
 <para>
 A client can hint to the window manager about the desired appearance
@@ -5804,7 +5756,7 @@ properties they find on icon windows.
 </para>
 </sect2>
 
-<sect2 id="pop_up_windows">
+<sect2 id='Pop_up_Windows'>
 <title>Pop-up Windows</title>
 <para>
 Clients that wish to pop up a window can do one of three things:
@@ -5853,8 +5805,7 @@ client must have another top-level window that is not override-redirect and
 that has selected the Locally Active or Globally Active focus model.  The
 client may set the focus to the override-redirect window when the other
 window receives a WM_TAKE_FOCUS message or one of the events listed in
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>
+<xref linkend='Input_Focus' xrefstyle='select: title'/>
 in the description of the Globally Active focus model.
 </para>
 </blockquote>
@@ -5871,7 +5822,7 @@ to enforce.
 </para>
 </sect2>
 
-<sect2 id="window_groups">
+<sect2 id='Window_Groups'>
 <title>Window Groups</title>
 <para>
 A set of top-level windows that should be treated from the user's point of view
@@ -5904,7 +5855,7 @@ as opposed to an individual, operation.
 </sect2>
 </sect1>
 
-<sect1 id="client_responses_to_window_manager_actions">
+<sect1 id='Client_Responses_to_Window_Manager_Actions'>
 <title>Client Responses to Window Manager Actions</title>
 <para>
 The window manager performs a number of operations on client resources,
@@ -5913,7 +5864,7 @@ Clients must not try to fight this but may elect to receive notification
 of the window manager's operations.
 </para>
 
-<sect2 id="reparenting">
+<sect2 id='Reparenting'>
 <title>Reparenting</title>
 <para>
 Clients must be aware that some window managers will reparent
@@ -5948,13 +5899,11 @@ request in the new parent's coordinate space.
 In fact, they usually will not be interpreted by the server
 because a reparenting window manager usually will have intercepted
 these operations (see
-<link linkend="redirection_of_operations">
-<xref linkend="redirection_of_operations"></xref></link>
+<xref linkend='Redirection_of_Operations' xrefstyle='select: title'/>
 ).
 Clients should use the root coordinate space for these requests
 (see
-<link linkend="configuring_the_window">
-<xref linkend="configuring_the_window"></xref></link>
+<xref linkend='Configuring_the_Window' xrefstyle='select: title'/>
 ).
     </para>
   </listitem>
@@ -5965,8 +5914,7 @@ Clients should use the root coordinate space for these requests
 requests that name a specific sibling window may fail because the window named,
 which used to be a sibling, no longer is after the reparenting operation
 (see
-<link linkend="configuring_the_window">
-<xref linkend="configuring_the_window"></xref></link>
+<xref linkend='Configuring_the_Window' xrefstyle='select: title'/>
 ).
     </para>
   </listitem>
@@ -6020,7 +5968,7 @@ including transient windows and client icon windows.
 </para>
 </sect2>
 
-<sect2 id="redirection_of_operations">
+<sect2 id='Redirection_of_Operations'>
 <title>Redirection of Operations</title>
 <para>
 Clients must be aware that some window managers will arrange
@@ -6132,14 +6080,12 @@ A window with the override-redirect bit set is immune from redirection,
 but the bit should be set on top-level windows only in cases
 where other windows should be prevented from processing input
 while the override-redirect window is mapped (see
-<link linkend="pop_up_windows">
-<xref linkend="pop_up_windows"></xref></link>
+<xref linkend='Pop_up_Windows' xrefstyle='select: title'/>
 )
 and while responding to
 <function>ResizeRequest</function>
 events (see
-<link linkend="redirecting_requests">
-<xref linkend="redirecting_requests"></xref></link>
+<xref linkend='Redirecting_Requests' xrefstyle='select: title'/>
 ).
 </para>
 
@@ -6173,7 +6119,7 @@ less demanding clients.
 </para>
 </sect2>
 
-<sect2 id="window_move">
+<sect2 id='Window_Move'>
 <title>Window Move</title>
 
 <para>
@@ -6232,7 +6178,7 @@ request with the following arguments:
 </sect2>
 
 
-<sect2 id="window_resize">
+<sect2 id='Window_Resize'>
 <title>Window Resize</title>
 <para>
 The client can elect to receive notification of being resized by selecting for
@@ -6255,7 +6201,7 @@ clients are free to request to change to the Iconic state.
 </para>
 </sect2>
 
-<sect2 id="iconify_and_deiconify">
+<sect2 id='Iconify_and_Deiconify'>
 <title>Iconify and Deiconify</title>
 <para>
 A top-level window that is not Withdrawn will be
@@ -6277,7 +6223,7 @@ event when it goes Normal.
 </para>
 </sect2>
 
-<sect2 id="colormap_change">
+<sect2 id='Colormap_Change'>
 <title>Colormap Change</title>
 <para>
 Clients that wish to be notified of their colormaps being installed
@@ -6292,7 +6238,7 @@ is installed or uninstalled.
 </para>
 </sect2>
 
-<sect2 id="input_focus_2">
+<sect2 id='Input_Focus_2'>
 <title>Input Focus</title>
 <para>
 Clients can request notification that they have the input focus by selecting
@@ -6323,15 +6269,13 @@ and actually have the input focus in one of their top-level windows
 Set the input field of WM_HINTS to
 <function>False</function>
 and have received a suitable event as described in
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>.
+<xref linkend='Input_Focus' xrefstyle='select: title'/>.
     </para>
   </listitem>
   <listitem>
     <para>
 Have received a WM_TAKE_FOCUS message as described in
-<link linkend="input_focus">
-<xref linkend="input_focus"></xref></link>.
+<xref linkend='Input_Focus' xrefstyle='select: title'/>.
     </para>
   </listitem>
 </itemizedlist>
@@ -6340,8 +6284,7 @@ Clients should not warp the pointer in an attempt to transfer the focus;
 they should set the focus and leave the pointer alone.
 For further information,
 see
-<link linkend="the_pointer">
-<xref linkend="the_pointer"></xref></link>.
+<xref linkend='The_Pointer' xrefstyle='select: title'/>.
 </para>
 <para>
 <!-- .LP -->
@@ -6422,7 +6365,7 @@ the revert-to field to
 
 </sect2>
 
-<sect2 id="clientmessage_events">
+<sect2 id='ClientMessage_Events'>
 <title>ClientMessage Events</title>
 <para>
 There is no way for clients to prevent themselves being sent
@@ -6434,8 +6377,7 @@ Top-level windows with a WM_PROTOCOLS property may be sent
 <function>ClientMessage</function>
 events specific to the protocols named by the atoms in the property
 (see
-<link linkend="wm_protocols_property">
-<xref linkend="wm_protocols_property"></xref></link>
+<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/>
 ).
 For all protocols, the
 <function>ClientMessage</function>
@@ -6508,7 +6450,7 @@ request with the following arguments:
   </tgroup>
 </informaltable>
 
-<sect3 id="window_deletion">
+<sect3 id='Window_Deletion'>
 <title>Window Deletion</title>
 <para>
 Clients, usually those with multiple top-level windows, whose server
@@ -6530,8 +6472,7 @@ and, if they decide to complete the deletion, should do the following:
   <listitem>
     <para>
 Either change the window's state to Withdrawn (as described in
-<link linkend="changing_window_state">
-<xref linkend="changing_window_state"></xref></link>
+<xref linkend='Changing_Window_State' xrefstyle='select: title'/>
 )
 or destroy the window.
     </para>
@@ -6573,7 +6514,7 @@ if the user asks for one of the client's top-level windows to be deleted.
 </sect3>
 </sect2>
 
-<sect2 id="redirecting_requests">
+<sect2 id='Redirecting_Requests'>
 <title>Redirecting Requests</title>
 <para>
 Normal clients can use the redirection mechanism just as window managers do
@@ -6655,19 +6596,17 @@ the client.
 </sect2>
 </sect1>
 
-<sect1 id="communication_with_the_window_manager_by_means_of_selections">
+<sect1 id='Communication_with_the_Window_Manager_by_Means_of_Selections'>
 <title>Communication with the Window Manager by Means of Selections</title>
 <para>
 For each screen they manage, window managers will acquire ownership of a
 selection named WM_S<emphasis remap='I'>n</emphasis>, where
 <emphasis remap='I'>n</emphasis> is the screen number, as
 described in
-<link linkend="discriminated_names">
-<xref linkend="discriminated_names"></xref></link>
+<xref linkend='Discriminated_Names' xrefstyle='select: title'/>
 Window managers should comply with the
 conventions for "Manager Selections" described in
-<link linkend="manager_selections">
-<xref linkend="manager_selections"></xref></link>.
+<xref linkend='Manager_Selections' xrefstyle='select: title'/>.
 The
 intent is for clients to be able to request a variety of information or
 services by issuing conversion requests on this selection.  Window managers
@@ -6713,7 +6652,7 @@ or later.
 </informaltable>
 </sect1>
 
-<sect1 id="summary_of_window_manager_property_types">
+<sect1 id='Summary_of_Window_Manager_Property_Types'>
 <title>Summary of Window Manager Property Types</title>
 <para>
 The window manager properties are summarized in the following table
@@ -6741,8 +6680,7 @@ The window manager properties are summarized in the following table
       <entry>STRING</entry>
       <entry>8</entry>
       <entry>
-<link linkend="wm_class_property">
-<xref linkend="wm_class_property"></xref></link>
+<xref linkend='WM_CLASS_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6750,8 +6688,7 @@ The window manager properties are summarized in the following table
       <entry>TEXT</entry>
       <entry></entry>
       <entry>
-<link linkend="wm_client_machine_property">
-<xref linkend="wm_client_machine_property"></xref></link>
+<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6759,8 +6696,7 @@ The window manager properties are summarized in the following table
       <entry>WINDOW</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_colormap_windows_property">
-<xref linkend="wm_colormap_windows_property"></xref></link>
+<xref linkend='WM_COLORMAP_WINDOWS_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6768,8 +6704,7 @@ The window manager properties are summarized in the following table
       <entry>WM_HINTS</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_hints_property">
-<xref linkend="wm_hints_property"></xref></link>
+<xref linkend='WM_HINTS_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6777,8 +6712,7 @@ The window manager properties are summarized in the following table
       <entry>TEXT</entry>
       <entry></entry>
       <entry>
-<link linkend="wm_icon_name_property">
-<xref linkend="wm_icon_name_property"></xref></link>
+<xref linkend='WM_ICON_NAME_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6786,8 +6720,7 @@ The window manager properties are summarized in the following table
       <entry>WM_ICON_SIZE</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_icon_size_property">
-<xref linkend="wm_icon_size_property"></xref></link>
+<xref linkend='WM_ICON_SIZE_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6795,8 +6728,7 @@ The window manager properties are summarized in the following table
       <entry>TEXT</entry>
       <entry></entry>
       <entry>
-<link linkend="wm_name_property">
-<xref linkend="wm_name_property"></xref></link>
+<xref linkend='WM_NAME_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6804,8 +6736,7 @@ The window manager properties are summarized in the following table
       <entry>WM_SIZE_HINTS</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_normal_hints_property">
-<xref linkend="wm_normal_hints_property"></xref></link>
+<xref linkend='WM_NORMAL_HINTS_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6813,8 +6744,7 @@ The window manager properties are summarized in the following table
       <entry>ATOM</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_protocols_property">
-<xref linkend="wm_protocols_property"></xref></link>
+<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6822,8 +6752,7 @@ The window manager properties are summarized in the following table
       <entry>WM_STATE</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_state_property">
-<xref linkend="wm_state_property"></xref></link>
+<xref linkend='WM_STATE_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -6831,8 +6760,7 @@ The window manager properties are summarized in the following table
       <entry>WINDOW</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_transient_for_property">
-<xref linkend="wm_transient_for_property"></xref></link>
+<xref linkend='WM_TRANSIENT_FOR_Property' xrefstyle='select: title'/>
       </entry>
     </row>
   </tbody>
@@ -6841,7 +6769,7 @@ The window manager properties are summarized in the following table
 </sect1>
 </chapter>
 
-<chapter id="session_management_and_additional_inter_Client_exchanges">
+<chapter id='Session_Management_and_Additional_Inter_Client_Exchanges'>
 <title>Session Management and Additional Inter-Client Exchanges</title>
 <para>
 This section contains some conventions for clients that participate in
@@ -6852,7 +6780,7 @@ expect their window state (e.g., WM_STATE, position, size, and stacking order)
 to be preserved across sessions.
 </para>
 
-<sect1 id="client_support_for_session_management">
+<sect1 id='Client_Support_for_Session_Management'>
 <title>Client Support for Session Management</title>
 <para>
 Each session participant will obtain a unique client identifier (client-ID)
@@ -6962,7 +6890,7 @@ Contain a string restricted to the XPCS characters, encoded in ISO 8859-1
 </itemizedlist>
 </sect1>
 
-<sect1 id="window_manager_support_for_session_management">
+<sect1 id='Window_Manager_Support_for_Session_Management'>
 <title>Window Manager Support for Session Management</title>
 <para>
 A window manager supporting session management must register with the
@@ -6977,7 +6905,7 @@ second checkpoint phase and save clients' state only during that phase.
 </para>
 </sect1>
 
-<sect1 id="support_for_ice_client_rendezvous">
+<sect1 id='Support_for_ICE_Client_Rendezvous'>
 <title>Support for ICE Client Rendezvous</title>
 <para>
 The Inter-Client Exchange protocol (ICE) defined as of X11R6
@@ -6996,7 +6924,7 @@ events.  Refer to that specification for complete details.
 </sect1>
 </chapter>
 
-<chapter id="manipulation_of_shared_resources">
+<chapter id='Manipulation_of_Shared_Resources'>
 <title>Manipulation of Shared Resources</title>
 <para>
 X Version 11 permits clients to manipulate a number of shared resources,
@@ -7004,7 +6932,7 @@ for example, the input focus, the pointer, and colormaps.
 Conventions are required so that clients share resources in an
 orderly fashion.
 </para>
-<sect1 id="the_input_focus">
+<sect1 id='The_Input_Focus'>
 <title>The Input Focus</title>
 <para>
 Clients that explicitly set the input focus must observe one of two modes:
@@ -7058,7 +6986,7 @@ request, not
 
 </sect1>
 
-<sect1 id="the_pointer">
+<sect1 id='The_Pointer'>
 <title>The Pointer</title>
 <para>
 In general, clients should not warp the pointer.
@@ -7089,7 +7017,7 @@ request set to one of their windows.
 </blockquote>
 </sect1>
 
-<sect1 id="grabs">
+<sect1 id='Grabs'>
 <title>Grabs</title>
 <para>
 A client's attempt to establish a button or a key grab on a window
@@ -7107,7 +7035,7 @@ the available keys and buttons.
 </para>
 
 <blockquote>
-<title> Convention</title>
+<title>Convention</title>
 <para>
 Window managers should ensure that they provide some mechanism for
 their clients to receive events from all keys and all buttons,
@@ -7220,11 +7148,10 @@ by which the user can send an event from any key or button to the client
 </itemizedlist>
 
 </sect1>
-<sect1 id="colormaps_2">
+<sect1 id='Colormaps_2'>
 <title>Colormaps</title>
 <para>
-<link linkend="colormaps">
-<xref linkend="colormaps"></xref></link>
+<xref linkend='Colormaps' xrefstyle='select: title'/>
 prescribes conventions for clients to communicate with the
 window manager about their colormap needs.  If your clients are
 <function>DirectColor</function>
@@ -7353,7 +7280,7 @@ if they use the root visual.
 </para>
 </sect1>
 
-<sect1 id="the_keyboard_mapping">
+<sect1 id='The_Keyboard_Mapping'>
 <title>The Keyboard Mapping</title>
 <para>
 The X server contains a table (which is read by
@@ -7447,7 +7374,7 @@ events should update any internal keycode translation tables they are using.
 
 </sect1>
 
-<sect1 id="the_modifier_mapping">
+<sect1 id='The_Modifier_Mapping'>
 <title>The Modifier Mapping</title>
 <para>
 X Version 11 supports 8 modifier bits of which 3 are preassigned
@@ -7589,7 +7516,7 @@ pair in these transactions atomic.
 </sect1>
 </chapter>
 
-<chapter id="device_color_characterization">
+<chapter id='Device_Color_Characterization'>
 <title>Device Color Characterization</title>
 <!-- .EQ -->
 <!--
@@ -7679,7 +7606,7 @@ If other device types are eventually necessary, additional
 properties will be required to describe them.
 </para>
 
-<sect1 id="xyz_rgb_conversion_matrices">
+<sect1 id='XYZ_lt_gt_RGB_Conversion_Matrices'>
 <title>XYZ &lt;-&gt; RGB Conversion Matrices</title>
 <para>
 Because of the limited dynamic range of both XYZ and RGB intensity,
@@ -7758,7 +7685,7 @@ This will be encoded as shown in the following table:
 </informaltable>
 </sect1>
 
-<sect1 id="intensity_da_rgb_value_conversion">
+<sect1 id='Intensity_dA_RGB_Value_Conversion'>
 <title>Intensity (dA RGB Value Conversion</title>
 <para>
 XDCCC provides two representations for describing the conversion
@@ -8099,7 +8026,7 @@ value/intensity values
 </sect1>
 </chapter>
 
-<chapter id="conclusion">
+<chapter id='Conclusion'>
 <title>Conclusion</title>
 <para>
 This document provides the protocol-level specification of the minimal
@@ -8114,7 +8041,7 @@ for information on session management, and to
 for information on general-purpose communication among clients.
 </para>
 
-<sect1 id="the_x_registry">
+<sect1 id='The_X_Registry'>
 <title>The X Registry</title>
 <!-- .IN "X Registry" -->
 <para>
@@ -8164,7 +8091,7 @@ and the postal address of where to write to obtain the document.
 This appendix describes the revision history of this document and
 summarizes the incompatibilities between this and earlier versions.
 </para>
-<sect1 id="the_x11r2_draft">
+<sect1 id='The_X11R2_Draft'>
 <title>The X11R2 Draft</title>
 <para>
 The February 25, 1988, draft that was distributed as part of X Version 11,
@@ -8178,7 +8105,7 @@ in the X11R2 draft would still work.
 </para>
 </sect1>
 
-<sect1 id="the_july_draft">
+<sect1 id='The_July_27_1988_Draft'>
 <title>The July 27, 1988, Draft</title>
 <para>
 The Consortium review was based on a draft dated July 27, 1988.  This draft
@@ -8254,7 +8181,7 @@ sets a short property.
 </itemizedlist>
 </sect1>
 
-<sect1 id="the_public_review_drafts">
+<sect1 id='The_Public_Review_Drafts'>
 <title>The Public Review Drafts</title>
 <para>
 The Consortium review resulted in several incompatible changes.  These
@@ -8331,7 +8258,7 @@ These are the only cases in which they would have worked, anyway.
 </itemizedlist>
 </sect1>
 
-<sect1 id="version_1.0_july_1989">
+<sect1 id='Version_10_July_1989'>
 <title>Version 1.0, July 1989</title>
 <para>
 The public review resulted in a set of mostly editorial changes.  The
@@ -8342,8 +8269,7 @@ the earlier drafts are:
   <listitem>
     <para>
 A new section (
-<link linkend="grabs">
-<xref linkend="grabs"></xref></link>
+<xref linkend='Grabs' xrefstyle='select: title'/>
 ) was added covering the window manager's
 use of Grabs.
 The restrictions it imposes should affect only window managers.
@@ -8429,7 +8355,7 @@ and the cases that would have worked will still work.
 </itemizedlist>
 </sect1>
 
-<sect1 id="version_1.1">
+<sect1 id='Version_11'>
 <title>Version 1.1</title>
 <para>
 Version 1.1 was released with X11R5 in September 1991.  In addition to some
@@ -8460,7 +8386,7 @@ Appropriate references to Compound Text were added.
 </itemizedlist>
 </sect1>
 
-<sect1 id="public_review_draft_december_1993">
+<sect1 id='Public_Review_Draft_December_1993'>
 <title>Public Review Draft, December 1993</title>
 <para>
 The following changes have been made in preparing the public review draft
@@ -8485,8 +8411,7 @@ top-level window has been added.
     <para>
 <!-- .bP -->
 [P06]
-<link linkend="colormaps">
-<xref linkend="colormaps"></xref></link>
+<xref linkend='Colormaps' xrefstyle='select: title'/>
 , on colormaps, has been rewritten.  A new feature that
 allows clients to install their own colormaps has also been added.
     </para>
@@ -8676,7 +8601,7 @@ Numerous editorial and typographical improvements have been made.
 </itemizedlist>
 </sect1>
 
-<sect1 id="version_2.0_april_1994">
+<sect1 id='Version_20_April_1994'>
 <title>Version 2.0, April 1994</title>
 <para>
 The following changes have been made in preparation for releasing
@@ -8815,7 +8740,7 @@ session management, see
 <emphasis remap='I'>X Session Management Protocol</emphasis>.
 </para>
 
-<sect1 id="properties">
+<sect1 id='Properties'>
 <title>Properties</title>
 <para>
 The client communicates with the session manager by placing two properties
@@ -8829,7 +8754,7 @@ on each top-level client window for use by session managers and other clients
 that need to be able to identify top-level client windows and their state.
 </para>
 
-<sect2 id="wm_command_property">
+<sect2 id='WM_COMMAND_Property'>
 <title>WM_COMMAND Property</title>
 <para>
 The WM_COMMAND property represents the command used to start or restart the
@@ -8880,17 +8805,16 @@ messages on other top-level windows but will otherwise be ignored.
 </para>
 </sect2>
 
-<sect2 id="wm_client_machine_property_2">
+<sect2 id='WM_CLIENT_MACHINE_Property_2'>
 <title>WM_CLIENT_MACHINE Property</title>
 <para>
 This property is described in
-<link linkend="wm_client_machine_property">
-<xref linkend="wm_client_machine_property"></xref></link>.
+<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>.
 </para>
 </sect2>
 </sect1>
 
-<sect1 id="termination">
+<sect1 id='Termination'>
 <title>Termination</title>
 <para>
 Because they communicate by means of unreliable network connections, clients
@@ -8908,7 +8832,7 @@ question, and it will not be revived if the session is revived.
 </para>
 </sect1>
 
-<sect1 id="client_responses_to_session_manager_actions">
+<sect1 id='Client_Responses_to_Session_Manager_Actions'>
 <title>Client Responses to Session Manager Actions</title>
 <para>
 Clients may need to respond to session manager actions in two ways:
@@ -8928,7 +8852,7 @@ Deleting a window
   </listitem>
 </itemizedlist>
 
-<sect2 id="saving_client_state">
+<sect2 id='Saving_Client_State'>
 <title>Saving Client State</title>
 <para>
 Clients that want to be warned when the session manager feels
@@ -8939,8 +8863,7 @@ in the WM_SAVE_YOURSELF protocol.
 They will receive a
 <function>ClientMessage</function>
 event as described in
-<link linkend="clientmessage_events">
-<xref linkend="clientmessage_events"></xref></link>
+<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>
 with the atom WM_SAVE_YOURSELF in its data[0] field.
 </para>
 
@@ -9027,18 +8950,17 @@ with the X Consortium.
 </para>
 </sect2>
 
-<sect2 id="window_deletion_2">
+<sect2 id='Window_Deletion_2'>
 <title>Window Deletion</title>
 <para>
 Windows are deleted using the WM_DELETE_WINDOW protocol, which
 is described in
-<link linkend="window_deletion">
-<xref linkend="window_deletion"></xref></link>.
+<xref linkend='Window_Deletion' xrefstyle='select: title'/>.
 </para>
 </sect2>
 </sect1>
 
-<sect1 id="summary_of_session_manager_property_types">
+<sect1 id='Summary_of_Session_Manager_Property_Types'>
 <title>Summary of Session Manager Property Types</title>
 <para>
 The session manager properties are listed in the following table:
@@ -9064,8 +8986,7 @@ The session manager properties are listed in the following table:
       <entry>TEXT</entry>
       <entry></entry>
       <entry>
-<link linkend="wm_client_machine_property">
-<xref linkend="wm_client_machine_property"></xref></link>
+<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -9073,8 +8994,7 @@ The session manager properties are listed in the following table:
       <entry>TEXT</entry>
       <entry></entry>
       <entry>
-<link linkend="wm_command_property">
-<xref linkend="wm_command_property"></xref></link>
+<xref linkend='WM_COMMAND_Property' xrefstyle='select: title'/>
       </entry>
     </row>
     <row rowsep="0">
@@ -9082,8 +9002,7 @@ The session manager properties are listed in the following table:
       <entry>WM_STATE</entry>
       <entry>32</entry>
       <entry>
-<link linkend="wm_state_property">
-<xref linkend="wm_state_property"></xref></link>
+<xref linkend='WM_STATE_Property' xrefstyle='select: title'/>
       </entry>
     </row>
   </tbody>
diff --git a/specs/XLFD/xlfd.xml b/specs/XLFD/xlfd.xml
index c91ea54..d12222a 100644
--- a/specs/XLFD/xlfd.xml
+++ b/specs/XLFD/xlfd.xml
@@ -97,7 +97,7 @@ Stone is a registered trademark of Adobe Systems Inc.
 
 
 </bookinfo>
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 <!-- .XS -->
 <!-- (SN Introduction -->
@@ -151,7 +151,7 @@ recommended leading, word-space values, and so on.
 </para>
 </chapter>
 
-<chapter id="requirements_and_goals">
+<chapter id='Requirements_and_Goals'>
 <title>Requirements and Goals</title>
 <!-- .XS -->
 <!-- (SN Requirements and Goals -->
@@ -199,7 +199,7 @@ Is extensible
   </listitem>
 </itemizedlist>
 
-<sect1 id="provide_unique_and_descriptive_font_names">
+<sect1 id='Provide_Unique_and_Descriptive_Font_Names'>
 <title>Provide Unique and Descriptive Font Names</title>
 <!-- .XS -->
 <!-- (SN Provide Unique and Descriptive Font Names -->
@@ -219,7 +219,7 @@ some subset of all possible fonts in the server.
 </para>
 </sect1>
 
-<sect1 id="support_multiple_font_vendors_and_character_sets">
+<sect1 id='Support_Multiple_Font_Vendors_and_Character_Sets'>
 <title>Support Multiple Font Vendors and Character Sets</title>
 <!-- .XS -->
 <!-- (SN Support Multiple Font Vendors and Character Sets -->
@@ -245,7 +245,7 @@ in server environments where multiple charsets are supported.
 </para>
 </sect1>
 
-<sect1 id="support_scalable_and_polymorphic_fonts">
+<sect1 id='Support_Scalable_and_Polymorphic_Fonts'>
 <title>Support Scalable and Polymorphic Fonts</title>
 <!-- .XS -->
 <!-- (SN Support Scalable and Polymorphic Fonts -->
@@ -260,7 +260,7 @@ instance.
 </para>
 </sect1>
 
-<sect1 id="support_transformations_and_subsetting_of_fonts">
+<sect1 id='Support_Transformations_and_Subsetting_of_Fonts'>
 <title>Support Transformations and Subsetting of Fonts</title>
 <!-- .XS -->
 <!-- (SN Support Transformations and Subsetting of Fonts -->
@@ -275,7 +275,7 @@ request only a few characters from a font for efficiency.
 </para>
 </sect1>
 
-<sect1 id="be_independent_of_x_server_and_operating_or_file_system_implementations">
+<sect1 id='Be_Independent_of_X_Server_and_Operating_or_File_System_Implementations'>
 <title>Be Independent of X Server and Operating or File System Implementations</title>
 <!-- .XS -->
 <!-- (SN Be Independent of X Server and Operating or File System Implementations -->
@@ -294,7 +294,7 @@ implementation dependent).
 </para>
 </sect1>
 
-<sect1 id="support_arbitrarily_complex_font_matching_and_substitution">
+<sect1 id='Support_Arbitrarily_Complex_Font_Matching_and_Substitution'>
 <title>Support Arbitrarily Complex Font Matching and Substitution</title>
 <!-- .XS -->
 <!-- (SN Support Arbitrarily Complex Font Matching and Substitution -->
@@ -310,7 +310,7 @@ when asked to handle potentially unknown fonts, as required.
 </para>
 </sect1>
 
-<sect1 id="be_extensible">
+<sect1 id='Be_Extensible'>
 <title>Be Extensible</title>
 <!-- .XS -->
 <!-- (SN Be Extensible -->
@@ -324,7 +324,7 @@ X client or server implementations obsolete.
 </sect1>
 </chapter>
 
-<chapter id="x_logical_font_description">
+<chapter id='X_Logical_Font_Description'>
 <title>X Logical Font Description</title>
 <!-- .XS -->
 <!-- (SN X Logical Font Description -->
@@ -366,7 +366,7 @@ may also appear as items of the
 <function>STARTPROPERTIES</function>...<function>ENDPROPERTIES</function>list
 in the BDF V2.1 specification. <!-- xref -->
 </para>
-<sect1 id="fontname">
+<sect1 id='FontName'>
 <title>FontName</title>
 <!-- .XS -->
 <!-- (SN FontName -->
@@ -425,7 +425,7 @@ numeric property values are represented as signed or unsigned integers,
 as appropriate.
 </para>
 
-<sect2 id="fontname_syntax">
+<sect2 id='FontName_Syntax'>
 <title>FontName Syntax</title>
 <!-- .XS -->
 <!-- (SN FontName Syntax -->
@@ -539,7 +539,7 @@ FAMILY_NAME.
 </para>
 </sect2>
 
-<sect2 id="fontname_field_definitions">
+<sect2 id='FontName_Field_Definitions'>
 <title>FontName Field Definitions</title>
 <!-- .XS -->
 <!-- (SN FontName Field Definitions -->
@@ -612,7 +612,7 @@ CHARSET_REGISTRY and CHARSET_ENCODING fields
   </listitem>
 </itemizedlist>
 
-<sect3 id="foundry_field">
+<sect3 id='FOUNDRY_Field'>
 <title>FOUNDRY Field</title>
 <!-- .XS -->
 <!-- (SN FOUNDRY Field -->
@@ -655,7 +655,7 @@ a registry of such registered names for use in XLFD font names and properties.
 </para>
 </sect3>
 
-<sect3 id="family_name_field">
+<sect3 id='FAMILY_NAME_Field'>
 <title>FAMILY_NAME Field</title>
 <!-- .XS -->
 <!-- (SN FAMILY_NAME Field -->
@@ -718,7 +718,7 @@ Stone
 </itemizedlist>
 </sect3>
 
-<sect3 id="weight_name_field">
+<sect3 id='WEIGHT_NAME_Field'>
 <title>WEIGHT_NAME Field</title>
 <!-- .XS -->
 <!-- (SN WEIGHT_NAME Field -->
@@ -730,7 +730,7 @@ that is, the nominal blackness of the font,
 according to the FOUNDRY's judgment.
 This name must be human-understandable and suitable for presentation to a
 font user.
-The value "0" is used to indicate a polymorphic font (see <xref linkend="polymorphic_fonts"/>).
+The value "0" is used to indicate a polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>).
 </para>
 <para>
 <!-- .LP -->
@@ -752,7 +752,7 @@ and the calculated weight, respectively.
 </para>
 </sect3>
 
-<sect3 id="slant_field">
+<sect3 id='SLANT_Field'>
 <title>SLANT Field</title>
 <!-- .XS -->
 <!-- (SN SLANT Field -->
@@ -810,7 +810,7 @@ The encoding is as follows:
     <row rowsep="0">
       <entry>numeric</entry>
       <entry>Polymorphic</entry>
-      <entry>See <xref linkend="polymorphic_fonts"/>.</entry>
+      <entry>See <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>.</entry>
     </row>
   </tbody>
   </tgroup>
@@ -823,7 +823,7 @@ presented to a user.
 </para>
 </sect3>
 
-<sect3 id="setwidth_name_field">
+<sect3 id='SETWIDTH_NAME_Field'>
 <title>SETWIDTH_NAME Field</title>
 <!-- .XS -->
 <!-- (SN SETWIDTH_NAME Field -->
@@ -833,7 +833,7 @@ presented to a user.
 SETWIDTH_NAME is a string that gives the font's typographic
 proportionate width, that is, the nominal width per horizontal unit of the
 font, according to the FOUNDRY's judgment.
-The value "0" is used to indicate a polymorphic font (see <xref linkend="polymorphic_fonts"/>).
+The value "0" is used to indicate a polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>).
 </para>
 <para>
 <!-- .LP -->
@@ -875,7 +875,7 @@ Double Wide
 </itemizedlist>
 </sect3>
 
-<sect3 id="add_style_name_field">
+<sect3 id='ADD_STYLE_NAME_Field'>
 <title>ADD_STYLE_NAME Field</title>
 <!-- .XS -->
 <!-- (SN ADD_STYLE_NAME Field -->
@@ -886,7 +886,7 @@ ADD_STYLE_NAME is a string that identifies additional typographic
 style information that is not captured by other fields but is needed
 to identify the particular font.
 The character "[" anywhere in the field is used to indicate a
-polymorphic font (see <xref linkend="polymorphic_fonts"/>).
+polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>).
 </para>
 <para>
 <!-- .LP -->
@@ -922,7 +922,7 @@ Decorated
 </itemizedlist>
 </sect3>
 
-<sect3 id="pixel_size_field">
+<sect3 id='PIXEL_SIZE_Field'>
 <title>PIXEL_SIZE Field</title>
 <!-- .XS -->
 <!-- (SN PIXEL_SIZE Field -->
@@ -934,12 +934,12 @@ gives the body size of the font at a particular
 POINT_SIZE and RESOLUTION_Y.
 PIXEL_SIZE is either an integer-string or a string beginning
 with "[".  A string beginning with "[" represents a matrix
-(see <xref linkend="matrix_transformations"/>).
+(see <xref linkend='Matrix_Transformations' xrefstyle='select: title'/>).
 PIXEL_SIZE usually incorporates additional vertical spacing
 that is considered part of the font design.
 (Note, however, that this value is not necessarily equivalent to the height
 of the font bounding box.)
-Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>).
+Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>).
 </para>
 <para>
 <!-- .LP -->
@@ -950,7 +950,7 @@ for which the font was designed.
 </para>
 </sect3>
 
-<sect3 id="point_size_field">
+<sect3 id='SN_POINT_SIZE_Field'>
 <title>SN POINT_SIZE Field</title>
 <!-- .XS -->
 <!-- (SN POINT_SIZE Field -->
@@ -961,14 +961,14 @@ POINT_SIZE gives the body size
 for which the font was designed.
 POINT_SIZE is either an integer-string or a string beginning
 with "[".  A string beginning with "[" represents a matrix
-(see <xref linkend="matrix_transformations"/>).
+(see <xref linkend='Matrix_Transformations' xrefstyle='select: title'/>).
 This field usually incorporates additional vertical spacing
 that is considered part of the font design.
 (Note, however, that POINT_SIZE is not necessarily equivalent to the height
 of the font bounding box.)
 POINT_SIZE is expressed in decipoints (where points are as defined
 in the X protocol or 72.27 points equal 1 inch).
-Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>).
+Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>).
 </para>
 <para>
 <!-- .LP -->
@@ -978,7 +978,7 @@ size on the display regardless of the PIXEL_SIZE used for the font.
 </para>
 </sect3>
 
-<sect3 id="resolution_x_and_resolution_y_fields">
+<sect3 id='RESOLUTION_X_and_RESOLUTION_Y_Fields'>
 <title>RESOLUTION_X and RESOLUTION_Y Fields</title>
 <!-- .XS -->
 <!-- (SN RESOLUTION_X and RESOLUTION_Y Fields -->
@@ -989,7 +989,7 @@ RESOLUTION_X and RESOLUTION_Y are unsigned integer-strings that give
 the horizontal and vertical resolution,
 measured in pixels or dots per inch (dpi),
 for which the font was designed.
-Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>).
+Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>).
 Horizontal and vertical values are required
 because a separate bitmap font must be designed
 for displays with very different aspect ratios
@@ -1012,7 +1012,7 @@ and display sizes or for other typographic considerations.
 </para>
 </sect3>
 
-<sect3 id="spacing_field">
+<sect3 id='SPACING_Field'>
 <title>SPACING Field</title>
 <!-- .XS -->
 <!-- (SN SPACING Field -->
@@ -1082,7 +1082,7 @@ The cell height = font-descent + font-ascent, and the width = AVERAGE_WIDTH.
 </informaltable>
 </sect3>
 
-<sect3 id="average_width_field">
+<sect3 id='AVERAGE_WIDTH_Field'>
 <title>AVERAGE_WIDTH Field</title>
 <!-- .XS -->
 <!-- (SN AVERAGE_WIDTH Field -->
@@ -1097,11 +1097,11 @@ writing direction for the font is right-to-left.
 A leading "~" (TILDE) indicates a negative value.
 For monospaced and character cell fonts,
 this is the width of all glyphs in the font.
-Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>).
+Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>).
 </para>
 </sect3>
 
-<sect3 id="charset_registry_and_charset_encoding_fields">
+<sect3 id='CHARSET_REGISTRY_and_CHARSET_ENCODING_Fields'>
 <title>CHARSET_REGISTRY and CHARSET_ENCODING Fields</title>
 <!-- .XS -->
 <!-- (SN CHARSET_REGISTRY and CHARSET_ENCODING Fields -->
@@ -1311,7 +1311,7 @@ tells the font source that the client is interested only in characters
 </sect3>
 </sect2>
 
-<sect2 id="examples">
+<sect2 id='Examples'>
 <title>Examples</title>
 <!-- .XS -->
 <!-- (SN Examples -->
@@ -1423,7 +1423,7 @@ shipped with the X Consortium distribution.
 </sect2>
 </sect1>
 
-<sect1 id="font_properties">
+<sect1 id='Font_Properties'>
 <title>Font Properties</title>
 <!-- .XS -->
 <!-- (SN Font Properties -->
@@ -1515,7 +1515,7 @@ AXIS_TYPES</entry>
   </tgroup>
 </informaltable>
 
-<sect2 id="foundry">
+<sect2 id='FOUNDRY'>
 <title>FOUNDRY</title>
 <!-- .XS -->
 <!-- (SN FOUNDRY -->
@@ -1532,7 +1532,7 @@ FOUNDRY cannot be calculated or defaulted if not supplied as a font property.
 </para>
 </sect2>
 
-<sect2 id="family_name">
+<sect2 id='FAMILY_NAME'>
 <title>FAMILY_NAME</title>
 <!-- .XS -->
 <!-- (SN FAMILY_NAME -->
@@ -1550,7 +1550,7 @@ property.
 </para>
 </sect2>
 
-<sect2 id="weight_name ">
+<sect2 id='WEIGHT_NAME'>
 <title>WEIGHT_NAME</title>
 <!-- .XS -->
 <!-- (SN WEIGHT_NAME -->
@@ -1572,8 +1572,8 @@ if (WEIGHT_NAME undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="slant">
-<title>SLANT </title>
+<sect2 id='SLANT'>
+<title>SLANT</title>
 <!-- .XS -->
 <!-- (SN SLANT -->
 <!-- .XE -->
@@ -1594,7 +1594,7 @@ if (SLANT undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="setwidth_name">
+<sect2 id='SETWIDTH_NAME'>
 <title>SETWIDTH_NAME</title>
 <!-- .XS -->
 <!-- (SN SETWIDTH_NAME -->
@@ -1616,7 +1616,7 @@ if (SETWIDTH_NAME undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="add_style_name">
+<sect2 id='ADD_STYLE_NAME'>
 <title>ADD_STYLE_NAME</title>
 <!-- .XS -->
 <!-- (SN ADD_STYLE_NAME -->
@@ -1638,7 +1638,7 @@ if (ADD_STYLE_NAME undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="pixel_size">
+<sect2 id='PIXEL_SIZE'>
 <title>PIXEL_SIZE</title>
 <!-- .XS -->
 <!-- (SN PIXEL_SIZE -->
@@ -1690,7 +1690,7 @@ if (PIXEL_SIZE undefined) then
 
 </sect2>
 
-<sect2 id="point_size">
+<sect2 id='POINT_SIZE'>
 <title>POINT_SIZE</title>
 <!-- .XS -->
 <!-- (SN POINT_SIZE -->
@@ -1718,7 +1718,7 @@ Design POINT_SIZE cannot be calculated or approximated.
 </para>
 </sect2>
 
-<sect2 id="resolution_x">
+<sect2 id='RESOLUTION_X_x'>
 <title>RESOLUTION_X</title>
 <!-- .XS -->
 <!-- (SN RESOLUTION_X -->
@@ -1735,7 +1735,7 @@ RESOLUTION_X cannot be calculated or approximated.
 </para>
 </sect2>
 
-<sect2 id="resolution_y">
+<sect2 id='RESOLUTION_Y_y'>
 <title>RESOLUTION_Y</title>
 <!-- .XS -->
 <!-- (SN RESOLUTION_Y -->
@@ -1752,7 +1752,7 @@ RESOLUTION_X cannot be calculated or approximated.
 </para>
 </sect2>
 
-<sect2 id="spacing">
+<sect2 id='SPACING'>
 <title>SPACING</title>
 <!-- .XS -->
 <!-- (SN SPACING -->
@@ -1771,7 +1771,7 @@ according to the definitions given above for the
 </para>
 </sect2>
 
-<sect2 id="average_width">
+<sect2 id='AVERAGE_WIDTH'>
 <title>AVERAGE_WIDTH</title>
 <!-- .XS -->
 <!-- (SN AVERAGE_WIDTH -->
@@ -1811,7 +1811,7 @@ if (SPACING not proportional) then
 </literallayout>
 </sect2>
 
-<sect2 id="charset_registry">
+<sect2 id='CHARSET_REGISTRY'>
 <title>CHARSET_REGISTRY</title>
 <!-- .XS -->
 <!-- (SN CHARSET_REGISTRY -->
@@ -1828,7 +1828,7 @@ CHARSET_REGISTRY cannot be defaulted if not supplied as a font property.
 </para>
 </sect2>
 
-<sect2 id="charset_encoding">
+<sect2 id='CHARSET_ENCODING'>
 <title>CHARSET_ENCODING</title>
 <!-- .XS -->
 <!-- (SN CHARSET_ENCODING -->
@@ -1845,7 +1845,7 @@ CHARSET_ENCODING cannot be defaulted if not supplied as a font property.
 </para>
 </sect2>
 
-<sect2 id="min_space">
+<sect2 id='MIN_SPACE'>
 <title>MIN_SPACE</title>
 <!-- .XS -->
 <!-- (SN MIN_SPACE -->
@@ -1867,7 +1867,7 @@ if (MIN_SPACE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="norm_space">
+<sect2 id='NORM_SPACE'>
 <title>NORM_SPACE</title>
 <!-- .XS -->
 <!-- (SN NORM_SPACE -->
@@ -1892,7 +1892,7 @@ if (NORM_SPACE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="max_space">
+<sect2 id='MAX_SPACE'>
 <title>MAX_SPACE</title>
 <!-- .XS -->
 <!-- (SN MAX_SPACE -->
@@ -1914,7 +1914,7 @@ if (MAX_SPACE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="end_space">
+<sect2 id='END_SPACE'>
 <title>END_SPACE</title>
 <!-- .XS -->
 <!-- (SN END_SPACE -->
@@ -1936,7 +1936,7 @@ if (END_SPACE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="avg_capital_width">
+<sect2 id='AVG_CAPITAL_WIDTH'>
 <title>AVG_CAPITAL_WIDTH</title>
 <!-- .XS -->
 <!-- (SN AVG_CAPITAL_WIDTH -->
@@ -1969,7 +1969,7 @@ if (AVG_CAPITAL_WIDTH undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="avg_lowercase_width">
+<sect2 id='AVG_LOWERCASE_WIDTH'>
 <title>AVG_LOWERCASE_WIDTH</title>
 <!-- .XS -->
 <!-- (SN AVG_LOWERCASE_WIDTH -->
@@ -2002,7 +2002,7 @@ if (AVG_LOWERCASE_WIDTH undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="quad_width">
+<sect2 id='QUAD_WIDTH'>
 <title>QUAD_WIDTH</title>
 <!-- .XS -->
 <!-- (SN QUAD_WIDTH -->
@@ -2029,7 +2029,7 @@ the FIGURE_WIDTH or one of the average character width font properties
 <!-- .NE -->
 </sect2>
 
-<sect2 id="figure_width">
+<sect2 id='FIGURE_WIDTH'>
 <title>FIGURE_WIDTH</title>
 <!-- .XS -->
 <!-- (SN FIGURE_WIDTH -->
@@ -2054,7 +2054,7 @@ else FIGURE_WIDTH property undefined
 </literallayout>
 </sect2>
 
-<sect2 id="superscript_x">
+<sect2 id='SUPERSCRIPT_X_x'>
 <title>SUPERSCRIPT_X</title>
 <!-- .XS -->
 <!-- (SN SUPERSCRIPT_X -->
@@ -2087,7 +2087,7 @@ its argument, which is in 1/64 degrees.
 </para>
 </sect2>
 
-<sect2 id="superscript_y">
+<sect2 id='SUPERSCRIPT_Y_y'>
 <title>SUPERSCRIPT_Y</title>
 <!-- .XS -->
 <!-- (SN SUPERSCRIPT_Y -->
@@ -2111,7 +2111,7 @@ if (SUPERSCRIPT_Y undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="subscript_x">
+<sect2 id='SUBSCRIPT_X_x'>
 <title>SUBSCRIPT_X</title>
 <!-- .XS -->
 <!-- (SN SUBSCRIPT_X -->
@@ -2138,7 +2138,7 @@ if (SUBSCRIPT_X undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="subscript_y">
+<sect2 id='SUBSCRIPT_Y_y'>
 <title>SUBSCRIPT_Y</title>
 <!-- .XS -->
 <!-- (SN SUBSCRIPT_Y -->
@@ -2163,7 +2163,7 @@ if (SUBSCRIPT_Y undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="superscript_size">
+<sect2 id='SUPERSCRIPT_SIZE'>
 <title>SUPERSCRIPT_SIZE</title>
 <!-- .XS -->
 <!-- (SN SUPERSCRIPT_SIZE -->
@@ -2189,7 +2189,7 @@ if (SUPERSCRIPT_SIZE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="subscript_size">
+<sect2 id='SUBSCRIPT_SIZE'>
 <title>SUBSCRIPT_SIZE</title>
 <!-- .XS -->
 <!-- (SN SUBSCRIPT_SIZE -->
@@ -2216,7 +2216,7 @@ if (SUBSCRIPT_SIZE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="small_cap_size">
+<sect2 id='SMALL_CAP_SIZE'>
 <title>SMALL_CAP_SIZE</title>
 <!-- .XS -->
 <!-- (SN SMALL_CAP_SIZE -->
@@ -2243,8 +2243,8 @@ if (SMALL_CAP_SIZE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="underline_position">
-<title>UNDERLINE_POSITION </title>
+<sect2 id='UNDERLINE_POSITION'>
+<title>UNDERLINE_POSITION</title>
 <!-- .XS -->
 <!-- (SN UNDERLINE_POSITION -->
 <!-- .XE -->
@@ -2273,7 +2273,7 @@ in pixels of any glyph in the font.
 </para>
 </sect2>
 
-<sect2 id="underline_thickness">
+<sect2 id='UNDERLINE_THICKNESS'>
 <title>UNDERLINE_THICKNESS</title>
 <!-- .XS -->
 <!-- (SN UNDERLINE_THICKNESS -->
@@ -2296,7 +2296,7 @@ if (UNDERLINE_THICKNESS undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="strikeout_ascent">
+<sect2 id='STRIKEOUT_ASCENT'>
 <title>STRIKEOUT_ASCENT</title>
 <!-- .XS -->
 <!-- (SN STRIKEOUT_ASCENT -->
@@ -2326,7 +2326,7 @@ in pixels of any glyph in the font.
 </para>
 </sect2>
 
-<sect2 id="strikeout_descent">
+<sect2 id='STRIKEOUT_DESCENT'>
 <title>STRIKEOUT_DESCENT</title>
 <!-- .XS -->
 <!-- (SN STRIKEOUT_DESCENT -->
@@ -2358,7 +2358,7 @@ in pixels of any glyph in the font.
 </para>
 </sect2>
 
-<sect2 id="italic_angle">
+<sect2 id='ITALIC_ANGLE'>
 <title>ITALIC_ANGLE</title>
 <!-- .XS -->
 <!-- (SN ITALIC_ANGLE -->
@@ -2380,7 +2380,7 @@ if (ITALIC_ANGLE undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="cap_height">
+<sect2 id='CAP_HEIGHT'>
 <title>CAP_HEIGHT</title>
 <!-- .XS -->
 <!-- (SN CAP_HEIGHT -->
@@ -2415,7 +2415,7 @@ if (CAP_HEIGHT undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="x_height">
+<sect2 id='X_HEIGHT'>
 <title>X_HEIGHT</title>
 <!-- .XS -->
 <!-- (SN X_HEIGHT -->
@@ -2451,7 +2451,7 @@ if (X_HEIGHT undefined) then
 </literallayout>
 </sect2>
 
-<sect2 id="relative_setwidth">
+<sect2 id='RELATIVE_SETWIDTH'>
 <title>RELATIVE_SETWIDTH</title>
 <!-- .XS -->
 <!-- (SN RELATIVE_SETWIDTH -->
@@ -2566,7 +2566,7 @@ calculated setwidth.
 </para>
 </sect2>
 
-<sect2 id="relative_weight">
+<sect2 id='RELATIVE_WEIGHT'>
 <title>RELATIVE_WEIGHT</title>
 <!-- .XS -->
 <!-- (SN RELATIVE_WEIGHT -->
@@ -2667,7 +2667,7 @@ linear function of the font's weight axis.
 </para>
 </sect2>
 
-<sect2 id="weight">
+<sect2 id='WEIGHT'>
 <title>WEIGHT</title>
 <!-- .XS -->
 <!-- (SN WEIGHT -->
@@ -2702,7 +2702,7 @@ the weight across all fonts and all font vendors.
 </para>
 </sect2>
 
-<sect2 id="resolution">
+<sect2 id='RESOLUTION'>
 <title>RESOLUTION</title>
 <!-- .XS -->
 <!-- (SN RESOLUTION  -->
@@ -2727,7 +2727,7 @@ as required.
 </para></note>
 </sect2>
 
-<sect2 id="font">
+<sect2 id='Font_support'>
 <title>FONT</title>
 <!-- .XS -->
 <!-- (SN FONT -->
@@ -2744,7 +2744,7 @@ If not provided, the FONT property cannot be calculated.
 </para>
 </sect2>
 
-<sect2 id="face_name">
+<sect2 id='FACE_NAME'>
 <title>FACE_NAME</title>
 <!-- .XS -->
 <!-- (SN FACE_NAME -->
@@ -2764,7 +2764,7 @@ property.
 </para>
 </sect2>
 
-<sect2 id="full_name">
+<sect2 id='FULL_NAME'>
 <title>FULL_NAME</title>
 <!-- .XS -->
 <!-- (SN FULL_NAME -->
@@ -2776,7 +2776,7 @@ Its use is deprecated, but it is found on some old fonts.
 </para>
 </sect2>
 
-<sect2 id="copyright">
+<sect2 id='COPYRIGHT'>
 <title>COPYRIGHT</title>
 <!-- .XS -->
 <!-- (SN COPYRIGHT -->
@@ -2801,7 +2801,7 @@ property.
 </para>
 </sect2>
 
-<sect2 id="notice">
+<sect2 id='NOTICE'>
 <title>NOTICE</title>
 <!-- .XS -->
 <!-- (SN NOTICE -->
@@ -2829,7 +2829,7 @@ a font property.
 </para>
 </sect2>
 
-<sect2 id="destination">
+<sect2 id='DESTINATION'>
 <title>DESTINATION</title>
 <!-- .XS -->
 <!-- (SN DESTINATION -->
@@ -2889,7 +2889,7 @@ The font is optimized for screen legibility and readability.
 </informaltable>
 </sect2>
 
-<sect2 id="font_type">
+<sect2 id='FONT_TYPE'>
 <title>FONT_TYPE</title>
 <!-- .XS -->
 <!-- (SN FONT_TYPE -->
@@ -2958,7 +2958,7 @@ Other values may be registered with the X Consortium.
 </para>
 </sect2>
 
-<sect2 id="font_version">
+<sect2 id='FONT_VERSION'>
 <title>FONT_VERSION</title>
 <!-- .XS -->
 <!-- (SN FONT_VERSION -->
@@ -2971,7 +2971,7 @@ that describes the formal or informal version of the font.
 </para>
 </sect2>
 
-<sect2 id="rasterizer_name">
+<sect2 id='RASTERIZER_NAME'>
 <title>RASTERIZER_NAME</title>
 <!-- .XS -->
 <!-- (SN RASTERIZER_NAME -->
@@ -3040,7 +3040,7 @@ rasterization operation has been applied to the FONT_TYPE.
 </para>
 </sect2>
 
-<sect2 id="rasterizer_version">
+<sect2 id='RASTERIZER_VERSION'>
 <title>RASTERIZER_VERSION</title>
 <!-- .XS -->
 <!-- (SN RASTERIZER_VERSION -->
@@ -3055,7 +3055,7 @@ product version number known to users, when applicable.
 </para>
 </sect2>
 
-<sect2 id="raw_ascent">
+<sect2 id='RAW_ASCENT'>
 <title>RAW_ASCENT</title>
 <!-- .XS -->
 <!-- (SN RAW_ASCENT -->
@@ -3064,11 +3064,11 @@ product version number known to users, when applicable.
 <!-- .LP -->
 For a font with a transformation matrix, RAW_ASCENT is the font ascent
 in 1000 pixel metrics
-(see <xref linkend="metrics_and_font_properties"/>).
+(see <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title'/>).
 </para>
 </sect2>
 
-<sect2 id="raw_descent">
+<sect2 id='RAW_DESCENT'>
 <title>RAW_DESCENT</title>
 <!-- .XS -->
 <!-- (SN RAW_DESCENT -->
@@ -3077,11 +3077,11 @@ in 1000 pixel metrics
 <!-- .LP -->
 For a font with a transformation matrix, RAW_DESCENT is the font
 descent in 1000 pixel metrics
-(see <xref linkend="metrics_and_font_properties"/>).
+(see <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title'/>).
 </para>
 </sect2>
 
-<sect2 id="raw_">
+<sect2 id='RAW_'>
 <title>RAW_*</title>
 <!-- .XS -->
 <!-- (SN RAW_* -->
@@ -3092,11 +3092,11 @@ For a font with a transformation matrix,
 all font properties that represent horizontal or vertical sizes or
 displacements will be accompanied by a new property, named as the
 original except prefixed with "RAW_", that is computed as
-described in <xref linkend="metrics_and_font_properties" />.
+described in <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title' />.
 </para>
 </sect2>
 
-<sect2 id="axis_names">
+<sect2 id='AXIS_NAMES'>
 <title>AXIS_NAMES</title>
 <!-- .XS -->
 <!-- (SN AXIS_NAMES -->
@@ -3110,7 +3110,7 @@ These names are suitable for presentation in a user interface
 </para>
 </sect2>
 
-<sect2 id="axis_limits">
+<sect2 id='AXIS_LIMITS'>
 <title>AXIS_LIMITS</title>
 <!-- .XS -->
 <!-- (SN AXIS_LIMITS -->
@@ -3120,11 +3120,11 @@ These names are suitable for presentation in a user interface
 AXIS_LIMITS is a list of integers, two for each axis,
 giving the minimum and maximum allowable values for that axis of a
 polymorphic font
-(see <xref linkend="polymorphic_fonts"/>).
+(see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>).
 </para>
 </sect2>
 
-<sect2 id="axis_types">
+<sect2 id='AXIS_TYPES'>
 <title>AXIS_TYPES</title>
 <!-- .XS -->
 <!-- (SN AXIS_TYPES -->
@@ -3138,7 +3138,7 @@ but can be registered as having specific semantics
 </sect2>
 </sect1>
 
-<sect1 id="built-in_font_property_atoms">
+<sect1 id='Built_in_Font_Property_Atoms'>
 <title>Built-in Font Property Atoms</title>
 <!-- .XS -->
 <!-- (SN Built-in Font Property Atoms -->
@@ -3263,7 +3263,7 @@ version of the core protocol:
 </sect1>
 </chapter>
 
-<chapter id="matrix_transformations">
+<chapter id='Matrix_Transformations'>
 <title>Matrix Transformations</title>
 <!-- .XS -->
 <!-- (SN Matrix Transformations -->
@@ -3423,7 +3423,7 @@ wildcarded), the preceding formulas can be used to compute one from the
 other.
 </para>
 
-<sect1 id="metrics_and_font_properties">
+<sect1 id='Metrics_and_Font_Properties'>
 <title>Metrics and Font Properties</title>
 <!-- .XS -->
 <!-- (SN Metrics and Font Properties -->
@@ -3514,7 +3514,7 @@ the value of the width, height, or displacement in 1000 pixel metrics.
 </sect1>
 </chapter>
 
-<chapter id="scalable_fonts">
+<chapter id='Scalable_Fonts'>
 <title>Scalable Fonts</title>
 <!-- .XS -->
 <!-- (SN Scalable Fonts -->
@@ -3690,7 +3690,7 @@ to use a more sophisticated matching algorithm.
 </para>
 </chapter>
 
-<chapter id="polymorphic_fonts">
+<chapter id='Polymorphic_Fonts'>
 <title>Polymorphic Fonts</title>
 <!-- .XS -->
 <!-- (SN Polymorphic Fonts -->
@@ -3864,7 +3864,7 @@ accommodate the value.
 </para>
 </chapter>
 
-<chapter id="affected_elements_of_xlib_and_the_x_protocol">
+<chapter id='Affected_Elements_of_Xlib_and_the_X_Protocol'>
 <title>Affected Elements of Xlib and the X Protocol</title>
 <!-- .XS -->
 <!-- (SN Affected Elements of Xlib and the X Protocol -->
@@ -3902,32 +3902,32 @@ the following Xlib functions must support the XLFD conventions:
 <itemizedlist>
   <listitem>
     <para>
-<function>XLoadFont</function>
+<olink targetdoc='libX11' targetptr='XLoadFont'><function>XLoadFont</function></olink>
 - for the name argument
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XListFontsWithInfo</function>
+<olink targetdoc='libX11' targetptr='XListFontsWithInfo'><function>XListFontsWithInfo</function></olink>
 - for the pattern argument
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XLoadQueryFont</function>
+<olink targetdoc='libX11' targetptr='XLoadQueryFont'><function>XLoadQueryFont</function></olink>
 - for the name argument
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XListFonts</function>
+<olink targetdoc='libX11' targetptr='XListFonts'><function>XListFonts</function></olink>
 - for the pattern argument
     </para>
   </listitem>
 </itemizedlist>
 </chapter>
 
-<chapter id="bdf_conformance">
+<chapter id='BDF_Conformance'>
 <title>BDF Conformance</title>
 <!-- .XS -->
 <!-- (SN BDF Conformance -->
@@ -3942,7 +3942,7 @@ or the semantics of the font properties that might be provided in a BDF font.
 This section identifies the requirements for BDF fonts that conform to XLFD.
 </para>
 
-<sect1 id="xlfd_conformance_requirements">
+<sect1 id='XLFD_Conformance_Requirements'>
 <title>XLFD Conformance Requirements</title>
 <!-- .XS -->
 <!-- (SN XLFD Conformance Requirements -->
@@ -3998,7 +3998,7 @@ or follows the definition of a private property.
 </para>
 </sect1>
 
-<sect1 id="font_ascent_font_descent_and_default_char">
+<sect1 id='FONT_ASCENT_FONT_DESCENT_and_DEFAULT_CHAR'>
 <title>FONT_ASCENT, FONT_DESCENT, and DEFAULT_CHAR</title>
 <!-- .XS -->
 <!-- (SN FONT_ASCENT, FONT_DESCENT, and DEFAULT_CHAR -->
@@ -4014,7 +4014,7 @@ If present,
 these properties shall comply with the following semantic definitions.
 </para>
 
-<sect2 id="font_ascent">
+<sect2 id='FONT_ASCENT'>
 <title>FONT_ASCENT</title>
 <!-- .XS -->
 <!-- (SN FONT_ASCENT -->
@@ -4046,7 +4046,7 @@ in pixels of any glyph in the font.
 </para>
 </sect2>
 
-<sect2 id="font_descent">
+<sect2 id='FONT_DESCENT'>
 <title>FONT_DESCENT</title>
 <!-- .XS -->
 <!-- (SN FONT_DESCENT -->
@@ -4081,7 +4081,7 @@ in pixels of any glyph in the font.
 </para>
 </sect2>
 
-<sect2 id="default_char">
+<sect2 id='DEFAULT_CHAR'>
 <title>DEFAULT_CHAR</title>
 <!-- .XS -->
 <!-- (SN DEFAULT_CHAR -->
diff --git a/specs/Xext/lbxalg.xml b/specs/Xext/lbxalg.xml
index 10c926f..27ae898 100644
--- a/specs/Xext/lbxalg.xml
+++ b/specs/Xext/lbxalg.xml
@@ -11,7 +11,7 @@
     <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
 </articleinfo>
 
-<sect1 id='introduction'>
+<sect1 id='Introduction'>
 <title>Introduction</title>
 <para>
 The Low Bandwidth X extension allows for negotiating various algorithms used
@@ -20,7 +20,7 @@ implementation of LBX in the X11 Release 6.4.
 </para>
 
 </sect1>
-<sect1 id='streaming_compression'>
+<sect1 id='Streaming_Compression'>
 <title>Streaming Compression</title>
 
 <para>
@@ -47,7 +47,7 @@ If the compflag is false, then the contents of the block are not compressed.
 
 </sect1>
 
-<sect1 id='bitmap_compression'>
+<sect1 id='Bitmap_Compression'>
 <title>Bitmap Compression</title>
 <para>
 LBX also negotiates for bitmap compression. The consortium
@@ -57,7 +57,7 @@ which uses the CCITT Group 4 2D compression algorithm.
 
 </sect1>
 
-<sect1 id='pixmap_compression'>
+<sect1 id='Pixmap_Compression'>
 <title>Pixmap Compression</title>
 
 <para>
@@ -70,7 +70,7 @@ stream compressor to compress the image.
 
 </sect1>
 
-<sect1 id='colormap_algorithm'>
+<sect1 id='Colormap_Algorithm'>
 <title>Colormap Algorithm</title>
 <para>
 LBX negotiates for use of a colormap algorithm, used for color
diff --git a/specs/Xserver/XACE-Spec.xml b/specs/Xserver/XACE-Spec.xml
index 1b8e0e0..bc7340d 100644
--- a/specs/Xserver/XACE-Spec.xml
+++ b/specs/Xserver/XACE-Spec.xml
@@ -182,10 +182,10 @@
 	    </funcprototype>
 	  </funcsynopsis>
 	</blockquote>
-	When the callback is called, <parameter>pcbl</parameter> points to the callback list itself.  The X callback mechanism allows the list to be manipulated in various ways, but XACE callbacks should not do this.  Remember that other security extensions may be registered on the same hook.  <parameter>userdata</parameter> is set to the data argument that was passed to <function>XaceRegisterCallback</function> at registration time; this can be used by your extension to pass data into the callback.  <parameter>calldata</parameter> points to a value or structure which is specific to each XACE hook.  These are discussed in the documentation for each specific hook, below.  Your extension must cast this argument to the appropriate pointer type.</para>
-	<para>To register a callback on a given hook, use <function>XaceRegisterCallback</function>:
+	When the callback is called, <parameter>pcbl</parameter> points to the callback list itself.  The X callback mechanism allows the list to be manipulated in various ways, but XACE callbacks should not do this.  Remember that other security extensions may be registered on the same hook.  <parameter>userdata</parameter> is set to the data argument that was passed to <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/> at registration time; this can be used by your extension to pass data into the callback.  <parameter>calldata</parameter> points to a value or structure which is specific to each XACE hook.  These are discussed in the documentation for each specific hook, below.  Your extension must cast this argument to the appropriate pointer type.</para>
+	<para>To register a callback on a given hook, use <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/>:
 	<blockquote>
-	  <funcsynopsis id='xaceregistercallback'>
+	  <funcsynopsis id='XaceRegisterCallback'>
 	    <funcprototype><funcdef>Bool <function>XaceRegisterCallback</function></funcdef>
 	    <paramdef>
 	      <parameter>int hook</parameter>
@@ -195,10 +195,10 @@
 	    </funcprototype>
 	  </funcsynopsis>
 	</blockquote>
-	Where <parameter>hook</parameter> is the XACE hook you wish to register on, <parameter>callback</parameter> is the callback function you wish to register, and <parameter>userdata</parameter> will be passed through to the callback as its second argument, as described above.  See <xref linkend="hooks_tab"/> for the list of XACE hook codes.  <function>XaceRegisterCallback</function> is typically called from the extension initialization code; see the SECURITY source for examples.  The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para>
-	<para>To unregister a callback, use <function>XaceDeleteCallback</function>:
+	Where <parameter>hook</parameter> is the XACE hook you wish to register on, <parameter>callback</parameter> is the callback function you wish to register, and <parameter>userdata</parameter> will be passed through to the callback as its second argument, as described above.  See <xref linkend="hooks_tab"/> for the list of XACE hook codes.  <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/> is typically called from the extension initialization code; see the SECURITY source for examples.  The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para>
+	<para>To unregister a callback, use <xref linkend='XaceDeleteCallback' xrefstyle='select: title'/>:
 	<blockquote>
-	  <funcsynopsis id='xacedeletecallback'>
+	  <funcsynopsis id='XaceDeleteCallback'>
 	    <funcprototype><funcdef>Bool <function>XaceDeleteCallback</function></funcdef>
 	    <paramdef>
 	      <parameter>int hook</parameter>
@@ -208,7 +208,7 @@
 	    </funcprototype>
 	  </funcsynopsis>
 	</blockquote>
-	where the three arguments are identical to those used in the call to <function>XaceRegisterCallback</function>.  The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para>
+	where the three arguments are identical to those used in the call to <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/>.  The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para>
       </section>
 
       <section>
diff --git a/specs/Xserver/analysis.xml b/specs/Xserver/analysis.xml
index a53dbdc..730789c 100644
--- a/specs/Xserver/analysis.xml
+++ b/specs/Xserver/analysis.xml
@@ -68,7 +68,7 @@ the semantics of the X Protocol to reduce these risks.
 </abstract>
 </bookinfo>
 
-<chapter id="definition_of_threats">
+<chapter id='Definition_of_Threats'>
 <title>Definition of Threats</title>
 
 <para>
@@ -145,7 +145,7 @@ more damage.
 </para>
 </chapter>
 
-<chapter id="general_security_concerns_and_remedies">
+<chapter id='General_security_concerns_and_remedies'>
 <title>General security concerns and remedies</title>
 
 <para>
@@ -216,7 +216,7 @@ resource. The disallowed operations cause Access errors. The resiource at
 issue is usually a root window.
 </para>
 
-<sect1 id="access_to_server_resources">
+<sect1 id='Access_to_Server_Resources'>
 <title>Access to Server Resources</title>
 <para>
 The X protocol allows clients to manipulate resources (objects) belonging to
@@ -278,10 +278,10 @@ or the ICCCM that breaks if you hide resources?
 
 </sect1>
 
-<sect1 id="denial_of_service">
+<sect1 id='Denial_of_Service'>
 <title>Denial of Service</title>
 
-<sect2 id="memory_exhaustion">
+<sect2 id='Memory_Exhaustion'>
 <title>Memory Exhaustion</title>
 
 <para>
@@ -348,7 +348,7 @@ mentioned as a defense in the list below.
 </sect2>
 
 
-<sect2 id="cpu_monopolization">
+<sect2 id='CPU_Monopolization'>
 <title>CPU Monopolization</title>
 
 <para>
@@ -375,10 +375,10 @@ already exists in the server to support it, so this should be simple to add.
 </chapter>
 
 
-<chapter id="security_concerns_with_specific_window_attributes">
+<chapter id='Security_concerns_with_specific_window_attributes'>
 <title>Security concerns with specific window attributes</title>
 
-<sect1 id="background_pixmap">
+<sect1 id='Background_pixmap'>
 <title>Background-pixmap</title>
 <para>
 Clients can use windows with the background-pixmap attribute set to None
@@ -431,7 +431,7 @@ contains bits from trusted windows?
 
 </sect1>
 
-<sect1 id="parentrelative_and_copyfromparent">
+<sect1 id='ParentRelative_and_CopyFromParent'>
 <title>ParentRelative and CopyFromParent</title>
 
 <para>
@@ -454,7 +454,7 @@ below). We recommend that nothing more be done to counter this threat.
 
 </sect1>
 
-<sect1 id="override_redirect">
+<sect1 id='Override_redirect'>
 <title>Override-redirect</title>
 <para>
 Windows with the override-redirect bit set to True are generally ignored by
@@ -473,15 +473,14 @@ windows of untrusted clients.
 Override-redirect windows also make some spoofing attacks easier since the
 client can more carefully control the presentation of the window to mimic
 another client.  Defenses against spoofing will be given under
-<link linkend="mapwindow">
-<xref linkend="mapwindow"></xref></link>
+<xref linkend='MapWindow' xrefstyle='select: title'/>
 .
 </para>
 
 </sect1>
 </chapter>
 
-<chapter id="security_concerns_with_specific_requests">
+<chapter id='Security_concerns_with_specific_requests'>
 <title>Security concerns with specific requests</title>
 
 <para>
@@ -498,7 +497,7 @@ Resources owned by the server, such as the root window and the default
 colormap, are considered to be owned by a trusted client.
 </para>
 
-<sect1 id="create_window">
+<sect1 id='CreateWindow'>
 <title>CreateWindow</title>
 
 <para>
@@ -551,13 +550,12 @@ Defense: quotas.
 </para>
 <para>
 Also
-<link linkend="security_concerns_with_specific_window_attributes">
-<xref linkend="security_concerns_with_specific_window_attributes"></xref></link>
+<xref linkend='Security_concerns_with_specific_window_attributes' xrefstyle='select: title'/>
 </para>
 </sect1>
 
 
-<sect1 id="changewindowattributes">
+<sect1 id='ChangeWindowAttributes'>
 <title>ChangeWindowAttributes</title>
 
 <para>
@@ -599,13 +597,12 @@ Defense: send Pixmap, Colormap, or Cursor error.
 </para>
 <para>
 Also
-<link linkend="security_concerns_with_specific_window_attributes">
-<xref linkend="security_concerns_with_specific_window_attributes"></xref></link>
+<xref linkend='Security_concerns_with_specific_window_attributes' xrefstyle='select: title'/>
 </para>
 
 </sect1>
 
-<sect1 id="getwindowattributes">
+<sect1 id='GetWindowAttributes'>
 <title>GetWindowAttributes</title>
 
 <para>
@@ -620,7 +617,7 @@ Defense for both of the above: send Window error.
 
 </sect1>
 
-<sect1 id="destroywindow__destroysubwindows">
+<sect1 id='DestroyWindow_DestroySubwindows'>
 <title>DestroyWindow, DestroySubwindows</title>
 
 <para>
@@ -634,7 +631,7 @@ Defense for both of the above: send Window error.
 </para>
 </sect1>
 
-<sect1 id="changesaveset">
+<sect1 id='ChangeSaveSet'>
 <title>ChangeSaveSet</title>
 
 <para>
@@ -658,7 +655,7 @@ Defense: send Window error.
 </sect1>
 
 
-<sect1 id="mapwindow">
+<sect1 id='MapWindow'>
 <title>MapWindow</title>
 
 <para>
@@ -733,7 +730,7 @@ unobscurable windows.
 </sect1>
 
 
-<sect1 id="window_operations">
+<sect1 id='Window_Operations'>
 <title>Window Operations</title>
 
 <para>
@@ -756,7 +753,7 @@ window, in which case we should send an Access error.
 
 </sect1>
 
-<sect1 id="getgeometry">
+<sect1 id='GetGeometry'>
 <title>GetGeometry</title>
 
 <para>
@@ -773,7 +770,7 @@ will be allowed.
 
 </sect1>
 
-<sect1 id="querytree">
+<sect1 id='QueryTree'>
 <title>QueryTree</title>
 
 <para>
@@ -808,15 +805,14 @@ window?
 <para>
 ISSUE: the Motif drag protocol (both preregister and dynamic) needs to be able
 to locate other top-level windows for potential drop sites. See also
-<link linkend="access_to_server_resources">
-<xref linkend="access_to_server_resources"></xref></link>
+<xref linkend='Access_to_Server_Resources' xrefstyle='select: title'/>
 .
 </para>
 </note>
 
 </sect1>
 
-<sect1 id="internatom">
+<sect1 id='InternAtom'>
 <title>InternAtom</title>
 
 <para>
@@ -841,7 +837,7 @@ Defense: quotas.
 
 </sect1>
 
-<sect1 id="getatomname">
+<sect1 id='GetAtomName'>
 <title>GetAtomName</title>
 
 <para>
@@ -857,7 +853,7 @@ threat.
 
 </sect1>
 
-<sect1 id="changeproperty">
+<sect1 id='ChangeProperty'>
 <title>ChangeProperty</title>
 
 <para>
@@ -898,7 +894,7 @@ Defense: quotas.
 </para>
 </sect1>
 
-<sect1 id="deleteproperty">
+<sect1 id='DeleteProperty'>
 <title>DeleteProperty</title>
 
 <para>
@@ -915,7 +911,7 @@ Defense for both of the above: send Window error.
 
 </sect1>
 
-<sect1 id="getproperty">
+<sect1 id='GetProperty'>
 <title>GetProperty</title>
 
 <para>
@@ -950,7 +946,7 @@ have fixed names.
 
 </sect1>
 
-<sect1 id="rotateproperties">
+<sect1 id='RotateProperties'>
 <title>RotateProperties</title>
 
 <para>
@@ -966,7 +962,7 @@ Defense for both of the above: send Window error.
 </para>
 </sect1>
 
-<sect1 id="listproperties">
+<sect1 id='ListProperties'>
 <title>ListProperties</title>
 
 <para>
@@ -988,7 +984,7 @@ ISSUE: should certain root window properties be listable?
 </note>
 </sect1>
 
-<sect1 id="setselectionowner">
+<sect1 id='SetSelectionOwner'>
 <title>SetSelectionOwner</title>
 
 <para>
@@ -1021,7 +1017,7 @@ Defense: send Window error.
 </para>
 </sect1>
 
-<sect1 id="getselectionowner">
+<sect1 id='GetSelectionOwner'>
 <title>GetSelectionOwner</title>
 
 <para>
@@ -1041,7 +1037,7 @@ ISSUE: how does the security manager get involved here?
 </note>
 </sect1>
 
-<sect1 id="convertselection">
+<sect1 id='ConvertSelection'>
 <title>ConvertSelection</title>
 
 <para>
@@ -1067,7 +1063,7 @@ Defense: send Window error.
 </sect1>
 
 
-<sect1 id="sendevent">
+<sect1 id='SendEvent'>
 <title>SendEvent</title>
 
 <para>
@@ -1101,7 +1097,7 @@ Defense: send Window error.
 </sect1>
 
 
-<sect1 id="keyboard_and_pointer_grabs">
+<sect1 id='Keyboard_and_Pointer_Grabs'>
 <title>Keyboard and Pointer Grabs</title>
 
 <para>
@@ -1118,8 +1114,7 @@ input may not have been intended for the grabbing client.
 <para>
 Defense: provide a way to break grabs via some keystroke combination, and
 have a status area that shows which client is getting input. (See
-<link linkend="mapwindow">
-<xref linkend="mapwindow"></xref></link>
+<xref linkend='MapWindow' xrefstyle='select: title'/>
 ).
 </para>
 
@@ -1135,7 +1130,7 @@ Defense: send Window or Cursor error.
 
 
 
-<sect1 id="changeactivepointergrab">
+<sect1 id='ChangeActivePointerGrab'>
 <title>ChangeActivePointerGrab</title>
 
 <para>
@@ -1148,7 +1143,7 @@ Defense: send Cursor error.
 </sect1>
 
 
-<sect1 id="grabserver">
+<sect1 id='GrabServer'>
 <title>GrabServer</title>
 
 <para>
@@ -1162,7 +1157,7 @@ Defense: provide a way to break grabs via some keystroke combination.
 </sect1>
 
 
-<sect1 id="querypointer">
+<sect1 id='QueryPointer'>
 <title>QueryPointer</title>
 
 <para>
@@ -1184,7 +1179,7 @@ Defense: send Window error.
 </para>
 </sect1>
 
-<sect1 id="getmotionevents">
+<sect1 id='GetMotionEvents'>
 <title>GetMotionEvents</title>
 
 <para>
@@ -1207,7 +1202,7 @@ Defense: send Window error.
 </para>
 </sect1>
 
-<sect1 id="translatecoordinates">
+<sect1 id='TranslateCoordinates'>
 <title>TranslateCoordinates</title>
 
 <para>
@@ -1229,7 +1224,7 @@ Defense: send Window error.
 </para>
 </sect1>
 
-<sect1 id="warppointer">
+<sect1 id='WarpPointer'>
 <title>WarpPointer</title>
 
 <para>
@@ -1256,7 +1251,7 @@ Defense: send Window error.
 </para>
 </sect1>
 
-<sect1 id="setinputfocus">
+<sect1 id='SetInputFocus'>
 <title>SetInputFocus</title>
 
 <para>
@@ -1292,7 +1287,7 @@ Defense: send Window error.
 </sect1>
 
 
-<sect1 id="getinputfocus">
+<sect1 id='GetInputFocus'>
 <title>GetInputFocus</title>
 
 <para>
@@ -1305,7 +1300,7 @@ the input focus.
 </sect1>
 
 
-<sect1 id="querykeymap">
+<sect1 id='QueryKeymap'>
 <title>QueryKeymap</title>
 
 <para>
@@ -1318,7 +1313,7 @@ the input focus.
 </para>
 </sect1>
 
-<sect1 id="font_requests">
+<sect1 id='Font_Requests'>
 <title>Font Requests</title>
 
 <para>
@@ -1366,7 +1361,7 @@ Defense: quotas.
 </sect1>
 
 
-<sect1 id="closefont">
+<sect1 id='CloseFont'>
 <title>CloseFont</title>
 
 <para>
@@ -1377,7 +1372,7 @@ Defense: send Font error.
 </para>
 </sect1>
 
-<sect1 id="setfontpath">
+<sect1 id='SetFontPath'>
 <title>SetFontPath</title>
 
 <para>
@@ -1404,7 +1399,7 @@ surface.
 </note>
 </sect1>
 
-<sect1 id="getfontpath">
+<sect1 id='GetFontPath'>
 <title>GetFontPath</title>
 
 <para>
@@ -1421,7 +1416,7 @@ untrusted clients, as described in the Font Requests section.
 </sect1>
 
 
-<sect1 id="createpixmap">
+<sect1 id='CreatePixmap'>
 <title>CreatePixmap</title>
 
 <para>
@@ -1438,7 +1433,7 @@ Defense: quotas.
 </para>
 </sect1>
 
-<sect1 id="freepixma">
+<sect1 id='FreePixmap'>
 <title>FreePixmap</title>
 
 <para>
@@ -1449,7 +1444,7 @@ Defense: send Pixmap error.
 </para>
 </sect1>
 
-<sect1 id="creategc">
+<sect1 id='CreateGC'>
 <title>CreateGC</title>
 
 <para>
@@ -1467,7 +1462,7 @@ Defense: quotas.
 </sect1>
 
 
-<sect1 id="copygc">
+<sect1 id='CopyGC'>
 <title>CopyGC</title>
 
 <para>
@@ -1482,7 +1477,7 @@ Defense for both of the above: send GC error.
 </sect1>
 
 
-<sect1 id="changegc__setdashes__setcliprectangles">
+<sect1 id='ChangeGC_SetDashes_SetClipRectangles'>
 <title>ChangeGC, SetDashes, SetClipRectangles</title>
 
 <para>
@@ -1497,7 +1492,7 @@ Defense for both of the above: send GC error.
 </para>
 </sect1>
 
-<sect1 id="freegc">
+<sect1 id='FreeGC'>
 <title>FreeGC</title>
 
 <para>
@@ -1510,7 +1505,7 @@ Defense: send GC error.
 </sect1>
 
 
-<sect1 id="drawing_requests">
+<sect1 id='Drawing_Requests'>
 <title>Drawing Requests</title>
 
 <para>
@@ -1539,14 +1534,13 @@ Spoofing: draw to a window to make it resemble a window of another client.
 </para>
 <para>
 Defense: see
-<link linkend="mapwindow">
-<xref linkend="mapwindow"></xref></link>
+<xref linkend='MapWindow' xrefstyle='select: title'/>
 .
 </para>
 </sect1>
 
 
-<sect1 id="getimage">
+<sect1 id='GetImage'>
 <title>GetImage</title>
 
 <para>
@@ -1568,7 +1562,7 @@ from trusted windows.
 </para>
 </sect1>
 
-<sect1 id="createcolormap">
+<sect1 id='CreateColormap'>
 <title>CreateColormap</title>
 
 <para>
@@ -1587,7 +1581,7 @@ Defense: quotas.
 </para>
 </sect1>
 
-<sect1 id="freecolormap">
+<sect1 id='FreeColormap'>
 <title>FreeColormap</title>
 
 <para>
@@ -1599,7 +1593,7 @@ Defense: send Colormap error.
 </sect1>
 
 
-<sect1 id="copycolormapandfree">
+<sect1 id='CopyColormapAndFree'>
 <title>CopyColormapAndFree</title>
 
 <para>
@@ -1624,7 +1618,7 @@ Defense: quotas.
 </para>
 </sect1>
 
-<sect1 id="installcolormap__uninstallcolormap">
+<sect1 id='InstallColormap_UninstallColormap'>
 <title>InstallColormap, UninstallColormap</title>
 
 <para>
@@ -1651,7 +1645,7 @@ has the pointer grabbed. Do we need to allow that too?
 </note>
 </sect1>
 
-<sect1 id="listinstalledcolormaps">
+<sect1 id='ListInstalledColormaps'>
 <title>ListInstalledColormaps</title>
 
 <para>
@@ -1670,7 +1664,7 @@ colormaps and colormaps of untrusted clients.
 </para>
 </sect1>
 
-<sect1 id="color_allocation_requests">
+<sect1 id='Color_Allocation_Requests'>
 <title>Color Allocation Requests</title>
 
 <para>
@@ -1691,7 +1685,7 @@ colormaps will be allowed.
 </para>
 </sect1>
 
-<sect1 id="freecolors">
+<sect1 id='FreeColors'>
 <title>FreeColors</title>
 
 <para>
@@ -1702,7 +1696,7 @@ Defense: send Colormap error. However, default colormaps will be allowed.
 </para>
 </sect1>
 
-<sect1 id="storecolors__storenamedcolor">
+<sect1 id='StoreColors_StoreNamedColor'>
 <title>StoreColors, StoreNamedColor</title>
 
 <para>
@@ -1718,7 +1712,7 @@ colormaps will be allowed.
 </sect1>
 
 
-<sect1 id="querycolors__lookupcolor">
+<sect1 id='QueryColors_LookupColor'>
 <title>QueryColors, LookupColor</title>
 
 <para>
@@ -1733,7 +1727,7 @@ colormaps will be allowed.
 </para>
 </sect1>
 
-<sect1 id="createcursor__createglyphcursor">
+<sect1 id='CreateCursor_CreateGlyphCursor'>
 <title>CreateCursor, CreateGlyphCursor</title>
 
 <para>
@@ -1750,7 +1744,7 @@ Defense: quotas.
 </para>
 </sect1>
 
-<sect1 id="freecursor">
+<sect1 id='FreeCursor'>
 <title>FreeCursor</title>
 
 <para>
@@ -1761,7 +1755,7 @@ Defense: send Cursor error.
 </para>
 </sect1>
 
-<sect1 id="recolorcursor">
+<sect1 id='RecolorCursor'>
 <title>RecolorCursor</title>
 
 <para>
@@ -1775,7 +1769,7 @@ Defense for both of the above: send Cursor error.
 </para>
 </sect1>
 
-<sect1 id="querybestsize">
+<sect1 id='QueryBestSize'>
 <title>QueryBestSize</title>
 
 <para>
@@ -1786,7 +1780,7 @@ Defense: send Drawable error.
 </para>
 </sect1>
 
-<sect1 id="listextensions__queryextension">
+<sect1 id='ListExtensions_QueryExtension'>
 <title>ListExtensions, QueryExtension</title>
 
 <para>
@@ -1800,7 +1794,7 @@ about extensions that claim to be safe.
 </para>
 </sect1>
 
-<sect1 id="keyboard_configuration_requests">
+<sect1 id='Keyboard_configuration_requests'>
 <title>Keyboard configuration requests</title>
 
 <para>
@@ -1823,7 +1817,7 @@ Defense for both of the above: treat these requests as a no-op.
 </sect1>
 
 
-<sect1 id="keyboard_query_requets">
+<sect1 id='Keyboard_query_requests'>
 <title>Keyboard query requests</title>
 
 <para>
@@ -1839,7 +1833,7 @@ threat.
 </sect1>
 
 
-<sect1 id="changepointercontrol__setpointermapping">
+<sect1 id='ChangePointerControl_SetPointerMapping'>
 <title>ChangePointerControl, SetPointerMapping</title>
 
 <para>
@@ -1855,7 +1849,7 @@ Defense for both of the above: treat these requests as a no-op.
 </para>
 </sect1>
 
-<sect1 id="getpointercontrol__getpointermapping">
+<sect1 id='GetPointerControl_GetPointerMapping'>
 <title>GetPointerControl, GetPointerMapping</title>
 
 <para>
@@ -1867,7 +1861,7 @@ threat.
 </para>
 </sect1>
 
-<sect1 id="setscreensaver">
+<sect1 id='SetScreenSaver'>
 <title>SetScreenSaver</title>
 
 <para>
@@ -1884,7 +1878,7 @@ Defense for both of the above: treat these requests as a no-op.
 </sect1>
 
 
-<sect1 id="getscreensaver">
+<sect1 id='GetScreenSaver'>
 <title>GetScreenSaver</title>
 
 <para>
@@ -1896,7 +1890,7 @@ threat.
 </para>
 </sect1>
 
-<sect1 id="forcescreensaver">
+<sect1 id='ForceScreenSaver'>
 <title>ForceScreenSaver</title>
 
 <para>
@@ -1912,7 +1906,7 @@ Defense for both of the above: treat these requests as a no-op.
 </para>
 </sect1>
 
-<sect1 id="changehost">
+<sect1 id='ChangeHost'>
 <title>ChangeHost</title>
 
 <para>
@@ -1933,7 +1927,7 @@ Defense for both of the above: return Access error.
 </sect1>
 
 
-<sect1 id="listhosts">
+<sect1 id='ListHosts'>
 <title>ListHosts</title>
 
 <para>
@@ -1949,7 +1943,7 @@ Defense for both of the above: return only untrusted hosts.
 </sect1>
 
 
-<sect1 id="setaccesscontrol">
+<sect1 id='SetAccessControl'>
 <title>SetAccessControl</title>
 
 <para>
@@ -1968,7 +1962,7 @@ Defense for both of the above: return Access error.
 </para>
 </sect1>
 
-<sect1 id="setclosedownmode">
+<sect1 id='SetCloseDownMode'>
 <title>SetCloseDownMode</title>
 
 <para>
@@ -1985,7 +1979,7 @@ Defense: treat this request as a no-op.
 </para>
 </sect1>
 
-<sect1 id="killclient">
+<sect1 id='KillClient'>
 <title>KillClient</title>
 
 <para>
@@ -2004,7 +1998,7 @@ Defense for all of the above: return Value error.
 </para>
 </sect1>
 
-<sect1 id="clean_requests">
+<sect1 id='Clean_Requests'>
 <title>Clean Requests</title>
 
 <para>
@@ -2015,7 +2009,7 @@ UngrabKey, UngrabServer, NoOperation, and Bell.
 </sect1>
 </chapter>
 
-<chapter id="events">
+<chapter id='Events'>
 <title>Events</title>
 
 <para>
@@ -2025,7 +2019,7 @@ assuming that the client only selects for events on its own resources,
 then asking whether the events provide information about other clients.
 </para>
 
-<sect1 id="keymapnotify">
+<sect1 id='KeymapNotify'>
 <title>KeymapNotify</title>
 
 <para>
@@ -2039,7 +2033,7 @@ input focus.
 </para>
 </sect1>
 
-<sect1 id="expose">
+<sect1 id='Expose'>
 <title>Expose</title>
 
 <para>
@@ -2055,7 +2049,7 @@ memory. We propose to do nothing about this threat.
 </para>
 </sect1>
 
-<sect1 id="graphicsexposure">
+<sect1 id='GraphicsExposure'>
 <title>GraphicsExposure</title>
 
 <para>
@@ -2068,7 +2062,7 @@ Defense: see Expose above. We propose to do nothing about this threat.
 </para>
 </sect1>
 
-<sect1 id="visibilitynotify">
+<sect1 id='VisibilityNotify'>
 <title>VisibilityNotify</title>
 
 <para>
@@ -2081,7 +2075,7 @@ do nothing about this threat.
 </para>
 </sect1>
 
-<sect1 id="reparentnotify">
+<sect1 id='ReparentNotify'>
 <title>ReparentNotify</title>
 
 <para>
@@ -2102,7 +2096,7 @@ ISSUE: what is the application impact?
 </sect1>
 
 
-<sect1 id="configurenotify">
+<sect1 id='ConfigureNotify'>
 <title>ConfigureNotify</title>
 
 
@@ -2122,7 +2116,7 @@ ISSUE: what is the application impact?
 </sect1>
 
 
-<sect1 id="configurerequest">
+<sect1 id='ConfigureRequest'>
 <title>ConfigureRequest</title>
 
 <para>
@@ -2137,7 +2131,7 @@ ISSUE: what is the application impact?
 </sect1>
 
 
-<sect1 id="selectionclear">
+<sect1 id='SelectionClear'>
 <title>SelectionClear</title>
 
 <para>
@@ -2148,7 +2142,7 @@ Defense: return None for the owner window if it belongs to a trusted client.
 </para>
 </sect1>
 
-<sect1 id="selectionrequest">
+<sect1 id='SelectionRequest'>
 <title>SelectionRequest</title>
 
 <para>
@@ -2164,7 +2158,7 @@ selections.
 </sect1>
 
 
-<sect1 id="mappingnotify">
+<sect1 id='MappingNotify'>
 <title>MappingNotify</title>
 
 <para>
@@ -2179,7 +2173,7 @@ likely to confuse the user. We propose to do nothing about this threat.
 </sect1>
 </chapter>
 
-<chapter id="errors">
+<chapter id='Errors'>
 <title>Errors</title>
 
 <para>
@@ -2191,7 +2185,7 @@ There appear to be no threats related to procotol errors.
 
 
 
-<chapter id="future_work">
+<chapter id='Future_Work'>
 <title>Future Work</title>
 
 <para>
@@ -2203,7 +2197,7 @@ questions.
 </chapter>
 
 
-<chapter id="references">
+<chapter id='References'>
 <title>References</title>
 
 <para>
diff --git a/specs/Xserver/appgroup.xml b/specs/Xserver/appgroup.xml
index b465e05..00750e8 100644
--- a/specs/Xserver/appgroup.xml
+++ b/specs/Xserver/appgroup.xml
@@ -231,7 +231,7 @@ by the record, and finally frees the record itself.
 </para>
 </sect1>
 
-<sect1 id="Known_Problems_in_this_release_">
+<sect1 id='Known_Problems_in_this_release'>
 <title>Known Problems in this release.</title>
 <para>
 In a combined UI/Print server the connection setup returned to an
diff --git a/specs/Xserver/secint.xml b/specs/Xserver/secint.xml
index 5020a37..f2dd841 100644
--- a/specs/Xserver/secint.xml
+++ b/specs/Xserver/secint.xml
@@ -67,7 +67,7 @@ from the X Consortium.
 </bookinfo>
 
 
-<chapter id="generate_authorization_request">
+<chapter id='Generate_Authorization_Request'>
 <title>Generate Authorization Request</title>
 
 <para>
@@ -118,7 +118,7 @@ Return the authorization ID and generated auth data to the client.
 </para>
 
 </chapter>
-<chapter id="client_connection">
+<chapter id='Client_Connection'>
 <title>Client Connection</title>
 
 <para>
@@ -164,7 +164,7 @@ authorization structure.
 </para>
 </chapter>
 
-<chapter id="client_disconnection">
+<chapter id='Client_disconnection'>
 <title>Client disconnection</title>
 
 <para>
@@ -191,7 +191,7 @@ yet.
 </para>
 </chapter>
 
-<chapter id="resource_id_security">
+<chapter id='Resource_ID_Security'>
 <title>Resource ID Security</title>
 
 <para>
@@ -241,7 +241,7 @@ the server uses essentially the same code as before for resource lookups.
 </para>
 
 </chapter>
-<chapter id="extension_security">
+<chapter id='Extension_Security'>
 <title>Extension Security</title>
 
 <para>
@@ -250,7 +250,7 @@ extension is considered secure. It is initialized to FALSE by AddExtension.
 The following new dix function can be used to set the secure field:
 </para>
 
-<funcsynopsis id='declareextensionsecurity'>
+<funcsynopsis id='DeclareExtensionSecurity'>
 <funcprototype>
   <funcdef>void <function>DeclareExtensionSecurity</function></funcdef>
     <paramdef>char <parameter> *extname</parameter></paramdef>
@@ -263,7 +263,7 @@ The name of the extension and the desired value of the secure field are
 passed. If an extension is secure, a call to this function with
 secure = TRUE will typically appear right after the call to
 <function>AddExtension</function>.
-<function>DeclareExtensionSecurity</function>
+<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/>
 should be called during server reset. It should not
 be called after the first client has connected. Passing the name of an
 extension that has not been initialized has no effect (the secure value will
@@ -285,15 +285,15 @@ opcode, one of two new Proc vectors are used by untusted clients,
 as <function>ProcVector</function> and
 <function>SwappedProcVector</function> respectively for the first 128
 entries. Entries 128 through 255 are initialized to ProcBadRequest. If
-<function>DeclareExtensionSecurity</function> is called with secure =
+<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> is called with secure =
 TRUE, that extension's dispatch function is plugged into the appropriate entry
 so that the extension can be used. If
-<function>DeclareExtensionSecurity</function> is called with secure =
+<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> is called with secure =
 FALSE, the appropriate entry is reset to ProcBadRequest.
 </para>
 
 <para>
-Now we can explain why <function>DeclareExtensionSecurity</function>
+Now we can explain why <xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/>
 should not be called after the first client connects. In some cases,
 the Record extension gives clients a private copy of the proc vector,
 which it then changes to intercept certain requests. Changing entries in