4 files changed, 7 insertions, 6 deletions
diff --git a/specs/XKB/ch06.xml b/specs/XKB/ch06.xml
index 0117724b..1ecbcfb1 100644
--- a/specs/XKB/ch06.xml
+++ b/specs/XKB/ch06.xml
@@ -200,7 +200,7 @@ fields in the
 To retrieve one or more components of a keyboard device description, use
 <function>XkbGetKeyboard</function>
  (see also
-<function>XkbGetKeyboardByName</function>).
+<link linkend="XkbGetKeyboardByName"><function>XkbGetKeyboardByName</function></link>).
 
 </para>
 
diff --git a/specs/XKB/ch09.xml b/specs/XKB/ch09.xml
index 9de5e5ea..802c8c79 100644
--- a/specs/XKB/ch09.xml
+++ b/specs/XKB/ch09.xml
@@ -462,7 +462,8 @@ Note that
 <para>
 To determine the current feedback settings of an extension input device, use
 <function>XGetFeedbackControl</function>.
-See the X input extension documentation for more information on
+See <olink targetdoc='inputlib' targetptr='Controlling_Device_Feedback'>the
+X input extension documentation</olink> for more information on
 <function>XGetFeedbackControl</function>
  and related data structures.
 </para>
diff --git a/specs/XKB/ch16.xml b/specs/XKB/ch16.xml
index 7f4031c4..b50c6080 100644
--- a/specs/XKB/ch16.xml
+++ b/specs/XKB/ch16.xml
@@ -65,8 +65,8 @@ and
 <structfield>behaviors</structfield>
  field describes the behavior for each key and is defined in <link linkend="Key_Behavior">section 16.2</link>. The
 <structfield>explicit</structfield>
- field describes the explicit components for a key and is defined in section
-16.3. The
+ field describes the explicit components for a key and is defined in
+<link linkend="Explicit_ComponentsAvoiding_Automatic_Remapping_by_the_Server">section 16.3</link>. The
 <structfield>vmods</structfield>
  and the
 <structfield>vmodmap</structfield>
diff --git a/specs/XKB/ch17.xml b/specs/XKB/ch17.xml
index 752c984e..94dfbbbe 100644
--- a/specs/XKB/ch17.xml
+++ b/specs/XKB/ch17.xml
@@ -1703,7 +1703,7 @@ allocated. The compatibility map is the
 <para>
 <parameter>which</parameter>
  specifies the compatibility map components to be allocated (see
-<function>XkbGetCompatMap</function>,
+<link linkend="XkbGetCompatMap"><function>XkbGetCompatMap</function></link>,
 in <link linkend="Getting_Compatibility_Map_Components_From_the_Server">section 17.2</link>).
 <parameter>which</parameter>
  is an inclusive OR of the bits shown in
@@ -1810,7 +1810,7 @@ To free an entire compatibility map or selected portions of one, use
 <para>
 <parameter>which</parameter>
  specifies the compatibility map components to be freed (see
-<function>XkbGetCompatMap</function>,
+<link linkend="XkbGetCompatMap"><function>XkbGetCompatMap</function></link>,
 in <link linkend="Getting_Compatibility_Map_Components_From_the_Server">section 17.2</link>).
 <parameter>which</parameter>
  is an inclusive OR of the bits shown in