specs/XKB: Remove remaining xref comments

All the places marked by these have been turned into the appropriate
link, xref, or olink tags now.

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

11 files changed, 76 insertions, 76 deletions

diff --git a/specs/XKB/ch01.xml b/specs/XKB/ch01.xml
index 8e447187..86db1919 100644
--- a/specs/XKB/ch01.xml
+++ b/specs/XKB/ch01.xml
@@ -309,7 +309,7 @@ configuration.
 <para>
 The Xkb extension adds a single protocol error,
 <emphasis>BadKeyboard</emphasis>,
-to the core protocol error set. See <link linkend="Protocol_Errors">section 2.6</link> for a discussion of the  <!-- xref -->
+to the core protocol error set. See <link linkend="Protocol_Errors">section 2.6</link> for a discussion of the
 <emphasis>BadKeyboard</emphasis>
  protocol error.
 </para>
diff --git a/specs/XKB/ch02.xml b/specs/XKB/ch02.xml
index 65a214e5..40fbb3a5 100644
--- a/specs/XKB/ch02.xml
+++ b/specs/XKB/ch02.xml
@@ -308,7 +308,7 @@ and the major and minor version numbers of the extension in
 The major opcode is reported in the
 <emphasis>req_major</emphasis>
  fields of some Xkb events. For a discussion of the base event code, see
-<link linkend="Xkb_Event_Types">section 4.1</link>. <!-- xref -->
+<link linkend="Xkb_Event_Types">section 4.1</link>.
 </para>
 
 <para>
diff --git a/specs/XKB/ch04.xml b/specs/XKB/ch04.xml
index a0456129..8e5d110a 100644
--- a/specs/XKB/ch04.xml
+++ b/specs/XKB/ch04.xml
@@ -18,7 +18,7 @@ of which window currently has the keyboard focus and regardless of the grab
 state of the keyboard.<footnote><para>The one exception to this rule is the
 XkbExtensionDeviceNotify event report that is sent when a client attempts to
 use an unsupported feature of an X Input Extension device (see <link linkend="Setting_Xkb_Features_for_Non_KeyClass_Input_Extension_Devices">section 21.4</link>).
-</para></footnote> <!-- xref -->
+</para></footnote>
 </para>
 
 
diff --git a/specs/XKB/ch05.xml b/specs/XKB/ch05.xml
index 3b72824e..c611ba4d 100644
--- a/specs/XKB/ch05.xml
+++ b/specs/XKB/ch05.xml
@@ -168,7 +168,7 @@ The global locked or effective group changes. In this case, the changed group is
 <emphasis>groups_wrap</emphasis>
  field of the
 <emphasis>XkbControlsRec</emphasis>
- structure for the keyboard (see <link linkend="The_GroupsWrap_Control">section 10.7.1</link>). <!-- xref -->
+ structure for the keyboard (see <link linkend="The_GroupsWrap_Control">section 10.7.1</link>).
   </para></listitem>
   <listitem><para>
 
@@ -871,7 +871,7 @@ To track changes in the keyboard state for a particular device, select to receiv
 <function>XkbSelectEvents</function>
  or
 <function>XkbSelectEventDetails</function>
- (see <link linkend="Selecting_Xkb_Events">section 4.3</link>). <!-- xref -->
+ (see <link linkend="Selecting_Xkb_Events">section 4.3</link>).
 </para>
 
 
diff --git a/specs/XKB/ch06.xml b/specs/XKB/ch06.xml
index d6f3de91..ebf0747a 100644
--- a/specs/XKB/ch06.xml
+++ b/specs/XKB/ch06.xml
@@ -276,7 +276,7 @@ The valid masks for
 <para>
 To free the returned keyboard description, use
 <function>XkbFreeKeyboard</function>
- (see <link linkend="Allocating_and_Freeing_a_Keyboard_Description">section 6.4</link>). <!-- xref -->
+ (see <link linkend="Allocating_and_Freeing_a_Keyboard_Description">section 6.4</link>).
 </para>
 
 
@@ -286,7 +286,7 @@ To free the returned keyboard description, use
 
 <para>
 The server can generate events whenever its copy of the keyboard description
-for a device changes. Refer to <link linkend="Tracking_Changes_to_Map_Components">section 14.4</link> for detailed information on  <!-- xref -->
+for a device changes. Refer to <link linkend="Tracking_Changes_to_Map_Components">section 14.4</link> for detailed information on
 tracking changes to the keyboard description.
 </para>
 
diff --git a/specs/XKB/ch07.xml b/specs/XKB/ch07.xml
index ca138006..650534e7 100644
--- a/specs/XKB/ch07.xml
+++ b/specs/XKB/ch07.xml
@@ -229,14 +229,14 @@ applications should need to change the virtual modifier mapping explicitly.
 <para>
 Use
 <function>XkbGetMap</function>
-(see <link linkend="Getting_Map_Components_from_the_Server">section 14.2</link>) to get the virtual modifiers from the server or use  <!-- xref -->
+(see <link linkend="Getting_Map_Components_from_the_Server">section 14.2</link>) to get the virtual modifiers from the server or use
 <function>XkbGetVirtualMods</function>
- (see <link linkend="Obtaining_Virtual_Modifier_Bindings_from_the_Server">section 16.4.1</link>) to update a local copy of the virtual modifiers bindings  <!-- xref -->
+ (see <link linkend="Obtaining_Virtual_Modifier_Bindings_from_the_Server">section 16.4.1</link>) to update a local copy of the virtual modifiers bindings
 from the server. To set the binding of a virtual modifier to a real modifier,
 use
 <function>XkbSetMap</function>
  (see
-<link linkend="Changing_Map_Components_in_the_Server">section 14.3</link><emphasis> <!-- xref -->
+<link linkend="Changing_Map_Components_in_the_Server">section 14.3</link><emphasis>
 )</emphasis>.
 </para>
 
diff --git a/specs/XKB/ch08.xml b/specs/XKB/ch08.xml
index e37f218f..8428d630 100644
--- a/specs/XKB/ch08.xml
+++ b/specs/XKB/ch08.xml
@@ -58,7 +58,7 @@ specific indicators, use
 <function>XkbSetNamedIndicator</function>
  (below). To retrieve indicator names, use
 <function>XkbGetNames</function>
- (<xref linkend="Symbolic_Names" />). <!-- xref -->
+ (<xref linkend="Symbolic_Names" />).
 </para>
 
 
@@ -81,7 +81,7 @@ to inquire about and control most indicator properties and behaviors.
 <para>
 The description for all the Xkb indicators is held in the
 <emphasis>indicators</emphasis>
- field of the complete keyboard description (see <xref linkend="Complete_Keyboard_Description" />), which is defined  <!-- xref -->
+ field of the complete keyboard description (see <xref linkend="Complete_Keyboard_Description" />), which is defined
 as follows:
 </para>
 
@@ -188,7 +188,7 @@ using the functions
 
 <para>
 For more information on the effects of explicit changes to indicators and the
-relationship to the indicator map, see <link linkend="Effects_of_Explicit_Changes_on_Indicators">section 8.4.1</link>. <!-- xref -->
+relationship to the indicator map, see <link linkend="Effects_of_Explicit_Changes_on_Indicators">section 8.4.1</link>.
 </para>
 
 <sect3 id='XkbIndicatorMapRec_flags_field'>
@@ -532,7 +532,7 @@ field specifies what modifiers an indicator watches. The
 <emphasis>mods</emphasis>
  field is an Xkb modifier definition,
 <emphasis>XkbModsRec</emphasis>,
-as described in <link linkend="Modifier_Definitions">section 7.2</link>, which can specify both real and virtual  <!-- xref -->
+as described in <link linkend="Modifier_Definitions">section 7.2</link>, which can specify both real and virtual
 modifiers. The
 <emphasis>mods</emphasis>
  field takes effect even if some or all of the virtual indicators specified in
@@ -574,7 +574,7 @@ Remember that the
 <emphasis>mask</emphasis>
  field is comprised of all of the real modifiers specified in the definition
 plus any real modifiers that are bound to the virtual modifiers specified in
-the definition. (See <xref linkend="Keyboard_State" /> for more information on the keyboard state and  <!-- xref -->
+the definition. (See <xref linkend="Keyboard_State" /> for more information on the keyboard state and
 <xref linkend="Virtual_Modifiers" /> for more information on virtual modifiers.) Use a bitwise inclusive
 OR of the following values to compose a value for
 <emphasis>which_mods</emphasis>:
@@ -707,7 +707,7 @@ The effect on the keyboard modifiers of
  is set (the indicator drives the keyboard) is shown in
 <link linkend="table8.5">Table 8.5</link>. The "New
 State" column refers to the new state to which you set the indicator.
-</para> <!-- xref -->
+</para>
 
 <table id='table8.5' frame='topbot'>
 <title>XkbIndicatorMapRec which_mods and mods, Indicator Drives Keyboard</title>
@@ -797,7 +797,7 @@ The
 <emphasis>ctrls</emphasis>
  field specifies what controls (see <xref linkend="Keyboard_Controls" />) the indicator watches and is
 composed using the bitwise inclusive OR of the following values:
-</para> <!-- xref -->
+</para>
 
 <para><programlisting>
 #define XkbRepeatKeysMask           (1L &lt;&lt; 0)
@@ -1588,11 +1588,11 @@ in <emphasis>map</emphasis>.
 <errorname>BadImplementation</errorname>
  errors. In addition, it can also generate
 <emphasis>XkbIndicatorStateNotify</emphasis>
- (see <link linkend="Tracking_Changes_to_Indicator_State_or_Map">section 8.5</link>), <emphasis> <!-- xref -->
+ (see <link linkend="Tracking_Changes_to_Indicator_State_or_Map">section 8.5</link>), <emphasis>
 XkbIndicatorMapNotify</emphasis>,
 and
 <emphasis>XkbNamesNotify</emphasis>
- events (see <link linkend="Tracking_Name_Changes">section 18.5</link>). <!-- xref -->
+ events (see <link linkend="Tracking_Name_Changes">section 18.5</link>).
 </para>
 
 
@@ -1721,7 +1721,7 @@ s can generate
 <emphasis>XkbIndicatorStateNotify</emphasis>
  and
 <emphasis>XkbIndicatorMapNotify</emphasis>
- events (see <link linkend="Tracking_Changes_to_Indicator_State_or_Map">section 8.5</link>). <!-- xref -->
+ events (see <link linkend="Tracking_Changes_to_Indicator_State_or_Map">section 8.5</link>).
 </para>
 
 
@@ -1745,7 +1745,7 @@ To receive
 <emphasis>XkbIndicatorStateNotify</emphasis>
  events, use
 <function>XkbSelectEvents</function>
- (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) with both the <emphasis> <!-- xref -->
+ (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) with both the <emphasis>
 bits_to_change </emphasis>
 and
 <emphasis>values_for_bits</emphasis>
@@ -1995,7 +1995,7 @@ If the
 <emphasis>indicators</emphasis>
  field, use
 <emphasis>XkbFreeIndicators</emphasis>
- (see <link linkend="Allocating_and_Freeing_Indicator_Maps">section 8.6</link>). <!-- xref -->
+ (see <link linkend="Allocating_and_Freeing_Indicator_Maps">section 8.6</link>).
 </para>
 
 
diff --git a/specs/XKB/ch09.xml b/specs/XKB/ch09.xml
index bf381d79..d21feef4 100644
--- a/specs/XKB/ch09.xml
+++ b/specs/XKB/ch09.xml
@@ -16,7 +16,7 @@ opposed to any other audible sound generated elsewhere in the system.
 <para>
 You can ask to receive
 <emphasis>XkbBellNotify</emphasis>
- events (see <link linkend="Detecting_Bells">section 9.4</link>) when any client rings any one of the following: <!-- xref -->
+ events (see <link linkend="Detecting_Bells">section 9.4</link>) when any client rings any one of the following:
 </para>
 
 <itemizedlist>
@@ -75,7 +75,7 @@ spite of the setting of the
 <function>XkbForceDeviceBell</function>
  or
 <function>XkbForceBell</function>
- (see <link linkend="Forcing_a_Server_Generated_Bell">section 9.3.3</link>). In this case the server does not generate a bell event. <!-- xref -->
+ (see <link linkend="Forcing_a_Server_Generated_Bell">section 9.3.3</link>). In this case the server does not generate a bell event.
 </para>
 
 
@@ -85,7 +85,7 @@ or repeating, Xkb can provide feedback for the controls by using special beep
 codes. The
 <emphasis>AccessXFeedback</emphasis>
  control is used to configure the specific types of operations that generate
-feedback. See <link linkend="The_AccessXFeedback_Control">section 10.6.3</link> for a discussion on <emphasis> <!-- xref -->
+feedback. See <link linkend="The_AccessXFeedback_Control">section 10.6.3</link> for a discussion on <emphasis>
 AccessXFeedback</emphasis>
  control.
 </para>
@@ -204,7 +204,7 @@ bell. This is useful if you need to use an audio server instead of the system
 beep. For example, when an audio client starts, it could disable the audible
 bell (the system bell) and then listen for
 <emphasis>XkbBellNotify</emphasis>
- events (see <link linkend="Detecting_Bells">section 9.4</link>). When it receives a <emphasis> <!-- xref -->
+ events (see <link linkend="Detecting_Bells">section 9.4</link>). When it receives a <emphasis>
 XkbBellNotify</emphasis>
  event, the audio client could then send a request to an audio server to play a
 sound.
@@ -216,7 +216,7 @@ You can control the audible bells feature by passing the
 <emphasis>XkbAudibleBellMask</emphasis>
  to
 <function>XkbChangeEnabledControls</function>
- (see <link linkend="The_EnabledControls_Control">section 10.1.1</link>). If you set <emphasis> <!-- xref -->
+ (see <link linkend="The_EnabledControls_Control">section 10.1.1</link>). If you set <emphasis>
 XkbAudibleBellMask</emphasis>
  on, the server rings the system bell when a bell event occurs. This is the
 default. If you set
@@ -226,12 +226,12 @@ you call
 <function>XkbForceDeviceBell</function>
  or
 <function>XkbForceBell</function>
- (see <link linkend="Forcing_a_Server_Generated_Bell">section 9.3.3</link>). <!-- xref -->
+ (see <link linkend="Forcing_a_Server_Generated_Bell">section 9.3.3</link>).
 </para>
 
 <para>
 Audible bells are also part of the per-client auto-reset controls. For more
-information on auto-reset controls, see <link linkend="The_AutoReset_Control">section 10.1.2</link>. <!-- xref -->
+information on auto-reset controls, see <link linkend="The_AutoReset_Control">section 10.1.2</link>.
 </para>
 
 </sect1>
@@ -1074,7 +1074,7 @@ and
 <emphasis>values_for_bits</emphasis>
  parameters to
 <function>XkbSelectEvents</function>
- (see <link linkend="Selecting_Xkb_Events">section 4.3</link>). <!-- xref -->
+ (see <link linkend="Selecting_Xkb_Events">section 4.3</link>).
 </para>
 
 <para>
diff --git a/specs/XKB/ch10.xml b/specs/XKB/ch10.xml
index 1fd5eac7..632eece5 100644
--- a/specs/XKB/ch10.xml
+++ b/specs/XKB/ch10.xml
@@ -616,10 +616,10 @@ and disable it using either the
 <emphasis>EnabledControls</emphasis>
  control or the
 <emphasis>AutoReset</emphasis>
- control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>. When enabled, protocol requests to  <!-- xref -->
+ control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>. When enabled, protocol requests to
 generate a sound result in the X server actually producing a real sound; when
 disabled, requests to the server to generate a sound are ignored unless the
-sound is forced. See <link linkend="Audible_Bells">section 9.2</link>. <!-- xref -->
+sound is forced. See <link linkend="Audible_Bells">section 9.2</link>.
 </para>
 
 
@@ -663,7 +663,7 @@ control. The
 <emphasis>per_key_repeat</emphasis>
  field of an
 <emphasis>XkbControlsRec</emphasis>
- structure, discussed in <link linkend="The_XkbControlsRec_Structure">section 10.8</link>. <!-- xref -->
+ structure, discussed in <link linkend="The_XkbControlsRec_Structure">section 10.8</link>.
 </para>
 
 
@@ -1148,7 +1148,7 @@ the
 <emphasis>EnabledControls</emphasis>
  control or the
 <emphasis>AutoReset</emphasis>
- control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>.  <!-- xref -->
+ control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>.
 </para>
 
 
@@ -1158,7 +1158,7 @@ should generate when that overlay is enabled, assign it either the
 <emphasis>XkbKB_Overlay1</emphasis>
  or
 <emphasis>XkbKB_Overlay2</emphasis>
- key behaviors, as described in <link linkend="Key_Behavior">section 16.2</link>. <!-- xref -->
+ key behaviors, as described in <link linkend="Key_Behavior">section 16.2</link>.
 </para>
 
 
@@ -1181,9 +1181,9 @@ and disable them using either the
 <emphasis>EnabledControls</emphasis>
  control or the
 <emphasis>AutoReset</emphasis>
- control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>. The individual keys that simulate  <!-- xref -->
+ control discussed in <link linkend="The_EnabledControls_Control">section 10.1.1</link>. The individual keys that simulate
 different aspects of the pointer device are determined by the keyboard mapping,
-discussed in <xref linkend="Xkb_Server_Keyboard_Mapping" />. <!-- xref -->
+discussed in <xref linkend="Xkb_Server_Keyboard_Mapping" />.
 </para>
 
 
@@ -1217,7 +1217,7 @@ or setting the attribute; instead use
 <function>XkbGetControls</function>
  and
 <function>XkbSetControls</function>
- (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>). <!-- xref -->
+ (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>).
 </para>
 
 <note><para>
@@ -1244,7 +1244,7 @@ mouse-pointer key yields one mouse event. When
 <emphasis>XkbSA_MovePtr</emphasis>
  action and the following fields in the
 <emphasis>XkbControlsRec</emphasis>
- structure (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>). <!-- xref -->
+ structure (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>).
 </para>
 
 <table id='table10.2' frame='topbot'>
@@ -1293,7 +1293,7 @@ There are no convenience functions to query or change the attributes of the
 <function>XkbGetControls</function>
  and
 <function>XkbSetControls</function>
- (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>). <!-- xref -->
+ (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>).
 </para>
 
 
@@ -1302,7 +1302,7 @@ The effects of the attributes of the
 <emphasis>MouseKeysAccel</emphasis>
  control depend on whether the
 <emphasis>XkbSA_MovePtr</emphasis>
- action (see <link linkend="Key_Actions">section 16.1</link>) specifies relative or absolute pointer motion. <!-- xref -->
+ action (see <link linkend="Key_Actions">section 16.1</link>) specifies relative or absolute pointer motion.
 </para>
 
 <sect3 id='Absolute_Pointer_Motion'>
@@ -1503,7 +1503,7 @@ Enabling or disabling the keyboard controls through a graphical user interface
 may be impossible for people who need to use the controls. For example, a user
 who needs
 <emphasis>SlowKeys</emphasis>
- (see <link linkend="The_SlowKeys_Control">section 10.6.6</link>) may not even be able to start the graphical application,  <!-- xref -->
+ (see <link linkend="The_SlowKeys_Control">section 10.6.6</link>) may not even be able to start the graphical application,
 let alone use it, if
 <emphasis>SlowKeys</emphasis>
  is not enabled. To allow easier access to some of the controls, the
@@ -1556,9 +1556,9 @@ When the
 
 <para>
 Some of these key sequences optionally generate audible feedback of the change
-in state, as described in <link linkend="The_AccessXFeedback_Control">section 10.6.3</link>, or  <!-- xref -->
+in state, as described in <link linkend="The_AccessXFeedback_Control">section 10.6.3</link>, or
 <emphasis>XkbControlsNotify</emphasis>
- events, described in <link linkend="Tracking_Changes_to_Keyboard_Controls">section 10.11</link>. <!-- xref -->
+ events, described in <link linkend="Tracking_Changes_to_Keyboard_Controls">section 10.11</link>.
 </para>
 
 </sect2>
@@ -1590,7 +1590,7 @@ When a timeout as specified by
 <emphasis>XkbControlsNotify</emphasis>
  event. For more information on
 <emphasis>XkbControlsNotify</emphasis>
- events, refer to <link linkend="Tracking_Changes_to_Keyboard_Controls">section 10.11</link>. <!-- xref -->
+ events, refer to <link linkend="Tracking_Changes_to_Keyboard_Controls">section 10.11</link>.
 </para>
 
 
@@ -1711,7 +1711,7 @@ The parameters
 <emphasis>ax_options</emphasis>,
 which is a field in the
 <emphasis>XkbControlsRec</emphasis>
- structure (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>).  <!-- xref -->
+ structure (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>).
 <function>XkbGetAccessXTimeout</function>
 returns
 <symbol>True</symbol>
@@ -1845,7 +1845,7 @@ for the
 <emphasis>ax_options</emphasis>
  field of an
 <emphasis>XkbDescRec</emphasis>
- (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>). <!-- xref -->
+ (see <link linkend="The_XkbControlsRec_Structure">section 10.8</link>).
 </para>
 
 
@@ -1887,7 +1887,7 @@ on or off by modifying the following bits in the
 <emphasis>XkbControlsRec</emphasis>
  structure and using
 <function>XkbSetControls</function>
- (see <link linkend="Changing_Controls">section 10.10</link>): <!-- xref -->
+ (see <link linkend="Changing_Controls">section 10.10</link>):
 </para>
 
 <table id='table10.3' frame='topbot'>
@@ -2000,7 +2000,7 @@ pitch. In these cases, use the
 <para>
 When any of the above feedbacks occur, Xkb may generate a
 <emphasis>XkbBellNotify</emphasis>
- event (see <link linkend="Detecting_Bells">section 9.4</link>). <!-- xref -->
+ event (see <link linkend="Detecting_Bells">section 9.4</link>).
 </para>
 
 
@@ -2113,7 +2113,7 @@ To receive
 <emphasis>XkbAccessXNotify</emphasis>
  events under all possible conditions, use
 <function>XkbSelectEvents</function>
- (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass <emphasis> <!-- xref -->
+ (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass <emphasis>
 XkbAccesXNotifyMask</emphasis>
  in both
 <emphasis>bits_to_change</emphasis>
@@ -2219,7 +2219,7 @@ locking, or unlocking of modifiers using
 <symbol>KeyRelease</symbol>
  events, though the auto-repeat can be detected using
 <emphasis>DetectableAutorepeat</emphasis>
- (see <link linkend="The_DetectableAutorepeat_Control">section 10.3.3</link>). Finally, <emphasis> <!-- xref -->
+ (see <link linkend="The_DetectableAutorepeat_Control">section 10.3.3</link>). Finally, <emphasis>
 MouseKeys</emphasis>
  generates pointer events identical to those of the core pointer device.
 </para>
@@ -2253,7 +2253,7 @@ When the
 acceptance or rejection, and release of any key to interested clients by
 sending an appropriate
 <emphasis>AccessXNotify</emphasis>
- event (see <link linkend="AccessXNotify_Events">section 10.6.4</link>). <!-- xref -->
+ event (see <link linkend="AccessXNotify_Events">section 10.6.4</link>).
 </para>
 
 <para>
@@ -2433,7 +2433,7 @@ When the
  control is active, the server reports acceptance or rejection of any key to
 interested clients by sending an appropriate
 <emphasis>AccessXNotify</emphasis>
- event (see <link linkend="AccessXNotify_Events">section 10.6.4</link>). <!-- xref -->
+ event (see <link linkend="AccessXNotify_Events">section 10.6.4</link>).
 </para>
 
 
@@ -3018,10 +3018,10 @@ There are no convenience functions for manipulating the
 <function>XkbSetControls</function>
  and
 <function>XkbGetControls</function>
- (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>) to query and change this control. <!-- xref -->
+ (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>) to query and change this control.
 </para>
 
-<note><para>See also <link linkend="Per_Key_Group_Information">section 15.3.2</link> or a discussion of the related field,  <!-- xref -->
+<note><para>See also <link linkend="Per_Key_Group_Information">section 15.3.2</link> or a discussion of the related field,
 <emphasis>group_info</emphasis>,
 which also normalizes a group under certain circumstances.</para></note>
 
@@ -3060,7 +3060,7 @@ Manipulate the
 <function>XkbSetControls</function>
  and
 <function>XkbGetControls</function>
- (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>) to query and change this control. Alternatively,  <!-- xref -->
+ (see <link linkend="Querying_Controls">section 10.9</link> and <link linkend="Changing_Controls">section 10.10</link>) to query and change this control. Alternatively,
 use
 <function>XkbSetIgnoreLockMods</function>.
 </para>
@@ -3205,7 +3205,7 @@ be added and removed from the server’s
  are removed from the server’s
 <emphasis>IgnoreLockMods</emphasis>
  control.
-See <link linkend="Virtual_Modifier_Names_and_Masks">section 7.1</link> for a discussion of virtual modifier masks to use in <emphasis> <!-- xref -->
+See <link linkend="Virtual_Modifier_Names_and_Masks">section 7.1</link> for a discussion of virtual modifier masks to use in <emphasis>
 affect_virtual</emphasis>
  and
 <emphasis>virtual_values</emphasis>.
@@ -3233,7 +3233,7 @@ passive grabs.
 Because
 <emphasis>IgnoreGroupLock</emphasis>
  is a boolean control with no attributes, use the general boolean controls
-functions (see <link linkend="Controls_that_Enable_and_Disable_Other_Controls">section 10.1</link>) to change its state. <!-- xref -->
+functions (see <link linkend="Controls_that_Enable_and_Disable_Other_Controls">section 10.1</link>) to change its state.
 </para>
 
 
@@ -3404,7 +3404,7 @@ selected by both
  but not by
 <emphasis>virtual_values</emphasis>
  are removed from the server’s internal modifiers control.
-See <link linkend="Virtual_Modifier_Names_and_Masks">section 7.1</link> for a discussion of virtual modifier masks to use in <emphasis> <!-- xref -->
+See <link linkend="Virtual_Modifier_Names_and_Masks">section 7.1</link> for a discussion of virtual modifier masks to use in <emphasis>
 affect_virtual</emphasis>
  and
 <emphasis>virtual_values</emphasis>.
@@ -3882,7 +3882,7 @@ computed automatically by the server whenever the keyboard mapping changes.
 <emphasis>groups_wrap</emphasis>
  is an attribute of the
 <emphasis>GroupsWrap</emphasis>
- control (see <link linkend="The_GroupsWrap_Control">section 10.7.1</link>). It specifies the handling of illegal groups on a  <!-- xref -->
+ control (see <link linkend="The_GroupsWrap_Control">section 10.7.1</link>). It specifies the handling of illegal groups on a
 global basis. Valid values for
 <emphasis>groups_wrap</emphasis>
  are shown in <link linkend="table10.8">Table 10.8</link>.
@@ -3934,7 +3934,7 @@ its four low-order bits specify the index of the group to use.
 <emphasis>internal</emphasis>
  is an attribute of the
 <emphasis>InternalMods</emphasis>
- control (see <link linkend="The_InternalMods_Control">section 10.7.4</link>). It specifies modifiers to be consumed in the  <!-- xref -->
+ control (see <link linkend="The_InternalMods_Control">section 10.7.4</link>). It specifies modifiers to be consumed in the
 server and not passed on to clients when events are reported. Valid values
 consist of any combination of the eight core modifier bits:
 <symbol>ShiftMask</symbol>,
@@ -3954,7 +3954,7 @@ consist of any combination of the eight core modifier bits:
 <emphasis>ignore_lock</emphasis>
  is an attribute of the
 <emphasis>IgnoreLockMods</emphasis>
- control (see <link linkend="The_IgnoreLockMods_Control">section 10.7.2</link>). It specifies modifiers to be ignored in grab  <!-- xref -->
+ control (see <link linkend="The_IgnoreLockMods_Control">section 10.7.2</link>). It specifies modifiers to be ignored in grab
 calculations. Valid values consist of any combination of the eight core
 modifier bits:
 <symbol>ShiftMask</symbol>,
@@ -3974,7 +3974,7 @@ modifier bits:
 <emphasis>enabled_ctrls</emphasis>
  is an attribute of the
 <emphasis>EnabledControls</emphasis>
- control (see <link linkend="The_EnabledControls_Control">section 10.1.1</link>). It contains one bit per boolean control. Each  <!-- xref -->
+ control (see <link linkend="The_EnabledControls_Control">section 10.1.1</link>). It contains one bit per boolean control. Each
 bit determines whether the corresponding control is enabled or disabled; a one
 bit means the control is enabled. The mask bits used to enable these controls
 are listed in <link linkend="table10.7">Table 10.7</link>,
@@ -3994,7 +3994,7 @@ using only those masks with "ok" in the
 <emphasis>repeat_interval</emphasis>
  are attributes of the
 <emphasis>RepeatKeys</emphasis>
- control (see <link linkend="The_RepeatKeys_Control">section 10.3.2</link>). <emphasis> <!-- xref -->
+ control (see <link linkend="The_RepeatKeys_Control">section 10.3.2</link>). <emphasis>
 repeat_delay</emphasis>
  is the initial delay before a key begins repeating, in milliseconds;
 <emphasis>repeat_interval</emphasis>
@@ -4010,7 +4010,7 @@ repeat_delay</emphasis>
 <emphasis>slow_keys_delay</emphasis>
  is an attribute of the
 <emphasis>SlowKeys</emphasis>
- control (see <link linkend="The_SlowKeys_Control">section 10.6.6</link>). Its value specifies the <emphasis> <!-- xref -->
+ control (see <link linkend="The_SlowKeys_Control">section 10.6.6</link>). Its value specifies the <emphasis>
 SlowKeys</emphasis>
  acceptance delay period in milliseconds before a key press is accepted by the
 server.
@@ -4025,7 +4025,7 @@ server.
 <emphasis>debounce_delay</emphasis>
  is an attribute of the
 <emphasis>BounceKeys</emphasis>
- control (see <link linkend="The_BounceKeys_Control">section 10.6.7</link>). Its value specifies the <emphasis> <!-- xref -->
+ control (see <link linkend="The_BounceKeys_Control">section 10.6.7</link>). Its value specifies the <emphasis>
 BounceKeys</emphasis>
  delay period in milliseconds for which the key is disabled after having been
 pressed before another press of the same key is accepted by the server.
@@ -4045,7 +4045,7 @@ and
 <emphasis>mk_curve</emphasis>
  are attributes of the
 <emphasis>MouseKeysAccel</emphasis>
- control. Refer to <link linkend="The_MouseKeysAccel_Control">section 10.5.2</link> for a description of these fields and the  <!-- xref -->
+ control. Refer to <link linkend="The_MouseKeysAccel_Control">section 10.5.2</link> for a description of these fields and the
 units involved.
 </para>
 
@@ -4059,9 +4059,9 @@ The
 <emphasis>ax_options</emphasis>
  field contains attributes used to configure two different controls, the
 <emphasis>StickyKeys</emphasis>
- control (see <link linkend="The_StickyKeys_Control">section 10.6.8</link>) and the <emphasis> <!-- xref -->
+ control (see <link linkend="The_StickyKeys_Control">section 10.6.8</link>) and the <emphasis>
 AccessXFeedback</emphasis>
- control (see <link linkend="The_AccessXFeedback_Control">section 10.6.3</link>). The <emphasis> <!-- xref -->
+ control (see <link linkend="The_AccessXFeedback_Control">section 10.6.3</link>). The <emphasis>
 ax_options</emphasis>
  field is a bitmask and may include any combination of the bits defined in
 <link linkend="table10.9">Table 10.9</link>.
@@ -4263,7 +4263,7 @@ and
 <emphasis>axt_ctrls_values</emphasis>
  are attributes of the
 <emphasis>AccessXTimeout</emphasis>
- control. Refer to <link linkend="The_AccessXTimeout_Control">section 10.6.2</link> for a description of these fields and the  <!-- xref -->
+ control. Refer to <link linkend="The_AccessXTimeout_Control">section 10.6.2</link> for a description of these fields and the
 units involved.
 </para>
 
@@ -4563,7 +4563,7 @@ the corresponding values are still updated in the X server. For example, the
  set in
 <emphasis>enabled_ctrls</emphasis>
 ). It is permissible to modify the attributes of a control in one call to
-XkbSetControls and enable the control in a subsequent call. See <link linkend="The_EnabledControls_Control">section 10.1.1</link>  <!-- xref -->
+XkbSetControls and enable the control in a subsequent call. See <link linkend="The_EnabledControls_Control">section 10.1.1</link>
 for more information on enabling and disabling controls.
 </para>
 
@@ -4585,7 +4585,7 @@ Because this is somewhat awkward if all you want to do is enable and disable
 controls, and not modify any of their attributes, a convenience function is
 also provided for this purpose (
 <function>XkbChangeEnabledControls</function>,
-<link linkend="The_EnabledControls_Control">section 10.1.1</link>). <!-- xref -->
+<link linkend="The_EnabledControls_Control">section 10.1.1</link>).
 </para>
 
 
@@ -5001,7 +5001,7 @@ results into the
 <emphasis>ctrls</emphasis>
  field, use
 <function>XkbFreeControls</function>
- (see <link linkend="Allocating_and_Freeing_an_XkbControlsRec">section 10.12</link>). <!-- xref -->
+ (see <link linkend="Allocating_and_Freeing_an_XkbControlsRec">section 10.12</link>).
 </para>
 
 
diff --git a/specs/XKB/ch14.xml b/specs/XKB/ch14.xml
index 11fa9c0f..8ebab299 100644
--- a/specs/XKB/ch14.xml
+++ b/specs/XKB/ch14.xml
@@ -194,14 +194,14 @@ type and specifies the modifier combinations necessary to access each level.
 For example, Xkb allows key types where the
 <symbol>Control</symbol>
  modifier can be used to access the shift level two of a key. Key types are in
-the client map component and are described in detail in <link linkend="Key_Types">section 15.2</link>. <!-- xref -->
+the client map component and are described in detail in <link linkend="Key_Types">section 15.2</link>.
 </para>
 
 
 <para>
 Xkb provides precise specification of the behavior of a key using key
 behaviors. Key behaviors are in the server map component and are described in
-detail in <link linkend="Key_Behavior">section 16.2</link>. <!-- xref -->
+detail in <link linkend="Key_Behavior">section 16.2</link>.
 </para>
 
 
diff --git a/specs/XKB/ch17.xml b/specs/XKB/ch17.xml
index e003a919..f627e8f7 100644
--- a/specs/XKB/ch17.xml
+++ b/specs/XKB/ch17.xml
@@ -136,7 +136,7 @@ contained in an
  structure; plus a set of explicit override controls used to prevent particular
 components of type 2 (core-to-Xkb keyboard mapping) transformations from
 automatically occurring. These explicit override controls are maintained in a
-separate data structure discussed in <link linkend="Explicit_ComponentsAvoiding_Automatic_Remapping_by_the_Server">section 16.3</link>. <!-- xref -->
+separate data structure discussed in <link linkend="Explicit_ComponentsAvoiding_Automatic_Remapping_by_the_Server">section 16.3</link>.
 </para>