#1 - fix the capitalization of the ID attriutes 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, 144 insertions, 146 deletions

diff --git a/specs/appgrp.xml b/specs/appgrp.xml
index dfeee9e..cf2c2d0 100644
--- a/specs/appgrp.xml
+++ b/specs/appgrp.xml
@@ -60,7 +60,7 @@ example, OpenDoc does, such as shared menu bars, etc.
 </abstract>
 </articleinfo>
 
-<sect1 id='purpose_and_goals'>
+<sect1 id='Purpose_and_Goals'>
 <title>Purpose and Goals</title>
 
 <para>
@@ -83,7 +83,7 @@ Computer, Inc. WinCenter is a trademark of Network Computing Devices, Inc.
 
 </sect1>
 
-<sect1 id='overview_of_the_protocol'>
+<sect1 id='Overview_of_the_protocol'>
 <title>Overview of the protocol.</title>
 
 <para>
@@ -99,7 +99,7 @@ As a member of an Application Group, when an application creates and maps a wind
 </para>
 
 </sect1>
-<sect1 id='requests'>
+<sect1 id='Requests'>
 <title>Requests</title>
 
 
@@ -343,10 +343,10 @@ This request destroys the association created with AppGroupCreateAssociation. Th
 
 </sect1>
 
-<sect1 id='changes_to_existing_requests'>
+<sect1 id='Changes_to_Existing_Requests'>
 <title>Changes to Existing Requests</title>
 
-<sect2 id='mapwindow'>
+<sect2 id='MapWindow'>
 <title>MapWindow</title>
 
 <para>
@@ -354,7 +354,7 @@ If the override-redirect attribute of the window is False and if the window is a
 </para>
 
 </sect2>
-<sect2 id='configurewindow'>
+<sect2 id='ConfigureWindow'>
 <title>ConfigureWindow</title>
 
 <para>
@@ -362,7 +362,7 @@ If the override-redirect attribute of the window is False and if the window is a
 </para>
 
 </sect2>
-<sect2 id='createwindow'>
+<sect2 id='CreateWindow'>
 <title>CreateWindow</title>
 
 <para>
@@ -375,7 +375,7 @@ When a program in an Application Group creates a window that is a child of a roo
 
 </sect2>
 
-<sect2 id='changewindowattributes'>
+<sect2 id='ChangeWindowAttributes'>
 <title>ChangeWindowAttributes</title>
 
 <para>
@@ -386,7 +386,7 @@ When a program in an Application Group changes the attributes of a window that i
 
 </sect1>
 
-<sect1 id='changes_to_existing_events'>
+<sect1 id='Changes_to_Existing_Events'>
 <title>Changes to Existing Events</title>
 
 <para>
@@ -398,7 +398,7 @@ The Application Group Leader must not select SubstructuRedirect events on a root
 </para></note>
 
 
-<sect2 id='maprequest'>
+<sect2 id='MapRequest'>
 <title>MapRequest</title>
 
 <para>
@@ -406,7 +406,7 @@ When a MapWindow request is received for a window whose override-redirect attrib
 </para>
 
 </sect2>
-<sect2 id='configurerequest'>
+<sect2 id='ConfigureRequest'>
 <title>ConfigureRequest</title>
 
 <para>
@@ -416,10 +416,10 @@ When a ConfigureWindow request is received for a window whose override-redirect
 </sect2>
 </sect1>
 
-<sect1 id='errors'>
+<sect1 id='Errors'>
 <title>Errors</title>
 
-<sect2 id='appgroupqueryversion'>
+<sect2 id='AppGroupQueryVersion'>
 <title>AppGroupQueryVersion</title>
 
 <para>
@@ -428,7 +428,7 @@ There are no errors for AppGroupQueryVersion.
 
 </sect2>
 
-<sect2 id='appgroupcreate'>
+<sect2 id='AppGroupCreate'>
 <title>AppGroupCreate</title>
 
 <para>
@@ -453,7 +453,7 @@ A Match error is returned if root_visual does not exist for the screen of the de
 
 </sect2>
 
-<sect2 id='appgroupdestroy'>
+<sect2 id='AppGroupDestroy'>
 <title>AppGroupDestroy</title>
 
 <para>
@@ -466,7 +466,7 @@ An Access error is returned if an untrusted application attempts to destroy an A
 
 </sect2>
 
-<sect2 id='appgroupgetattr'>
+<sect2 id='AppGroupGetAttr'>
 <title>AppGroupGetAttr</title>
 
 <para>
@@ -479,7 +479,7 @@ An Access error is returned if an untrusted application attempts to get the attr
 
 </sect2>
 
-<sect2 id='appgroupquery'>
+<sect2 id='AppGroupQuery'>
 <title>AppGroupQuery</title>
 
 <para>
@@ -488,7 +488,7 @@ An Access error is returned if an untrusted application attempts to query the Ap
 
 </sect2>
 
-<sect2 id='appgroupcreateassociation'>
+<sect2 id='AppGroupCreateAssociation'>
 <title>AppGroupCreateAssociation</title>
 
 <para>
@@ -505,7 +505,7 @@ A Window error may be returned for system-specific errors related to system_wind
 
 </sect2>
 
-<sect2 id='appgroupdestroyassociation'>
+<sect2 id='AppGroupDestroyAssociation'>
 <title>AppGroupDestroyAssociation</title>
 
 <para>
@@ -515,7 +515,7 @@ A Window error is returned if window was not specified in a previous AppGroupCre
 </sect2>
 </sect1>
 
-<sect1 id='encoding'>
+<sect1 id='Encoding'>
 <title>Encoding</title>
 
 <para>
@@ -643,7 +643,7 @@ VALUEs
 
 </sect1>
 
-<sect1 id='library_api'>
+<sect1 id='Library_API'>
 <title>Library API</title>
 
 <informaltable frame='none'>
diff --git a/specs/dbe.xml b/specs/dbe.xml
index 8c87548..d0319d3 100644
--- a/specs/dbe.xml
+++ b/specs/dbe.xml
@@ -48,7 +48,7 @@ without express or implied warranty.
 </legalnotice>
 </bookinfo>
 
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 <para>The Double Buffer Extension (DBE) provides a standard way to utilize
 double-buffering within the framework of the X Window System. Double-buffering
@@ -64,7 +64,7 @@ The result is a flicker-free animation.
 </para>
 </chapter>
 
-<chapter id="goals">
+<chapter id='Goals'>
 <title>Goals</title>
 <para>This extension should enable clients to:
 </para>
@@ -125,7 +125,7 @@ access (DGHA) architectures.
 
 </chapter>
 
-<chapter id="concepts">
+<chapter id='Concepts'>
 <title>Concepts</title>
 
 <para>
@@ -281,7 +281,7 @@ frame rate) should investigate the Synchronization Extension, an X
 Consortium standard.
 </para>
 
-<sect1 id="window_management_operations">
+<sect1 id='Window_Management_Operations'>
 <title>Window Management Operations</title>
 
 <para>
@@ -333,7 +333,7 @@ It is tiled with the window background in both buffers, and
 
 </sect1>
 
-<sect1 id="complex_swap_actions">
+<sect1 id='Complex_Swap_Actions'>
 <title>Complex Swap Actions</title>
 <para>
 DBE has no explicit knowledge of ancillary buffers (for example, depth
@@ -435,11 +435,11 @@ ensure best possible performance across a wide variety of implementations.
 </sect1>
 </chapter>
 
-<chapter id="requests">
+<chapter id='Requests'>
 <title>Requests</title>
 <para>The DBE defines the following requests.</para>
 
-<sect1 id="dbegetversion">
+<sect1 id='DBEGetVersion'>
 <title>DBEGetVersion</title>
 <para>
 This request returns the major and minor version numbers of this extension.
@@ -498,7 +498,7 @@ otherwise, the client will get undefined behavior (DBE may or may not work).
 
 </sect1>
 
-<sect1 id="dbegetvisualinfo">
+<sect1 id='DBEGetVisualInfo'>
 <title>DBEGetVisualInfo</title>
 <para>
 This request returns information about which visuals support double buffering.
@@ -577,7 +577,7 @@ returned, starting with screen zero.
 
 </sect1>
 
-<sect1 id="dbeallocatebackbuffername">
+<sect1 id='DBEAllocateBackBufferName'>
 <title>DBEAllocateBackBufferName</title>
 
 <para>
@@ -645,7 +645,7 @@ back-buffer-name is freed.
 </para>
 </sect1>
 
-<sect1 id="dbedeallocatebackbuffername">
+<sect1 id='DBEDeallocateBackBufferName'>
 <title>DBEDeallocateBackBufferName</title>
 <para>
 This request frees a drawable ID that was obtained by
@@ -683,7 +683,7 @@ a Buffer error results).
 </para>
 </sect1>
 
-<sect1 id="dbeswapbuffers">
+<sect1 id='DBESwapBuffers'>
 <title>DBESwapBuffers</title>
 <para>
 This request swaps the buffers for all windows listed, applying the
@@ -782,7 +782,7 @@ type of idiom, it must immediately follow the
 </para>
 </sect1>
 
-<sect1 id="dbebeginidiom">
+<sect1 id='DBEBeginIdiom'>
 <title>DBEBeginIdiom</title>
 <para>
 This request informs the server that a complex swap will immediately follow
@@ -800,7 +800,7 @@ free to implement this request as a no-op.
 </para>
 </sect1>
 
-<sect1 id="dbeendidiom">
+<sect1 id='DBEEndIdiom'>
 <title>DBEEndIdiom</title>
 
 
@@ -818,7 +818,7 @@ request as a no-op.
 
 </sect1>
 
-<sect1 id="dbegetbackbufferattributes">
+<sect1 id='DBEGetBackBufferAttributes'>
 <title>DBEGetBackBufferAttributes</title>
 
 <para>This request returns information about a back buffer.</para>
@@ -860,7 +860,7 @@ the window field of the attributes in the reply will be None.
 </sect1>
 </chapter>
 
-<chapter id="encoding">
+<chapter id='Encoding'>
 <title>Encoding</title>
 <para>
 Please refer to the X11 Protocol Encoding document as this section uses
@@ -869,7 +869,7 @@ syntactic conventions and data types established there.
 
 <para>The name of this extension is "DOUBLE-BUFFER".</para>
 
-<sect1 id="type">
+<sect1 id='Type'>
 <title>Type</title>
 <para>The following new types are used by the extension.
 </para>
@@ -906,7 +906,7 @@ BUFFER_ATTRIBUTES
 </literallayout>
 </sect1>
 
-<sect1 id="error">
+<sect1 id='Error'>
 <title>Error</title>
 <para><function>Buffer</function></para>
 <literallayout class="monospaced">
@@ -920,7 +920,7 @@ BUFFER_ATTRIBUTES
 </literallayout>
 </sect1>
 
-<sect1 id="request">
+<sect1 id='Request'>
 <title>Request</title>
 
 <literallayout class="monospaced">
@@ -1018,7 +1018,7 @@ DBEGetVersion
 
 </chapter>
 
-<chapter id="acknowledgements">
+<chapter id='Acknowledgements'>
 <title>Acknowledgements</title>
 <para>
 We wish to thank the following individuals who have contributed their time
@@ -1042,7 +1042,7 @@ draft of the specification. David served as architect.
 </para>
 </chapter>
 
-<chapter id="references">
+<chapter id='References'>
 <title>References</title>
 <para>
 Jeffrey Friedberg, Larry Seiler, and Jeff Vroom, "Multi-buffering Extension
diff --git a/specs/dpms.xml b/specs/dpms.xml
index fe97da9..617744c 100644
--- a/specs/dpms.xml
+++ b/specs/dpms.xml
@@ -123,7 +123,7 @@ it may be decided to make DPMS less aggressive, or disable it completely.
 <chapter id="Requests">
 <title>Requests</title>
 <para>
-<function>DPMSGetVersion</function>
+<olink targetdoc='dpmslib' targetptr='DPMSGetVersion'><function>DPMSGetVersion</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -178,7 +178,7 @@ of one (1).
 </para>
 
 <para>
-<function>DPMSCapable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSCapable'><function>DPMSCapable</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -206,7 +206,7 @@ case of heterogeneous multi-head servers is implementation defined.
 </para>
 
 <para>
-<function>DPMSGetTimeouts</function>
+<olink targetdoc='dpmslib' targetptr='DPMSGetTimeouts'><function>DPMSGetTimeouts</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -275,7 +275,7 @@ value of zero indicates that this mode is disabled.
 </para>
 
 <para>
-<function>DPMSSetTimeouts</function>
+<olink targetdoc='dpmslib' targetptr='DPMSSetTimeouts'><function>DPMSSetTimeouts</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -339,7 +339,7 @@ to the value of the previous (non-zero) level.  A BadValue error is generated
 if an illegal combination is detected.
 </para>
 <para>
-<function>DPMSEnable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSEnable'><function>DPMSEnable</function></olink>
 </para>
 <para>
 =&gt;
@@ -352,7 +352,7 @@ effected.
 </para>
 
 <para>
-<function>DPMSDisable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSDisable'><function>DPMSDisable</function></olink>
 </para>
 <para>
 =&gt;
@@ -366,7 +366,7 @@ may be disabled without damaging the server's stored timeout values.
 </para>
 
 <para>
-<function>DPMSForceLevel</function>
+<olink targetdoc='dpmslib' targetptr='DPMSForceLevel'><function>DPMSForceLevel</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -395,7 +395,7 @@ DPMSModeSuspend or DPMSModeOff.
 </para>
 
 <para>
-<function>DPMSInfo</function>
+<olink targetdoc='dpmslib' targetptr='DPMSInfo'><function>DPMSInfo</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -450,7 +450,7 @@ The name of this extension is "DPMS".
 </para>
 
 <literallayout class="monospaced">
-<function>DPMSGetVersion</function>
+<olink targetdoc='dpmslib' targetptr='DPMSGetVersion'><function>DPMSGetVersion</function></olink>
      1     CARD8         opcode
      1     0             DPMS opcode
      2     2             request length
@@ -467,7 +467,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSCapable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSCapable'><function>DPMSCapable</function></olink>
      1     CARD8         opcode
      1     1             DPMS opcode
      2     1             request length
@@ -481,7 +481,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSGetTimeouts</function>
+<olink targetdoc='dpmslib' targetptr='DPMSGetTimeouts'><function>DPMSGetTimeouts</function></olink>
      1     CARD8         opcode
      1     2             DPMS opcode
      2     1             request length
@@ -497,7 +497,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSSetTimeouts</function>
+<olink targetdoc='dpmslib' targetptr='DPMSSetTimeouts'><function>DPMSSetTimeouts</function></olink>
      1     CARD8         opcode
      1     3             DPMS opcode
      2     3             request length
@@ -509,7 +509,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSEnable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSEnable'><function>DPMSEnable</function></olink>
      1     CARD8         opcode
      1     4             DPMS opcode
      2     1             request length
@@ -517,7 +517,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSDisable</function>
+<olink targetdoc='dpmslib' targetptr='DPMSDisable'><function>DPMSDisable</function></olink>
      1     CARD8         opcode
      1     5             DPMS opcode
      2     1             request length
@@ -525,7 +525,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSForceLevel</function>
+<olink targetdoc='dpmslib' targetptr='DPMSForceLevel'><function>DPMSForceLevel</function></olink>
      1     CARD8         opcode
      1     6             DPMS opcode
      2     2             request length
@@ -539,7 +539,7 @@ The name of this extension is "DPMS".
 </literallayout>
 
 <literallayout class="monospaced">
-<function>DPMSInfo</function>
+<olink targetdoc='dpmslib' targetptr='DPMSInfo'><function>DPMSInfo</function></olink>
      1     CARD8         opcode
      1     7             DPMS opcode
      2     1             request length
diff --git a/specs/evi.xml b/specs/evi.xml
index 8489b37..e5cfac4 100644
--- a/specs/evi.xml
+++ b/specs/evi.xml
@@ -292,7 +292,7 @@ No new events or errors are defined by this extension.
 </para>
 </chapter>
 
-<chapter id="Changes_to_existing_protocol_">
+<chapter id='Changes_to_existing_protocol'>
 <title>Changes to existing protocol.</title>
 <para>
 None.
@@ -375,7 +375,7 @@ The include file for this extension is:
 <function>&lt; X11/extensions/XEVI.h&gt;</function>.
 </para>
 
-<funcsynopsis id='xeviqueryversion'>
+<funcsynopsis id='XeviQueryVersion'>
 <funcprototype>
   <funcdef>Bool <function> XeviQueryVersion</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -434,7 +434,7 @@ To get the extended information for any subset of visuals use
 XeviGetVisualInfo.
 </para>
 
-<funcsynopsis id='xevigetvisualinfo'>
+<funcsynopsis id='XeviGetVisualInfo'>
 <funcprototype>
   <funcdef>int <function> XeviGetVisualInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/multibuf.xml b/specs/multibuf.xml
index 39a5dbf..9e2b065 100644
--- a/specs/multibuf.xml
+++ b/specs/multibuf.xml
@@ -80,7 +80,7 @@ Extension (DBE).  DBE is an X Consortium Standard as of Release 6.1.
 </para></warning>
 </preface>
 
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 
 <para>
@@ -123,7 +123,7 @@ multi-buffering, and stereo in a way that is acceptable to all concerned.
 </para>
 </chapter>
 
-<chapter id="goals">
+<chapter id='Goals'>
 <title>Goals</title>
 
 <para>
@@ -179,7 +179,7 @@ existing hardware features.
 
 </chapter>
 
-<chapter id="image_buffers">
+<chapter id='Image_Buffers'>
 <title>Image Buffers</title>
 
 <para>
@@ -319,7 +319,7 @@ maintained for an image buffer, then no exposure events are generated.
 </para>
 </chapter>
 
-<chapter id="new_requests">
+<chapter id='New_Requests'>
 <title>New Requests</title>
 
 <para>
@@ -674,7 +674,7 @@ the request is ignored.
 
 </chapter>
 
-<chapter id="attributes">
+<chapter id='Attributes'>
 <title>Attributes</title>
 
 <para>
@@ -863,7 +863,7 @@ major version will be 1, and the minor version will be 1.
 </para>
 </chapter>
 
-<chapter id="events">
+<chapter id='Events'>
 <title>Events</title>
 
 <para>
@@ -961,7 +961,7 @@ request), an <function>UpdateNotify</function> event is generated.
 </para>
 </chapter>
 
-<chapter id="errors">
+<chapter id='Errors'>
 <title>Errors</title>
 
 <para>
@@ -969,14 +969,14 @@ The following error type has been added to support
 this extension:
 </para>
 
-<sect1 id="buffer_2">
+<sect1 id='Buffer_2'>
 <title>Buffer</title>
 <para>
 A value for a BUFFER argument does not name a defined BUFFER.
 </para>
 </sect1>
 
-<sect1 id="double_buffering_normal_windows">
+<sect1 id='Double_Buffering_Normal_Windows'>
 <title>Double-Buffering Normal Windows</title>
 
 <para>
@@ -1026,7 +1026,7 @@ DestroyImageBuffers( W )
 
 </sect1>
 
-<sect1 id="multi_buffering_normal_windows">
+<sect1 id='Multi_Buffering_Normal_Windows'>
 <title>Multi-Buffering Normal Windows</title>
 
 <para>
@@ -1073,7 +1073,7 @@ while animating
 
 </sect1>
 
-<sect1 id="stereo_windows">
+<sect1 id='Stereo_Windows'>
 <title>Stereo Windows</title>
 <para>
 <emphasis remap='I'>How</emphasis> stereo windows are supported on a server
@@ -1178,7 +1178,7 @@ right eyes for normal windows should be the same
 
 </sect1>
 
-<sect1 id="single_buffered_stereo_windows">
+<sect1 id='Single_Buffered_Stereo_Windows'>
 <title>Single-Buffered Stereo Windows</title>
 
 <para>
@@ -1198,7 +1198,7 @@ MapWindow( W )
 </literallayout>
 </sect1>
 
-<sect1 id="double_buffering_stereo_windows">
+<sect1 id='Double_Buffering_Stereo_Windows'>
 <title>Double-Buffering Stereo Windows</title>
 
 <para>
@@ -1270,7 +1270,7 @@ while animating
 
 </sect1>
 
-<sect1 id="multi_buffering_stereo_windows">
+<sect1 id='Multi_Buffering_Stereo_Windows'>
 <title>Multi-Buffering Stereo Windows</title>
 
 <para>
@@ -1313,7 +1313,7 @@ while animating
 </literallayout>
 </sect1>
 
-<sect1 id="protocol_encoding">
+<sect1 id='Protocol_Encoding'>
 <title>Protocol Encoding</title>
 
 <para>
@@ -1360,7 +1360,7 @@ encoding for this extension.
 </sect1>
 </chapter>
 
-<chapter id="type">
+<chapter id='TYPES'>
 <title>TYPES</title>
 
 <literallayout class="monospaced">
@@ -1382,7 +1382,7 @@ SETofBUFFER_EVENT
 
 </chapter>
 
-<chapter id="events_2">
+<chapter id='EVENTS_2'>
 <title>EVENTS</title>
 
 <literallayout class="monospaced">
@@ -1408,7 +1408,7 @@ SETofBUFFER_EVENT
 </literallayout>
 
 </chapter>
-<chapter id="errors_2">
+<chapter id='ERRORS_2'>
 <title>ERRORS</title>
 
 <literallayout class="monospaced">
@@ -1424,7 +1424,7 @@ SETofBUFFER_EVENT
 
 </chapter>
 
-<chapter id="requests">
+<chapter id='Requests'>
 <title>REQUESTS</title>
 
 <literallayout class="monospaced">
diff --git a/specs/security.xml b/specs/security.xml
index 228d350..b920618 100644
--- a/specs/security.xml
+++ b/specs/security.xml
@@ -56,7 +56,7 @@ in this Software without prior written authorization from the X Consortium.
 
 </bookinfo>
 
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 
 <para>
@@ -67,10 +67,10 @@ clients (defined below).
 
 </chapter>
 
-<chapter id="requests">
+<chapter id='Requests'>
 <title>Requests</title>
 
-<sect1 id="securityqueryversion">
+<sect1 id='SecurityQueryVersion'>
 <title>SecurityQueryVersion</title>
 <para>
 This request returns the major and minor version numbers of this extension.
@@ -150,7 +150,7 @@ protocol version; otherwise, the client will get undefined behavior
 </para>
 </sect1>
 
-<sect1 id="securitygenerateauthentication">
+<sect1 id='SecurityGenerateAuthorization'>
 <title>SecurityGenerateAuthorization</title>
 
 <para>
@@ -460,7 +460,7 @@ authorization-data-return this way.
 
 </sect1>
 
-<sect1 id="securityrevokeauthorization">
+<sect1 id='SecurityRevokeAuthorization'>
 <title>SecurityRevokeAuthorization</title>
 
 <para>
@@ -506,14 +506,14 @@ with this authorization will fail.
 </sect1>
 </chapter>
 
-<chapter id="changes_to_core_requests">
+<chapter id='Changes_to_Core_Requests'>
 <title>Changes to Core Requests</title>
 
 <para>
 A server supporting this extension modifies the handling of some core
 requests in the following ways.
 </para>
-<sect1 id="resource_id_usage">
+<sect1 id='Resource_ID_Usage'>
 <title>Resource ID Usage</title>
 
 <para>
@@ -603,7 +603,7 @@ ISSUE: are root window exceptions needed for these? WarpPointer, ReparentWindow
 </note>
 
 </sect1>
-<sect1 id="extension_security">
+<sect1 id='Extension_Security'>
 <title>Extension Security</title>
 
 <para>
@@ -638,7 +638,7 @@ opcode will fail with a Request error.
 
 </sect1>
 
-<sect1 id="keyboard_security">
+<sect1 id='Keyboard_Security'>
 <title>Keyboard Security</title>
 
 
@@ -705,7 +705,7 @@ expected. This is in line with the root window exceptions above.
 </para>
 </sect1>
 
-<sect1 id="image_security">
+<sect1 id='Image_Security'>
 <title>Image Security</title>
 
 <para>
@@ -745,8 +745,7 @@ to be an unusual configuration.
 
 </sect1>
 
-<sect1 id="property_security">
-
+<sect1 id='Property_Security'>
 <title>Property Security</title>
 
 <para>
@@ -840,7 +839,7 @@ field in the reply is zero).
 
 </sect1>
 
-<sect1 id="miscellaneous_security">
+<sect1 id='Miscellaneous_Security'>
 <title>Miscellaneous Security</title>
 
 <para>
@@ -859,7 +858,7 @@ a SelectionNotify event to the requestor with property None.
 </sect1>
 </chapter>
 
-<chapter id="new_authorization_method">
+<chapter id='New_Authorization_Method'>
 <title>New Authorization Method</title>
 
 <para>
@@ -998,7 +997,7 @@ policy-type Permit.
 
 </chapter>
 
-<chapter id="encoding">
+<chapter id='Encoding'>
 <title>Encoding</title>
 
 <para>
@@ -1010,14 +1009,14 @@ uses syntactic conventions and data types established there.
 The name of this extension is "SECURITY".
 </para>
 
-<sect1 id="types">
+<sect1 id='Types'>
 <title>Types</title>
 <para>
 AUTHID: CARD32
 </para>
 </sect1>
 
-<sect1 id="request_encoding">
+<sect1 id='Request_Encoding'>
 <title>Request Encoding</title>
 
 <para>
@@ -1097,7 +1096,7 @@ r                         unused, r=pad(q)
 
 </sect1>
 
-<sect1 id="event_encoding">
+<sect1 id='Event_Encoding'>
 <title>Event Encoding</title>
 <para>
 <function>SecurityAuthorizationRevoked</function>
@@ -1113,7 +1112,7 @@ r                         unused, r=pad(q)
 
 </sect1>
 
-<sect1 id="authorization_method_encoding">
+<sect1 id='Authorization_Method_Encoding'>
 <title>Authorization Method Encoding</title>
 
 <para>
@@ -1151,7 +1150,7 @@ termination between STRs.
 </sect1>
 
 </chapter>
-<chapter id="c_language_binding">
+<chapter id='C_Language_Binding'>
 <title>C Language Binding</title>
 
 <para>
@@ -1164,7 +1163,7 @@ All functions that have return type Status will return nonzero for
 success and zero for failure.
 </para>
 
-<funcsynopsis id='xsecurityqueryextension'>
+<funcsynopsis id='XSecurityQueryExtension'>
 <funcprototype>
   <funcdef>Status <function>XSecurityQueryExtension</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -1174,7 +1173,7 @@ success and zero for failure.
 </funcsynopsis>
 
 <para>
-<function>XSecurityQueryExtension</function> sets major_version_return and
+<xref linkend='XSecurityQueryExtension' xrefstyle='select: title'/> sets major_version_return and
 minor_version_return to the major and minor Security protocol version
 supported by the server. If the Security library is compatible with the
 version returned by the server, it returns nonzero. If dpy does not support
@@ -1185,7 +1184,7 @@ function. If a client violates this rule, the effects of all subsequent
 XSecurity calls that it makes are undefined.
 </para>
 
-<funcsynopsis id='xsecurityallocxauth'>
+<funcsynopsis id='XSecurityAllocXauth'>
 <funcprototype>
   <funcdef>Xauth *<function>XSecurityAllocXauth</function></funcdef>
     <paramdef><parameter>void</parameter></paramdef>
@@ -1198,9 +1197,9 @@ allocate and deallocate them.
 </para>
 
 <para>
-<function>XSecurityAllocXauth</function> must be used to allocate the
+<xref linkend='XSecurityAllocXauth' xrefstyle='select: title'/> must be used to allocate the
 Xauth structure that is passed to
-<function>XSecurityGenerateAuthorization</function>.
+<xref linkend='XSecurityGenerateAuthorization' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -1289,7 +1288,7 @@ The Xauth structure returned by this function is initialized as follows:
 name_length and data_length are zero, and name and data are NULL.
 </para>
 
-<funcsynopsis id='xsecurityfreexauth'>
+<funcsynopsis id='XSecurityFreeXauth'>
 <funcprototype>
   <funcdef>void <function>XSecurityFreeXauth</function></funcdef>
     <paramdef>Xauth<parameter> *auth</parameter></paramdef>
@@ -1297,20 +1296,20 @@ name_length and data_length are zero, and name and data are NULL.
 </funcsynopsis>
 
 <para>
-<function>XSecurityFreeXauth</function> must be used to free Xauth
+<xref linkend='XSecurityFreeXauth' xrefstyle='select: title'/> must be used to free Xauth
 structures allocated by
-<function>XSecurityAllocXauth</function> or returned by
-<function>XSecurityGenerateAuthorization</function>. It is the
+<xref linkend='XSecurityAllocXauth' xrefstyle='select: title'/> or returned by
+<xref linkend='XSecurityGenerateAuthorization' xrefstyle='select: title'/>. It is the
 caller's responsibility to fill in the name and data fields of Xauth structures
-allocated with <function>XSecurityAllocXauth</function>, so this function
+allocated with <xref linkend='XSecurityAllocXauth' xrefstyle='select: title'/>, so this function
 will not attempt to free them. In contrast, all storage associated with
 Xauth structures returned from
-<function>XSecurityGenerateAuthorization</function> will be freed by this
+<xref linkend='XSecurityGenerateAuthorization' xrefstyle='select: title'/> will be freed by this
 function, including the name and data fields.
 </para>
 
 
-<funcsynopsis id='xsecurityrevokeauthorization'>
+<funcsynopsis id='XSecurityRevokeAuthorization'>
 <funcprototype>
   <funcdef>Bool <function>XSecurityRevokeAuthorization</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -1319,15 +1318,15 @@ function, including the name and data fields.
 </funcsynopsis>
 
 <para>
-<function>XSecurityRevokeAuthorization</function> deletes the authorization
+<xref linkend='XSecurityRevokeAuthorization' xrefstyle='select: title'/> deletes the authorization
 specified by auth_id, which must be a value returned in the auth_id_return
-parameter of <function>XSecurityGenerateAuthorization</function>. All
+parameter of <xref linkend='XSecurityGenerateAuthorization' xrefstyle='select: title'/>. All
 clients that connected with that authorization are be killed. Subsequently,
 clients that attempt to connect using that authorization will be refused.
 </para>
 
 
-<funcsynopsis id='xsecuritygenerateauthorization'>
+<funcsynopsis id='XSecurityGenerateAuthorization'>
 <funcprototype>
   <funcdef>Xauth *<function>XSecurityGenerateAuthorization</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -1339,16 +1338,16 @@ clients that attempt to connect using that authorization will be refused.
 </funcsynopsis>
 
 <para>
-<function>XSecurityGenerateAuthorization</function> creates a new
+<xref linkend='XSecurityGenerateAuthorization' xrefstyle='select: title'/> creates a new
 authorization with the specified attributes. The auth_in argument must be
-allocated by <function>XSecurityAllocXauth</function>. The
+allocated by <xref linkend='XSecurityAllocXauth' xrefstyle='select: title'/>. The
 name and name_length fields of auth_in should be initialized to the
 authorization protocol name and its length in characters respectively.
 If there is authorization data, the data and data_length fields of
 auth_in should be initialized to the data and its length in characters
 respectivley. The library does not assume that name and data are
 null-terminated strings. The auth_in argument must be freed with
-<function>XSecurityFreeXauth</function>.
+<xref linkend='XSecurityFreeXauth' xrefstyle='select: title'/>.
 </para>
 
 <para>
@@ -1453,7 +1452,7 @@ the authorization data returned by the server. The caller should not assume
 that name and data are null-terminated strings. If no authorization data was
 returned by the server, the data and data_length fields will be set to NULL
 and zero repectively. The returned Xauth structure must be freed with
-<function>XSecurityFreeXauth</function>; the caller should not use any other
+<xref linkend='XSecurityFreeXauth' xrefstyle='select: title'/>; the caller should not use any other
 means free the structure or any of its components. The auth_id_return
 argument will be filled in with the non-zero authorization id of the created
 authorization.
diff --git a/specs/shm.xml b/specs/shm.xml
index 027aa54..f6ad347 100644
--- a/specs/shm.xml
+++ b/specs/shm.xml
@@ -138,7 +138,7 @@ the net, or in some other environment where the extension will not work.
 To perform this check, call either
 </para>
 
-<funcsynopsis id='xshmqueryextension'>
+<funcsynopsis id='XShmQueryExtension'>
 <funcprototype>
   <funcdef>Status <function>XShmQueryExtension</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -149,7 +149,7 @@ To perform this check, call either
 or
 </para>
 
-<funcsynopsis id='xshmqueryversion'>
+<funcsynopsis id='XShmQueryVersion'>
 <funcprototype>
   <funcdef>Status <function>XShmQueryVersion</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -203,7 +203,7 @@ Use the shared memory XImage, much like a normal one.
 To create a shared memory XImage, use:
 </para>
 
-<funcsynopsis id='xshmcreateimage'>
+<funcsynopsis id='XShmCreateImage'>
 <funcprototype>
   <funcdef>XImage <function>*XShmCreateImage</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -318,7 +318,7 @@ ready for use.
 To write a shared memory XImage into an X drawable, use XShmPutImage:
 </para>
 
-<funcsynopsis id='xshmputimage'>
+<funcsynopsis id='XShmPutImage'>
 <funcprototype>
   <funcdef>Status <function>XShmPutImage </function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -381,7 +381,7 @@ completion event, the results you see on the screen may be inconsistent.
 To read image data into a shared memory XImage, use the following:
 </para>
 
-<funcsynopsis id='xshmgetimage'>
+<funcsynopsis id='XShmGetImage'>
 <funcprototype>
   <funcdef>Status <function>XShmGetImage </function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -424,7 +424,7 @@ format is) and independent of the screen.  Use XShmPixmapFormat to get the
 format for the server:
 </para>
 
-<funcsynopsis id='xshmpixmapformat'>
+<funcsynopsis id='XShmPixmapFormat'>
 <funcprototype>
   <funcdef>int <function>XShmPixmapFormat</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -444,7 +444,7 @@ bytes_per_line value to use.
 Once you have your shminfo structure filled in, simply call:
 </para>
 
-<funcsynopsis id='xshmcreatepixmap'>
+<funcsynopsis id='XShmCreatePixmap'>
 <funcprototype>
   <funcdef>Pixmap <function>XShmCreatePixmap</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
diff --git a/specs/sync.xml b/specs/sync.xml
index 895c7d4..6df45a6 100644
--- a/specs/sync.xml
+++ b/specs/sync.xml
@@ -98,7 +98,7 @@ Consortium.</para>
 
 </bookinfo>
 
-<chapter id="synchronization_protocol">
+<chapter id='Synchronization_Protocol'>
 <title>Synchronization Protocol</title>
 <para>
 The core X protocol makes no guarantees about the relative order of execution
@@ -131,7 +131,7 @@ animation applications to be implemented without any round-trip requests and
 makes best use of buffering within the client, network, and server.
 </para>
 
-<sect1 id="description">
+<sect1 id='Description'>
 <title>Description</title>
 <para>
 The mechanism used by this extension for synchronization within the X
@@ -200,7 +200,7 @@ merely establishes an upper bound for the scope of fence operations.
 </para>
 
 </sect1>
-<sect1 id="types">
+<sect1 id='Types'>
 <title>Types</title>
 <para>
 Please refer to the X11 Protocol specification as this document uses
@@ -325,7 +325,7 @@ state.  Otherwise, the fence is in the not triggered state.
 
 </sect1>
 
-<sect1 id="errors">
+<sect1 id='Errors'>
 <title>Errors</title>
 
 <variablelist>
@@ -359,8 +359,7 @@ does not name a defined FENCE.
 </variablelist>
 
 </sect1>
-<sect1 id="requests">
-
+<sect1 id='Requests'>
 <title>Requests</title>
 
 <variablelist>
@@ -904,7 +903,7 @@ is generated if any member of fence-list does not name a valid fence.
 </variablelist>
 </sect1>
 
-<sect1 id="events">
+<sect1 id='Events'>
 <title>Events</title>
 
 <variablelist>
@@ -962,7 +961,7 @@ is destroyed, or the counter for the alarm is destroyed.
 </sect1>
 </chapter>
 
-<chapter id="encoding">
+<chapter id='Encoding'>
 <title>Encoding</title>
 <para>
 Please refer to the X11 Protocol Encoding document as this section uses
@@ -970,7 +969,7 @@ syntactic conventions established there and references types defined there.
 </para>
 <para>The name of this extension is "SYNC".</para>
 
-<sect1 id="encoding_new_types">
+<sect1 id='Encoding_New_Types'>
 <title>Encoding New Types</title>
 <para>
 The following new types are used by the extension.
@@ -1015,7 +1014,7 @@ groups, the byte ordering determined during connection setup is used.
 </para>
 </sect1>
 
-<sect1 id="encoding_errors">
+<sect1 id='Encoding_Errors'>
 <title>Encoding Errors</title>
 <literallayout class="monospaced">
 <function>Counter</function>
@@ -1046,7 +1045,7 @@ groups, the byte ordering determined during connection setup is used.
 
 </sect1>
 
-<sect1 id="encoding_requests">
+<sect1 id='Encoding_Requests'>
 <title>Encoding Requests</title>
 
 <literallayout class="monospaced">
@@ -1246,7 +1245,7 @@ AwaitFence
 
 </sect1>
 
-<sect1 id="encoding_events">
+<sect1 id='Encoding_Events'>
 <title>Encoding Events</title>
 
 <literallayout class="monospaced">
diff --git a/specs/tog-cup.xml b/specs/tog-cup.xml
index a06d7cc..c8597a6 100644
--- a/specs/tog-cup.xml
+++ b/specs/tog-cup.xml
@@ -254,7 +254,7 @@ No new events or errors are defined by this extension.
 </para>
 
 </chapter>
-<chapter id="Changes_to_existing_protocol_">
+<chapter id='Changes_to_existing_protocol'>
 <title>Changes to existing protocol.</title>
 <para>
 None.
@@ -355,7 +355,7 @@ The include file for this extension is
 <function>&lt;X11/extensions/Xcup.h&gt;</function>.
 </para>
 
-<funcsynopsis id='xcupqueryversion'>
+<funcsynopsis id='XCupQueryVersion'>
 <funcprototype>
   <funcdef>Status <function> XCupQueryVersion</function></funcdef>
   <paramdef>Display*<parameter> display</parameter></paramdef>
@@ -415,7 +415,7 @@ To get the list of reserved colormap entries, use
 XCupGetReservedColormapEntries.
 </para>
 
-<funcsynopsis id='xcupgetreservedcolormapentries'>
+<funcsynopsis id='XCupGetReservedColormapEntries'>
 <funcprototype>
   <funcdef>Status <function> XCupGetReservedColormapEntries</function></funcdef>
   <paramdef>Display*<parameter> display</parameter></paramdef>
@@ -469,7 +469,7 @@ To allocate one or more read-only color cells with RGB values, use
 XCupStoreColors.
 </para>
 
-<funcsynopsis id='xcupstorecolors'>
+<funcsynopsis id='XCupStoreColors'>
 <funcprototype>
   <funcdef>Status <function> XCupStoreColors</function></funcdef>
   <paramdef>Display*<parameter> display</parameter></paramdef>
diff --git a/specs/xtest.xml b/specs/xtest.xml
index e20f06a..121a8d5 100644
--- a/specs/xtest.xml
+++ b/specs/xtest.xml
@@ -241,7 +241,7 @@ not required, respectively.
 </para>
 
 <para>
-<function>XTestSetGContextOfGC</function>
+<olink targetdoc='xtestlib' targetptr='XTestSetGContextOfGC'><function>XTestSetGContextOfGC</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -268,7 +268,7 @@ the value specified by gid.
 </para>
 
 <para>
-<function>XTestSetVisualIDOfVisual</function>
+<olink targetdoc='xtestlib' targetptr='XTestSetVisualIDOfVisual'><function>XTestSetVisualIDOfVisual</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -295,7 +295,7 @@ the value specified by visualid.
 </para>
 
 <para>
-<function>XTestDiscard</function>
+<olink targetdoc='xtestlib' targetptr='XTestDiscard'><function>XTestDiscard</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -581,7 +581,7 @@ error occurs.
 </para>
 
 <para>
-<function>XTestGrabControl</function>
+<olink targetdoc='xtestlib' targetptr='XTestGrabControl'><function>XTestGrabControl</function></olink>
 </para>
 
 <informaltable frame="none">
@@ -694,7 +694,7 @@ the corresponding core protocol event types.
 </literallayout>
 
 <literallayout class="monospaced">
-<function>XTestGrabControl</function>
+<olink targetdoc='xtestlib' targetptr='XTestGrabControl'><function>XTestGrabControl</function></olink>
      1     CARD8               opcode
      1     3                   xtest opcode
      2     2                   request length