1 - fix the capitolization 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>

20 files changed, 267 insertions, 267 deletions

diff --git a/specs/appA.xml b/specs/appA.xml
index 6bb0dbe..18050eb 100644
--- a/specs/appA.xml
+++ b/specs/appA.xml
@@ -1,7 +1,7 @@
 <appendix id='default_symbol_transformations'>
 <title>Default Symbol Transformations</title>
 
-<sect1 id='interpreting_the_control_modifier'>
+<sect1 id='Interpreting_the_Control_Modifier'>
 <title>Interpreting the Control Modifier</title>
 
 <para>
@@ -130,7 +130,7 @@ not listed in this table are application-specific.
 </informaltable>
 
 </sect1>
-<sect1 id='interpreting_the_lock_modifier'>
+<sect1 id='Interpreting_the_Lock_Modifier'>
 <title>Interpreting the Lock Modifier</title>
 
 <para>
@@ -144,7 +144,7 @@ Control</emphasis>
 returned by the event.
 </para>
 
-<sect2 id='locale_sensitive_capitalization'>
+<sect2 id='Locale_Sensitive_Capitalization'>
 <title>Locale-Sensitive Capitalization</title>
 
 <para>
@@ -158,7 +158,7 @@ state of the user environment (e.g. locale) into account.
 
 
 </sect2>
-<sect2 id='locale_insensitive_capitalization'>
+<sect2 id='Locale_Insensitive_Capitalization'>
 <title>Locale-Insensitive Capitalization</title>
 
 <para>
@@ -175,12 +175,12 @@ capitalization behavior. Any keysyms not explicitly listed in these tables are
 not capitalized by XKB when locale-insensitive capitalization is in effect and
 are not automatically assigned the <emphasis>
 ALPHABETIC</emphasis>
- type as described in the <link linkend="the_alphabetic_key_type">Alphabetic Key Type</link>.
+ type as described in the <link linkend='The_ALPHABETIC_Key_Type'>Alphabetic Key Type</link>.
 </para>
 
 
-<sect3 id='capitalization_rules_for_latin_1_keysyms'>
-<title>Capitalization Rules for Latin-1 Keysyms	</title>
+<sect3 id='Capitalization_Rules_for_Latin_1_Keysyms'>
+<title>Capitalization Rules for Latin-1 Keysyms</title>
 
 <para>
 This table lists the Latin-11 keysyms for which XKB defines upper and lower
@@ -355,7 +355,7 @@ case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_latin_2_keysyms'>
+<sect3 id='Capitalization_Rules_for_Latin_2_Keysyms'>
 <title>Capitalization Rules for Latin-2 Keysyms</title>
 
 <para>
@@ -458,7 +458,7 @@ This table lists the Latin-2 keysyms for which XKB defines upper and lower case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_latin_3_keysyms'>
+<sect3 id='Capitalization_Rules_for_Latin_3_Keysyms'>
 <title>Capitalization Rules for Latin-3 Keysyms</title>
 
 <para>
@@ -521,7 +521,7 @@ This table lists the Latin-3 keysyms for which XKB defines upper and lower case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_latin_4_keysyms'>
+<sect3 id='Capitalization_Rules_for_Latin_4_Keysyms'>
 <title>Capitalization Rules for Latin-4 Keysyms</title>
 
 <para>
@@ -600,7 +600,7 @@ This table lists the Latin-4 keysyms for which XKB defines upper and lower case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_cyrillic_keysyms'>
+<sect3 id='Capitalization_Rules_for_Cyrillic_Keysyms'>
 <title>Capitalization Rules for Cyrillic Keysyms</title>
 
 <para>
@@ -766,7 +766,7 @@ case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_greek_keysyms'>
+<sect3 id='Capitalization_Rules_for_Greek_Keysyms'>
 <title>Capitalization Rules for Greek Keysyms</title>
 
 <para>
@@ -895,7 +895,7 @@ This table lists the Greek keysyms for which XKB defines upper and lower case:
 </informaltable>
 
 </sect3>
-<sect3 id='capitalization_rules_for_other_keysyms'>
+<sect3 id='Capitalization_Rules_for_Other_Keysyms'>
 <title>Capitalization Rules for Other Keysyms</title>
 
 <para>
diff --git a/specs/appB.xml b/specs/appB.xml
index 179d88c..85137cf 100644
--- a/specs/appB.xml
+++ b/specs/appB.xml
@@ -1,9 +1,9 @@
 <appendix id='canonical_key_types'>
 <title>Canonical Key Types</title>
 
-<sect1 id='canonical_key_types2'>
+<sect1 id='Canonical_Key_Types'>
 <title>Canonical Key Types</title>
-<sect2 id='the_one_level_key_type'>
+<sect2 id='The_ONE_LEVEL_Key_Type'>
 <title>The ONE_LEVEL Key Type</title>
 
 <para>
@@ -15,7 +15,7 @@ ONE_LEVEL</emphasis>
 </para>
 
 </sect2>
-<sect2 id='the_two_level_key_type'>
+<sect2 id='The_TWO_LEVEL_Key_Type'>
 <title>The TWO_LEVEL Key Type</title>
 
 <para>
@@ -33,7 +33,7 @@ Shift</emphasis>
 
 
 </sect2>
-<sect2 id='the_alphabetic_key_type'>
+<sect2 id='The_ALPHABETIC_Key_Type'>
 <title>The ALPHABETIC Key Type</title>
 
 <para>
@@ -87,7 +87,7 @@ Lock</emphasis>
 </itemizedlist>
 
 </sect2>
-<sect2 id='the_keypad_key_type'>
+<sect2 id='The_KEYPAD_Key_Type'>
 <title>The KEYPAD Key Type</title>
 
 <para>
diff --git a/specs/appC.xml b/specs/appC.xml
index d34c9a6..ec37d35 100644
--- a/specs/appC.xml
+++ b/specs/appC.xml
@@ -1,9 +1,9 @@
 <appendix id='new_keysyms'>
 <title>New KeySyms</title>
 
-<sect1 id='new_keysymsb'>
+<sect1 id='New_KeySyms'>
 <title>New KeySyms</title>
-<sect2 id='keysyms_used_by_the_iso9995_standard'>
+<sect2 id='KeySyms_Used_by_the_ISO9995_Standard'>
 <title>KeySyms Used by the ISO9995 Standard</title>
 <informaltable frame='none'>
 <tgroup cols='4'>
@@ -241,7 +241,7 @@
 </informaltable>
 
 </sect2>
-<sect2 id='keysyms_used_to_control_the_core_pointer'>
+<sect2 id='KeySyms_Used_to_Control_The_Core_Pointer'>
 <title>KeySyms Used to Control The Core Pointer</title>
 <informaltable frame='none'>
 <tgroup cols='4'>
@@ -443,7 +443,7 @@
 </informaltable>
 
 </sect2>
-<sect2 id='keysyms_used_to_change_keyboard_controls'>
+<sect2 id='KeySyms_Used_to_Change_Keyboard_Controls'>
 <title>KeySyms Used to Change Keyboard Controls</title>
 <informaltable frame='none'>
 <tgroup cols='4'>
@@ -531,7 +531,7 @@
 </informaltable>
 
 </sect2>
-<sect2 id='keysyms_used_to_control_the_server'>
+<sect2 id='KeySyms_Used_To_Control_The_Server'>
 <title>KeySyms Used To Control The Server</title>
 <informaltable frame='none'>
 <tgroup cols='4'>
@@ -583,7 +583,7 @@
 </informaltable>
 
 </sect2>
-<sect2 id='keysyms_for_non_spacing_diacritical_keys'>
+<sect2 id='KeySyms_for_Non_Spacing_Diacritical_Keys'>
 <title>KeySyms for Non-Spacing Diacritical Keys</title>
 <informaltable frame='none'>
 <tgroup cols='4'>
diff --git a/specs/appD.xml b/specs/appD.xml
index abda53c..5251cb4 100644
--- a/specs/appD.xml
+++ b/specs/appD.xml
@@ -1,7 +1,7 @@
 <appendix id='protocol_encoding'>
 <title>Protocol Encoding</title>
 
-<sect1 id='syntactic_conventions'>
+<sect1 id='Syntactic_Conventions'>
 <title>Syntactic Conventions</title>
 
 <para>
@@ -123,7 +123,7 @@ for example, the size of the previous structure is written as "4+[4]" bytes.
 
 
 </sect1>
-<sect1 id='common_types2'>
+<sect1 id='appD::Common_Types'>
 <title>Common Types</title>
 <literallayout class='monospaced'>
 SETofKB_EVENTTYPE
@@ -481,7 +481,7 @@ p               unused,p=pad(2+l)
 </literallayout>
 
 </sect1>
-<sect1 id='errors2'>
+<sect1 id='appD::Errors'>
 <title>Errors</title>
 
 <literallayout class='monospaced'>1     0          Error
@@ -501,7 +501,7 @@ class, or feedback
 </literallayout>
 
 </sect1>
-<sect1 id='key_actions2'>
+<sect1 id='appD::Key_Actions'>
 <title>Key Actions</title>
 
 <literallayout class='monospaced'>1     0          type
@@ -733,7 +733,7 @@ class, or feedback
 </literallayout>
 
 </sect1>
-<sect1 id='key_behaviors'>
+<sect1 id='Key_Behaviors'>
 <title>Key Behaviors</title>
 
 <literallayout class='monospaced'>1     #x00          type
@@ -773,7 +773,7 @@ class, or feedback
 </literallayout>
 
 </sect1>
-<sect1 id='requests2'>
+<sect1 id='appD::Requests'>
 <title>Requests</title>
 
 <literallayout class='monospaced'>1     ??          opcode
@@ -1884,7 +1884,7 @@ p               unused, p=pad(n)
 
 
 </sect1>
-<sect1 id='events2'>
+<sect1 id='appD::Events'>
 <title>Events</title>
 
 <literallayout class='monospaced'>1     ??          code
diff --git a/specs/ch01.xml b/specs/ch01.xml
index 7bf0ef4..27dcc88 100644
--- a/specs/ch01.xml
+++ b/specs/ch01.xml
@@ -1,4 +1,4 @@
-<chapter id='overview'>
+<chapter id='Overview'>
 <title>Overview</title>
 <para>
 This extension provides a number of new capabilities and controls for
@@ -85,7 +85,7 @@ keyboard. The following sections describe the new capabilities of the extension
 and the effect of the extension on core protocol requests, events and errors.
 </para>
 
-<sect1 id='conventions_and_assumptions'>
+<sect1 id='Conventions_and_Assumptions'>
 <title>Conventions and Assumptions</title>
 <para>
 This document uses the syntactic
diff --git a/specs/ch02.xml b/specs/ch02.xml
index ab7aa23..0234297 100644
--- a/specs/ch02.xml
+++ b/specs/ch02.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_state'>
+<chapter id='Keyboard_State'>
 <title>Keyboard State</title>
 <para>
 The core protocol description of
@@ -73,7 +73,7 @@ a single keyboard, or to access less-commonly used symbols within a character
 set.
 </para>
 
-<sect1 id='locking_and_latching_modifiers_and_groups'>
+<sect1 id='Locking_and_Latching_Modifiers_and_Groups'>
 <title>Locking and Latching Modifiers and Groups</title>
 <para>
 With the core protocol, there is no way to
@@ -89,7 +89,7 @@ groups apply only to the next key event that does not change keyboard state.
 </para>
 
 </sect1>
-<sect1 id="fundamental_components_of_xkb_keyboard_state">
+<sect1 id='Fundamental_Components_of_XKB_Keyboard_State'>
 <title>Fundamental Components of XKB Keyboard State</title>
 <para>
 The fundamental components of XKB keyboard state include:
@@ -128,7 +128,7 @@ only</emphasis>
  in response to keyboard or pointer activity.
 </para>
 
-<sect2 id='computing_effective_modifier_and_group'>
+<sect2 id='Computing_Effective_Modifier_and_Group'>
 <title>Computing Effective Modifier and Group</title>
 <para>
 The effective modifiers and group
@@ -211,7 +211,7 @@ GroupsWrap</emphasis>
 
 </sect2>
 
-<sect2 id='computing_a_state_field_from_an_xkb_state'>
+<sect2 id='Computing_A_State_Field_from_an_XKB_State'>
 <title>Computing A State Field from an XKB State</title>
 <para>
 Many events report the keyboard state
@@ -253,7 +253,7 @@ modifiers and the pointer button state.
 </sect2>
 </sect1>
 
-<sect1 id='derived_components_of_xkb_keyboard_state'>
+<sect1 id='Derived_Components_of_XKB_Keyboard_State'>
 <title>Derived Components of XKB Keyboard State</title>
 <para>
 In addition to the fundamental state
@@ -273,7 +273,7 @@ ServerInternalModifiers</emphasis>
 IgnoreLocksModifiers</emphasis>
  and <emphasis>
 IgnoreGroupLock</emphasis>
- controls, described in <link linkend='server_internal_modifiers_and_ignore_locks_behavior'>Server
+ controls, described in <link linkend='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>Server
 Internal Modifiers and Ignore Locks Behavior</link>, to derive these two
 states as follows:
 </para>
@@ -295,7 +295,7 @@ effects of any locked groups.
 </listitem>
 </itemizedlist>
 
-<sect2 id='server_internal_modifiers_and_ignore_locks_behavior'>
+<sect2 id='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>
 <title>Server Internal Modifiers and Ignore Locks Behavior</title>
 <para>
 The core protocol does not provide any
@@ -348,14 +348,14 @@ this behavior without exhaustively grabbing every possible modifier combination.
 
 </sect2>
 </sect1>
-<sect1 id='compatibility_components_of_keyboard_state'>
+<sect1 id='Compatibility_Components_of_Keyboard_State'>
 <title>Compatibility Components of Keyboard State</title>
 <para>
 The core protocol interpretation of
 keyboard modifiers does not include direct support for multiple groups, so XKB
 reports the effective keyboard group to XKB-aware clients using some of the
 reserved bits in the state field of some core protocol events, as described in
-<link linkend='computing_a_state_field_from_an_xkb_state'>Computing A State Field from an
+<link linkend='Computing_A_State_Field_from_an_XKB_State'>Computing A State Field from an
 XKB State</link>.
 </para>
 
@@ -363,7 +363,7 @@ XKB State</link>.
 This modified state field would not be interpreted correctly by XKB-unaware
 clients, so XKB provides a <emphasis>
 group compatibility mapping</emphasis>
-(see <link linkend='group_compatibility_map'>Group Compatibility Map</link>) which
+(see <link linkend='Group_Compatibility_Map'>Group Compatibility Map</link>) which
 remaps the keyboard group into a core modifier mask that has similar effects,
 when possible. XKB maintains three compatibility state components that are used
 to make non-XKB clients work as well as possible:
@@ -398,7 +398,7 @@ of the grab state.
 
 <para>
 Compatibility states are essentially the corresponding XKB state, but with
-keyboard group possibly encoded as one or more modifiers; <link linkend='group_compatibility_map'>Group Compatibility Map</link> describes
+keyboard group possibly encoded as one or more modifiers; <link linkend='Group_Compatibility_Map'>Group Compatibility Map</link> describes
 the group compatibility map, which specifies the modifier(s) that correspond to
 each keyboard group.
 </para>
diff --git a/specs/ch03.xml b/specs/ch03.xml
index e9ac99c..d71f353 100644
--- a/specs/ch03.xml
+++ b/specs/ch03.xml
@@ -1,4 +1,4 @@
-<chapter id='virtual_modifiers'>
+<chapter id='Virtual_Modifiers'>
 <title>Virtual Modifiers</title>
 <para>
 The core protocol specifies that
@@ -80,7 +80,7 @@ XKB puts most aspects of the keyboard under user or program control, so it is
 even more important to clearly and uniformly refer to modifiers by function.
 </para>
 
-<sect1 id='modifier_definitions'>
+<sect1 id='Modifier_Definitions'>
 <title>Modifier Definitions</title>
 <para>
 Use an <emphasis>
@@ -156,7 +156,7 @@ Meta</emphasis>.
 </para>
 
 
-<sect2 id='inactive_modifier_definitions'>
+<sect2 id='Inactive_Modifier_Definitions'>
 <title>Inactive Modifier Definitions</title>
 <para>
 Some XKB structures ignore modifier
@@ -182,7 +182,7 @@ virtual modifiers are bound.
 </sect2>
 </sect1>
 
-<sect1 id='virtual_modifier_mapping'>
+<sect1 id='Virtual_Modifier_Mapping'>
 <title>Virtual Modifier Mapping</title>
 <para>
 XKB maintains a <emphasis>
@@ -212,7 +212,7 @@ NumLock</emphasis>
 
 <para>
 The virtual modifier mapping is normally updated automatically whenever actions
-are assigned to keys (see <link linkend='changing_the_keyboard_mapping_using_the_core_protocol'>Changing
+are assigned to keys (see <link linkend='Changing_the_Keyboard_Mapping_Using_the_Core_Protocol'>Changing
 the Keyboard Mapping Using the Core Protocol</link> for details) and few
 applications should need to change the virtual modifier mapping explicitly.
 </para>
diff --git a/specs/ch04.xml b/specs/ch04.xml
index ab1547a..4d804e2 100644
--- a/specs/ch04.xml
+++ b/specs/ch04.xml
@@ -1,4 +1,4 @@
-<chapter id='global_keyboard_controls'>
+<chapter id='Global_Keyboard_Controls'>
 <title>Global Keyboard Controls</title>
 
 <para>
@@ -15,7 +15,7 @@ Wisconsin-Madison WI 53705-2280. Phone: 608-262-6966. e-mail:
 info@trace.wisc.edu.</para></footnote>.
 </para>
 
-<sect1 id='the_repeatkeys_control'>
+<sect1 id='The_RepeatKeys_Control'>
 <title>The RepeatKeys Control</title>
 
 <para>
@@ -43,7 +43,7 @@ milliseconds.
 </para>
 
 
-<sect2 id='the_perkeyrepeat_control'>
+<sect2 id='The_PerKeyRepeat_Control'>
 <title>The PerKeyRepeat Control</title>
 
 <para>
@@ -63,7 +63,7 @@ GetKeyboardControl</emphasis>
 
 
 </sect2>
-<sect2 id='detectable_autorepeat'>
+<sect2 id='Detectable_Autorepeat'>
 <title>Detectable Autorepeat</title>
 
 <para>
@@ -99,7 +99,7 @@ whether or not it is supported.
 
 
 <para>
-<link linkend='querying_and_changing_per_client_flags'>Querying and Changing Per-Client
+<link linkend='Querying_and_Changing_Per_Client_Flags'>Querying and Changing Per-Client
 Flags</link> describes the <emphasis>
 XkbPerClientFlags</emphasis>
  request, which reports or changes values for all of the per-client flags, and
@@ -109,7 +109,7 @@ which lists the per-client flags that are supported.
 
 </sect2>
 </sect1>
-<sect1 id='the_slowkeys_control'>
+<sect1 id='The_SlowKeys_Control'>
 <title>The SlowKeys Control</title>
 
 <para>
@@ -148,11 +148,11 @@ rejection or release of any key to interested clients using <emphasis>
 AccessXNotify</emphasis>
  events. The <emphasis>
 AccessXNotify</emphasis>
- event is described in more detail in <link linkend='events'>Events</link>.
+ event is described in more detail in <link linkend='Events'>Events</link>.
 </para>
 
 </sect1>
-<sect1 id='the_bouncekeys_control'>
+<sect1 id='The_BounceKeys_Control'>
 <title>The BounceKeys Control</title>
 
 <para>
@@ -183,11 +183,11 @@ interested clients by sending an <emphasis>
 AccessXNotify</emphasis>
  event. The <emphasis>
 AccessXNotify</emphasis>
- event is described in more detail in <link linkend='events'>Events</link>.
+ event is described in more detail in <link linkend='Events'>Events</link>.
 </para>
 
 </sect1>
-<sect1 id='the_stickykeys_control'>
+<sect1 id='The_StickyKeys_Control'>
 <title>The StickyKeys Control</title>
 
 <para>
@@ -320,7 +320,7 @@ XkbAX_LatchToLock</emphasis>
 </itemizedlist>
 
 </sect1>
-<sect1 id='the_mousekeys_control'>
+<sect1 id='The_MouseKeys_Control'>
 <title>The MouseKeys Control</title>
 
 <para>
@@ -347,7 +347,7 @@ do not explicitly specify a button.
 
 
 </sect1>
-<sect1 id='the_mousekeysaccel_control'>
+<sect1 id='The_MouseKeysAccel_Control'>
 <title>The MouseKeysAccel Control</title>
 
 <para>
@@ -375,7 +375,7 @@ When <emphasis>
 MouseKeys</emphasis>
  are active and a <emphasis>
 SA_MovePtr</emphasis>
- key action (see <link linkend='key_actions'>Key
+ key action (see <link linkend='Key_Actions'>Key
 Actions</link>) is activated, a pointer motion event is generated immediately.
 If <emphasis>
 MouseKeysAccel</emphasis>
@@ -388,7 +388,7 @@ mouse keys interval</emphasis>
 </para>
 
 
-<sect2 id='relative_pointer_motion'>
+<sect2 id='Relative_Pointer_Motion'>
 <title>Relative Pointer Motion</title>
 
 <para>
@@ -464,7 +464,7 @@ steps_to_max</emphasis>
 
 
 </sect2>
-<sect2 id='absolute_pointer_motion'>
+<sect2 id='Absolute_Pointer_Motion'>
 <title>Absolute Pointer Motion</title>
 
 <para>
@@ -478,7 +478,7 @@ specified in the action.
 
 </sect2>
 </sect1>
-<sect1 id='the_accessxkeys_control'>
+<sect1 id='The_AccessXKeys_Control'>
 <title>The AccessXKeys Control</title>
 
 <para>
@@ -515,15 +515,15 @@ StickyKeys</emphasis>
 
 <para>
 Some of these key sequences optionally generate audible feedback of the change
-in state, as described in <link linkend='the_accessxfeedback_control'>The
+in state, as described in <link linkend='The_AccessXFeedback_Control'>The
 AccessXFeedback Control</link>, or cause <emphasis>
 XkbAccessXNotify</emphasis>
- events as described in <link linkend='events'>Events</link>.
+ events as described in <link linkend='Events'>Events</link>.
 </para>
 
 
 </sect1>
-<sect1 id='the_accessxtimeout_control'>
+<sect1 id='The_AccessXTimeout_Control'>
 <title>The AccessXTimeout Control</title>
 
 <para>
@@ -568,7 +568,7 @@ AccessX Controls Values</emphasis>
 
 
 </sect1>
-<sect1 id='the_accessxfeedback_control'>
+<sect1 id='The_AccessXFeedback_Control'>
 <title>The AccessXFeedback Control</title>
 
 <para>
@@ -744,7 +744,7 @@ DumbBellFB</emphasis>
 
 
 </sect1>
-<sect1 id='the_overlay1_and_overlay2_controls'>
+<sect1 id='The_Overlay1_and_Overlay2_Controls'>
 <title>The Overlay1 and Overlay2 Controls</title>
 
 <para>
@@ -778,22 +778,22 @@ should generate when that overlay is enabled, assign it either the <emphasis>
 KB_Overlay1</emphasis>
  or <emphasis>
 KB_Overlay2</emphasis>
- key behaviors, as described in <link linkend='key_behavior'>
+ key behaviors, as described in <link linkend='Key_Behavior'>
 Key Behavior</link>.
 </para>
 
 
 </sect1>
-<sect1 id='boolean_controls_and_the_enabledcontrols_control'>
+<sect1 id='Boolean_Controls_and_The_EnabledControls_Control'>
 <title>"Boolean" Controls and The EnabledControls Control</title>
 
 <para>
 All of the controls described above, along with the <emphasis>
 AudibleBell</emphasis>
- control (described in <link linkend='disabling_server_generated_bells'>Disabling
+ control (described in <link linkend='Disabling_Server_Generated_Bells'>Disabling
 Server Generated Bells</link>) and the <emphasis>
 IgnoreGroupLock</emphasis>
- control (described in <link linkend='server_internal_modifiers_and_ignore_locks_behavior'>Server
+ control (described in <link linkend='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>Server
 Internal Modifiers and Ignore Locks Behavior</link>) comprise the <emphasis>
 boolean controls</emphasis>
 . In addition to any parameters listed in the descriptions of the individual
@@ -812,30 +812,30 @@ EnabledControls</emphasis>
  control or specified in any context that accepts only boolean controls:
 <emphasis>
 GroupsWrap</emphasis>
- (<link linkend='computing_effective_modifier_and_group'>Computing Effective Modifier and
+ (<link linkend='Computing_Effective_Modifier_and_Group'>Computing Effective Modifier and
 Group</link>), <emphasis>
 EnabledControls</emphasis>
 , <emphasis>
 InternalMods</emphasis>
- (<link linkend='server_internal_modifiers_and_ignore_locks_behavior'>Server Internal Modifiers and
+ (<link linkend='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>Server Internal Modifiers and
 Ignore Locks Behavior</link>), and <emphasis>
 IgnoreLockMods</emphasis>
- (<link linkend='server_internal_modifiers_and_ignore_locks_behavior'>Server Internal Modifiers and
+ (<link linkend='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>Server Internal Modifiers and
 Ignore Locks Behavior</link>) and <emphasis>
 PerKeyRepeat</emphasis>
- (<link linkend='the_repeatkeys_control'>The RepeatKeys Control</link>)
+ (<link linkend='The_RepeatKeys_Control'>The RepeatKeys Control</link>)
 </para>
 
 
 </sect1>
-<sect1 id='automatic_reset_of_boolean_controls'>
+<sect1 id='Automatic_Reset_of_Boolean_Controls'>
 <title>Automatic Reset of Boolean Controls</title>
 
 <para>
 The <emphasis>
 auto-reset controls</emphasis>
  are a per-client value which consist of two masks that can contain any of the
-boolean controls (see <link linkend='boolean_controls_and_the_enabledcontrols_control'>"Boolean"
+boolean controls (see <link linkend='Boolean_Controls_and_The_EnabledControls_Control'>"Boolean"
 Controls and The EnabledControls Control</link>). Whenever the client exits
 for any reason, any boolean controls specified in the <emphasis>
 auto-reset mask</emphasis>
@@ -850,7 +850,7 @@ automatically, even if abnormally terminated.
 For example, a client that replace the keyboard bell with some other audible
 cue might want to turn off the <emphasis>
 AudibleBell</emphasis>
- control (<link linkend='disabling_server_generated_bells'>Disabling Server
+ control (<link linkend='Disabling_Server_Generated_Bells'>Disabling Server
 Generated Bells</link>) to prevent the server from also generating a sound and
 thus avoid cacophony. If the client were to exit without resetting the
 <emphasis>
diff --git a/specs/ch05.xml b/specs/ch05.xml
index fc9a185..5669a39 100644
--- a/specs/ch05.xml
+++ b/specs/ch05.xml
@@ -1,5 +1,5 @@
 
-<chapter id='key_event_processing_overview'>
+<chapter id='Key_Event_Processing_Overview'>
 <title>Key Event Processing Overview</title>
 
 <para>
@@ -20,7 +20,7 @@ RepeatKeys</emphasis>
  control can cause multiple X events from a single physical key press if the
 key is held down for an extended period. The global keyboard controls affect
 all of the keys on the keyboard and are described in
-<link linkend='global_keyboard_controls'>Global Keyboard Controls</link>.
+<link linkend='Global_Keyboard_Controls'>Global Keyboard Controls</link>.
   </para>
 </listitem>
 <listitem>
@@ -31,7 +31,7 @@ circumstances, can be implemented using per-key behavior. Every key has a
 single behavior, so the effect of key behavior does not depend on keyboard
 modifier or group state, though it might depend on global keyboard controls.
 Per-key behaviors are described in detail in
-<link linkend='key_behavior'>Key Behavior</link>.
+<link linkend='Key_Behavior'>Key Behavior</link>.
   </para>
 </listitem>
 <listitem>
@@ -39,7 +39,7 @@ Per-key behaviors are described in detail in
 keyboard has some action associated with it. The key action tells the server
 what to do when an event which yields the corresponding keysym is generated.
 Key actions might change or suppress the event, generate some other event, or
-change some aspect of the server. Key actions are described in <link linkend='key_actions'>Key Actions</link>.
+change some aspect of the server. Key actions are described in <link linkend='Key_Actions'>Key Actions</link>.
   </para>
 </listitem>
 </orderedlist>
@@ -52,13 +52,13 @@ event, the client which receives the event processes it in several steps.
 <orderedlist>
 <listitem>
   <para>First the client extracts the effective keyboard group and a set of
-modifiers from the state field of the event. See <link linkend='computing_a_state_field_from_an_xkb_state'>Computing A State Field from an XKB
+modifiers from the state field of the event. See <link linkend='Computing_A_State_Field_from_an_XKB_State'>Computing A State Field from an XKB
 State</link> for details.
   </para>
 </listitem>
 <listitem>
   <para>Using the modifiers and effective keyboard group, the client selects a
-symbol from the list of keysyms bound to the key. <link linkend='determining_the_keysym_associated_with_a_key_event'>Determining the KeySym Associated with a
+symbol from the list of keysyms bound to the key. <link linkend='Determining_the_KeySym_Associated_with_a_Key_Event'>Determining the KeySym Associated with a
 Key Event</link> discusses symbol selection.
   </para>
 </listitem>
@@ -69,7 +69,7 @@ symbol. For example, if the <emphasis>
 Lock</emphasis>
  modifier is left over, the resulting keysym is capitalized according to the
 capitalization rules specified by the system. See
-<link linkend='transforming_the_keysym_associated_with_a_key_event'>
+<link linkend='Transforming_the_KeySym_Associated_with_a_Key_Event'>
 Transforming the KeySym Associated with a
 Key Event</link> for a more detailed discussion of the transformations defined
 by XKB.
diff --git a/specs/ch06.xml b/specs/ch06.xml
index 6351760..8a673a4 100644
--- a/specs/ch06.xml
+++ b/specs/ch06.xml
@@ -1,4 +1,4 @@
-<chapter id='key_event_processing_in_the_server'>
+<chapter id='Key_Event_Processing_in_the_Server'>
 <title>Key Event Processing in the Server</title>
 
 <para>
@@ -8,7 +8,7 @@ activity and passed to XKB by the DDX layer, or they can be synthesized by
 another extension, such as XTEST.
 </para>
 
-<sect1 id='applying_global_controls'>
+<sect1 id='Applying_Global_Controls'>
 <title>Applying Global Controls</title>
 
 <para>
@@ -83,7 +83,7 @@ RepeatKeys</emphasis>
 
 
 </sect1>
-<sect1 id='key_behavior'>
+<sect1 id='Key_Behavior'>
 <title>Key Behavior</title>
 
 <para>
@@ -217,7 +217,7 @@ KB_Default</emphasis>
 
 
 </sect1>
-<sect1 id='key_actions'>
+<sect1 id='Key_Actions'>
 <title>Key Actions</title>
 
 <para>
@@ -262,7 +262,7 @@ list of symbols associated with the key (i.e. it has one action per symbol
 associated with the key). For key press events, the server looks up the action
 to be applied from this list using the key symbol mapping associated with the
 event key, just as a client looks up symbols as described in <link
-linkend="determining_the_keysym_associated_with_a_key_event">Determining the KeySym Associated with a
+linkend='Determining_the_KeySym_Associated_with_a_Key_Event'>Determining the KeySym Associated with a
 Key Event</link>; if the event key does not have any actions, the server uses
 the <emphasis>
 SA_NoAction</emphasis>
@@ -292,7 +292,7 @@ delay between the activation of one and the other.
 
 <para>
 Most actions which affect keyboard modifier state accept a modifier definition
-(see <link linkend="virtual_modifiers">Virtual Modifiers</link>)
+(see <link linkend='Virtual_Modifiers'>Virtual Modifiers</link>)
 named <emphasis>
 mods</emphasis>
  and a boolean flag name <emphasis>
@@ -679,7 +679,7 @@ MouseKeysAccel</emphasis>
  keyboard control is enabled, key press also initiates the mouse keys timer for
 this key; every time this timer expires, the cursor moves again. The distance
 the cursor moves in these subsequent events is determined by the mouse keys
-acceleration as described in <link linkend="the_mousekeysaccel_control">The
+acceleration as described in <link linkend='The_MouseKeysAccel_Control'>The
 MouseKeysAccel Control</link>.
   </para>
 </listitem>
@@ -1627,13 +1627,13 @@ event that caused them.
 Events sent to clients that have not issued an <emphasis>
 XkbUseExtension</emphasis>
  request contain a compatibility state in place of the actual XKB keyboard
-state. See <link linkend="effects_of_xkb_on_core_protocol_events">Effects of XKB on Core
+state. See <link linkend='Effects_of_XKB_on_Core_Protocol_Events'>Effects of XKB on Core
 Protocol Events</link> for a description of this compatibility mapping.
 </para>
 
 
 </sect1>
-<sect1 id='delivering_a_key_or_button_event_to_a_client'>
+<sect1 id='Delivering_a_Key_or_Button_Event_to_a_Client'>
 <title>Delivering a Key or Button Event to a Client</title>
 
 <para>
@@ -1647,7 +1647,7 @@ the following changes:
 <listitem>
   <para>A passive grab triggers if the modifier state specified in the grab
 matches the grab compatibility state (described in <link
-linkend="compatibility_components_of_keyboard_state">Compatibility Components of Keyboard
+linkend='Compatibility_Components_of_Keyboard_State'>Compatibility Components of Keyboard
 State</link>). Clients can choose to use the XKB grab state instead by setting
 the <emphasis>
 GrabsUseXKBState</emphasis>
@@ -1678,14 +1678,14 @@ LookupStateWhenGrabbed</emphasis>
 <listitem>
   <para>Otherwise, the state field of events that do not trigger a passive grab
 report is derived from the XKB effective modifiers and group, as described in
-<link linkend="computing_a_state_field_from_an_xkb_state">Computing A State Field from an
+<link linkend='Computing_A_State_Field_from_an_XKB_State'>Computing A State Field from an
 XKB State</link>.
   </para>
 </listitem>
 <listitem>
   <para>If a key release event is the result of an autorepeating key that is
 being held down, and the client to which the event is reported has requested
-detectable autorepeat (see <link linkend="detectable_autorepeat">
+detectable autorepeat (see <link linkend='Detectable_Autorepeat'>
 Detectable Autorepeat</link>), the event is not delivered to the client.
   </para>
 </listitem>
@@ -1697,7 +1697,7 @@ protocol grabs and the reason that the per-client flags are needed.
 </para>
 
 
-<sect2 id='xkb_interactions_with_core_protocol_grabs'>
+<sect2 id='XKB_Interactions_With_Core_Protocol_Grabs'>
 <title>XKB Interactions With Core Protocol Grabs</title>
 
 <para>
@@ -1720,7 +1720,7 @@ interact.
 <listitem>
   <para>The largest problems arise from the fact that an XKB state field
 encodes an explicit keyboard group in bits 13-14 (as described in <link
-linkend="computing_a_state_field_from_an_xkb_state">Computing A State Field from an XKB
+linkend='Computing_A_State_Field_from_an_XKB_State'>Computing A State Field from an XKB
 State</link>), while pre-XKB clients use one of the eight keyboard modifiers
 to select an alternate keyboard group. To make existing clients behave
 reasonably, XKB normally uses the compatibility grab state instead of the XKB
diff --git a/specs/ch07.xml b/specs/ch07.xml
index 700f28f..af87587 100644
--- a/specs/ch07.xml
+++ b/specs/ch07.xml
@@ -1,4 +1,4 @@
-<chapter id='key_event_processing_in_the_client'>
+<chapter id='Key_Event_Processing_in_the_Client'>
 <title>Key Event Processing in the Client</title>
 
 <para>
@@ -7,19 +7,19 @@ client map</emphasis>
  for a keyboard is the collection of information a client needs to interpret
 key events that come from that keyboard. It contains a global list of <emphasis>
 key types</emphasis>
-, described in <link linkend='key_types'>Key Types</link>,
+, described in <link linkend='Key_Types'>Key Types</link>,
 and an array of <emphasis>
 key symbol map</emphasis>
 s, each of which describes the symbols bound to one particular key and the
 rules to be used to interpret those symbols.
 </para>
 
-<sect1 id='notation_and_terminology'>
+<sect1 id='Notation_and_Terminology'>
 <title>Notation and Terminology</title>
 
 <para>
 XKB associates a two-dimensional array of symbols with each key. Symbols are
-addressed by keyboard group (see <link linkend='keyboard_state'>
+addressed by keyboard group (see <link linkend='Keyboard_State'>
 Keyboard State</link>) and shift level, where level is defined as in the
 ISO9995 standard:
 </para>
@@ -75,7 +75,7 @@ for it, but we try to minimize confusion by using "group" and "level" (or
 "shift level") to refer to symbols regardless of context.</para></note>
 
 </sect1>
-<sect1 id='determining_the_keysym_associated_with_a_key_event'>
+<sect1 id='Determining_the_KeySym_Associated_with_a_Key_Event'>
 <title>Determining the KeySym Associated with a Key Event</title>
 
 <para>
@@ -86,13 +86,13 @@ group and shift level that correspond to the event.
 
 <para>
 Group is reported in bits 13-14 of the state field of the key event, as
-described in <link linkend='computing_a_state_field_from_an_xkb_state'>Computing A State
+described in <link linkend='Computing_A_State_Field_from_an_XKB_State'>Computing A State
 Field from an XKB State</link>. The keyboard group reported in the event might
 be out-of-range for any particular key because the number of groups can vary
 from key to key. The XKB description of each key contains a <emphasis>
 group info</emphasis>
  field which is interpreted identically to the global groups wrap control (see
-<link linkend='computing_effective_modifier_and_group'>Computing Effective Modifier and
+<link linkend='Computing_Effective_Modifier_and_Group'>Computing Effective Modifier and
 Group</link>) and which specifies the interpretation of groups that are
 out-of-range for that key.
 </para>
@@ -104,7 +104,7 @@ determine the shift level. The description of a key includes a <emphasis>
 key type</emphasis>
  for each group of symbols bound to the key. Given the modifiers from the key
 event, this key type yields a shift level and a set of "leftover" modifiers, as
-described in <link linkend='key_types'>Key Types</link>
+described in <link linkend='Key_Types'>Key Types</link>
 below.
 </para>
 
@@ -116,7 +116,7 @@ associated with the key.
 </para>
 
 
-<sect2 id='key_types'>
+<sect2 id='Key_Types'>
 <title>Key Types</title>
 
 <para>
@@ -125,7 +125,7 @@ map</emphasis>
  field specifies the shift level that corresponds to some XKB modifier
 definition; any combination of modifiers that is not explicitly listed
 somewhere in the map yields shift level one. Map entries which specify unbound
-virtual modifiers (see <link linkend='inactive_modifier_definitions'>Inactive
+virtual modifiers (see <link linkend='Inactive_Modifier_Definitions'>Inactive
 Modifier Definitions</link>) are not considered; each entry contains an
 automatically-updated <emphasis>
 active</emphasis>
@@ -161,7 +161,7 @@ Any modifiers specified in <emphasis>
 modifiers</emphasis>
  are normally <emphasis>
 consumed</emphasis>
- (see <link linkend='transforming_the_keysym_associated_with_a_key_event'>Transforming the KeySym
+ (see <link linkend='Transforming_the_KeySym_Associated_with_a_Key_Event'>Transforming the KeySym
 Associated with a Key Event</link>), which means that they are not considered
 during any of the later stages of event processing. For those rare occasions
 that a modifier <emphasis>
@@ -257,7 +257,7 @@ Lock</emphasis>
 
 
 </sect2>
-<sect2 id='key_symbol_map'>
+<sect2 id='Key_Symbol_Map'>
 <title>Key Symbol Map</title>
 
 <para>
@@ -382,7 +382,7 @@ key actually yields that code.
 
 </sect2>
 </sect1>
-<sect1 id='transforming_the_keysym_associated_with_a_key_event'>
+<sect1 id='Transforming_the_KeySym_Associated_with_a_Key_Event'>
 <title>Transforming the KeySym Associated with a Key Event</title>
 
 <para>
@@ -452,7 +452,7 @@ Interpretation of other modifiers is application dependent.
 <note><para>This definition of capitalization is fundamentally different from
 the core protocol’s, which uses the lock modifier to select from the symbols
 bound to the key. Consider key 9 in the
-<link linkend="client_map_example">client map example</link>;
+<link linkend='Client_Map_Example'>client map example</link>;
 the core protocol provides no way to generate the capital form
 of either symbol bound to this key. XKB specifies that we first look up the
 symbol and then capitalize, so XKB yields the capital form of the two symbols
@@ -468,7 +468,7 @@ Control</emphasis>
 
 
 </sect1>
-<sect1 id='client_map_example'>
+<sect1 id='Client_Map_Example'>
 <title>Client Map Example</title>
 
 <para>
@@ -677,7 +677,7 @@ to be used. The key type determines which symbol is chosen from the list.
 
 
 <para>
-<link linkend='determining_the_keysym_associated_with_a_key_event'>Determining the KeySym Associated
+<link linkend='Determining_the_KeySym_Associated_with_a_Key_Event'>Determining the KeySym Associated
 with a Key Event</link> details the procedure to map from a key event to a
 symbol and/or a string.
 </para>
diff --git a/specs/ch08.xml b/specs/ch08.xml
index cbf4b78..08524a8 100644
--- a/specs/ch08.xml
+++ b/specs/ch08.xml
@@ -1,4 +1,4 @@
-<chapter id='symbolic_names'>
+<chapter id='Symbolic_Names'>
 <title>Symbolic Names</title>
 
 <para>
@@ -87,7 +87,7 @@ geometry</emphasis>
  names typically correspond to the keyboard components from which the current
 keyboard description was assembled. These components are stored individually in
 the server’s database of keyboard components, described in
-<link linkend='the_server_database_of_keyboard_components'>
+<link linkend='The_Server_Database_of_Keyboard_Components'>
 The Server Database of Keyboard
 Components</link>, and can be combined to assemble a complete keyboard
 description.
@@ -132,7 +132,7 @@ customizations are straightforward.
 
 <para>
 Key aliases can be specified both in the symbolic names component and in the
-keyboard geometry (see <link linkend='keyboard_geometry'>Keyboard
+keyboard geometry (see <link linkend='Keyboard_Geometry'>Keyboard
 Geometry</link>). Both sets of aliases are always valid, but key alias
 definitions in the keyboard geometry have priority; if both symbolic names and
 geometry include aliases, applications should consider the definitions from the
diff --git a/specs/ch09.xml b/specs/ch09.xml
index 8a0eb87..d3f8510 100644
--- a/specs/ch09.xml
+++ b/specs/ch09.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_indicators'>
+<chapter id='Keyboard_Indicators'>
 <title>Keyboard Indicators</title>
 
 <para>
@@ -42,7 +42,7 @@ keyboard indicators, which makes it straightforward to provide an on-screen
 "virtual" LED panel.
 </para>
 
-<sect1 id='global_information_about_indicators'>
+<sect1 id='Global_Information_About_Indicators'>
 <title>Global Information About Indicators</title>
 
 <para>
@@ -60,7 +60,7 @@ keyboard, it cannot be directly changed under program control. It is possible,
 however, for the set of physical indicators to be change if a new keyboard is
 attached or if a completely new keyboard description is loaded by the <emphasis>
 XkbGetKeyboardByName</emphasis>
- request (see <link linkend='using_the_servers_database_of_keyboard_components'>Using the Server’s
+ request (see <link linkend='Using_the_Servers_Database_of_Keyboard_Components'>Using the Server’s
 Database of Keyboard Components</link>).
 </para>
 
@@ -78,7 +78,7 @@ GetKeyboardControl</emphasis>
 
 
 </sect1>
-<sect1 id='per_indicator_information'>
+<sect1 id='Per_Indicator_Information'>
 <title>Per-Indicator Information</title>
 
 <para>
@@ -88,12 +88,12 @@ XkbGetNames</emphasis>
  request reports the symbolic names for all keyboard components, including the
 indicators. Use the <emphasis>
 XkbSetNames</emphasis>
- request to change symbolic names. Both requests are described in <link linkend='querying_and_changing_symbolic_names'>Querying and Changing Symbolic
+ request to change symbolic names. Both requests are described in <link linkend='Querying_and_Changing_Symbolic_Names'>Querying and Changing Symbolic
 Names</link>.
 </para>
 
 
-<sect2 id='indicator_maps'>
+<sect2 id='Indicator_Maps'>
 <title>Indicator Maps</title>
 
 <para>
@@ -232,7 +232,7 @@ mods</emphasis>
  fields of an indicator map determine how the state of the keyboard modifiers
 affect the corresponding indicator. The <emphasis>
 mods</emphasis>
- field is an XKB modifier definition, as described in <link linkend='modifier_definitions'>Modifier Definitions</link>, which can
+ field is an XKB modifier definition, as described in <link linkend='Modifier_Definitions'>Modifier Definitions</link>, which can
 specify both real and virtual modifiers. The mods field takes effect even if
 some or all of the virtual indicators specified in <emphasis>
 mods</emphasis>
@@ -305,7 +305,7 @@ IM_UseCompat</emphasis>
 <para>
 The <emphasis>
 controls</emphasis>
- field specifies a subset of the boolean keyboard controls (see <link linkend='boolean_controls_and_the_enabledcontrols_control'>"Boolean" Controls and The
+ field specifies a subset of the boolean keyboard controls (see <link linkend='Boolean_Controls_and_The_EnabledControls_Control'>"Boolean" Controls and The
 EnabledControls Control</link>). The indicator is lit whenever any of the
 boolean controls specified in <emphasis>
 controls</emphasis>
@@ -321,7 +321,7 @@ IM_NoAutomatic</emphasis>
 </para>
 
 
-<sect3 id='effects_of_explicit_changes_on_indicators'>
+<sect3 id='Effects_of_Explicit_Changes_on_Indicators'>
 <title>Effects of Explicit Changes on Indicators</title>
 
 <para>
diff --git a/specs/ch10.xml b/specs/ch10.xml
index bfb99ae..74362b0 100644
--- a/specs/ch10.xml
+++ b/specs/ch10.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_bells'>
+<chapter id='Keyboard_Bells'>
 <title>Keyboard Bells</title>
 
 <para>
@@ -13,7 +13,7 @@ symbolic name to a bell request or receive an event when the keyboard bell is
 rung.
 </para>
 
-<sect1 id='client_notification_of_bells'>
+<sect1 id='Client_Notification_of_Bells'>
 <title>Client Notification of Bells</title>
 
 <para>
@@ -46,7 +46,7 @@ sound for each type of bell.
 
 
 </sect1>
-<sect1 id='disabling_server_generated_bells'>
+<sect1 id='Disabling_Server_Generated_Bells'>
 <title>Disabling Server Generated Bells</title>
 
 <para>
@@ -87,7 +87,7 @@ XkbBell</emphasis>
 
 
 </sect1>
-<sect1 id='generating_named_bells'>
+<sect1 id='Generating_Named_Bells'>
 <title>Generating Named Bells</title>
 
 <para>
@@ -110,14 +110,14 @@ sounds other than simple tones, but it is not required to do so.
 <para>
 Aside from those used by the XKB <emphasis>
 AccessXFeedback</emphasis>
- control (see <link linkend='the_accessxfeedback_control'>The AccessXFeedback
+ control (see <link linkend='The_AccessXFeedback_Control'>The AccessXFeedback
 Control</link>), this extension does not specify bell names or their
 interpretation.
 </para>
 
 
 </sect1>
-<sect1 id='generating_optional_named_bells'>
+<sect1 id='Generating_Optional_Named_Bells'>
 <title>Generating Optional Named Bells</title>
 
 <para>
@@ -147,7 +147,7 @@ to weed out "normal" keyboard bells.
 
 
 </sect1>
-<sect1 id='forcing_a_server_generated_bell'>
+<sect1 id='Forcing_a_Server_Generated_Bell'>
 <title>Forcing a Server Generated Bell</title>
 
 <para>
diff --git a/specs/ch11.xml b/specs/ch11.xml
index 9a32496..39361a4 100644
--- a/specs/ch11.xml
+++ b/specs/ch11.xml
@@ -1,5 +1,5 @@
 
-<chapter id='keyboard_geometry'>
+<chapter id='Keyboard_Geometry'>
 <title>Keyboard Geometry</title>
 
 <para>
@@ -79,7 +79,7 @@ structures refer to geometry properties.
 <listitem>
   <para>A list of <emphasis>
 key aliases</emphasis>
-, as described in <link linkend='symbolic_names'>Symbolic
+, as described in <link linkend='Symbolic_Names'>Symbolic
 Names</link>.
   </para>
 </listitem>
@@ -89,7 +89,7 @@ shapes</emphasis>
 ; other keyboard components refer to shapes by their index in this list. A
 shape consists of a name and one or more closed-polygons called <emphasis>
 outlines</emphasis>
-. Shapes and outlines are described in detail in <link linkend='shapes_and_outlines'>Shapes and Outlines</link>.
+. Shapes and outlines are described in detail in <link linkend='Shapes_and_Outlines'>Shapes and Outlines</link>.
   </para>
 </listitem>
 </itemizedlist>
@@ -136,7 +136,7 @@ a collection of keys and doodads that are physically close together and
 logically related.
 </para>
 
-<sect1 id='shapes_and_outlines'>
+<sect1 id='Shapes_and_Outlines'>
 <title>Shapes and Outlines</title>
 
 <para>
@@ -194,7 +194,7 @@ to generate a recognizable but degraded image of the keyboard.
 
 
 </sect1>
-<sect1 id='sections'>
+<sect1 id='Sections'>
 <title>Sections</title>
 
 <para>
@@ -261,7 +261,7 @@ while the key specified in over must not.
 </itemizedlist>
 
 </sect1>
-<sect1 id='doodads'>
+<sect1 id='Doodads'>
 <title>Doodads</title>
 
 <para>
@@ -336,7 +336,7 @@ The XKB extension does not specify the interpretation of logo names.
 </itemizedlist>
 
 </sect1>
-<sect1 id='keyboard_geometry_example'>
+<sect1 id='Keyboard_Geometry_Example'>
 <title>Keyboard Geometry Example</title>
 
 <para>
diff --git a/specs/ch12.xml b/specs/ch12.xml
index d30a213..f37caf1 100644
--- a/specs/ch12.xml
+++ b/specs/ch12.xml
@@ -1,5 +1,5 @@
 
-<chapter id='interactions_between_xkb_and_the_core_protocol'>
+<chapter id='Interactions_Between_XKB_and_the_Core_Protocol'>
 <title>Interactions Between XKB and the Core Protocol</title>
 
 <para>
@@ -49,11 +49,11 @@ This section describes the differences between the core X protocol’s notion
 of a keyboard mapping and XKB and explains the ways they can interact.
 </para>
 
-<sect1 id='group_compatibility_map'>
+<sect1 id='Group_Compatibility_Map'>
 <title>Group Compatibility Map</title>
 
 <para>
-As described in <link linkend='keyboard_state'>Keyboard
+As described in <link linkend='Keyboard_State'>Keyboard
 State</link>, the current keyboard group is reported to XKB-aware clients in
 bits 13-14 of the state field of many core protocol events. XKB-unaware clients
 cannot interpret those bits, but they might use a keyboard modifier to
@@ -139,7 +139,7 @@ Group4</emphasis>
 </para>
 
 
-<sect2 id='setting_a_passive_grab_for_an_xkb_state'>
+<sect2 id='Setting_a_Passive_Grab_for_an_XKB_State'>
 <title>Setting a Passive Grab for an XKB State</title>
 
 <para>
@@ -192,7 +192,7 @@ or for grabs that are set by some other client.
 
 </sect2>
 </sect1>
-<sect1 id='changing_the_keyboard_mapping_using_the_core_protocol'>
+<sect1 id='Changing_the_Keyboard_Mapping_Using_the_Core_Protocol'>
 <title>Changing the Keyboard Mapping Using the Core Protocol</title>
 
 <para>
@@ -215,7 +215,7 @@ cannot be described using this mapping should use XKB functions directly.
 </para>
 
 
-<sect2 id='explicit_keyboard_mapping_components'>
+<sect2 id='Explicit_Keyboard_Mapping_Components'>
 <title>Explicit Keyboard Mapping Components</title>
 
 <para>
@@ -243,40 +243,40 @@ field for a key can contain any combination of the following values:
     <entry>ExplicitKeyType1</entry>
     <entry>Automatic determination of the key type associated with <emphasis>
 Group1</emphasis>
- (see <link linkend='assigning_types_to_groups_of_symbols_for_a_key'>Assigning Types To Groups of
+ (see <link linkend='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>Assigning Types To Groups of
 Symbols for a Key</link>)</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitKeyType2</entry>
     <entry>Automatic determination of the key type associated with <emphasis>
 Group2 </emphasis>
-(see <link linkend='assigning_types_to_groups_of_symbols_for_a_key'>Assigning Types To Groups of
+(see <link linkend='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>Assigning Types To Groups of
 Symbols for a Key</link>)</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitKeyType3</entry>
     <entry>Automatic determination of the key type associated with <emphasis>
 Group3 </emphasis>
-(see <link linkend='assigning_types_to_groups_of_symbols_for_a_key'>Assigning Types To Groups of
+(see <link linkend='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>Assigning Types To Groups of
 Symbols for a Key</link>).</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitKeyType4</entry>
     <entry>Automatic determination of the key type associated with <emphasis>
 Group4 </emphasis>
-(see <link linkend='assigning_types_to_groups_of_symbols_for_a_key'>Assigning Types To Groups of
+(see <link linkend='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>Assigning Types To Groups of
 Symbols for a Key</link>).</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitInterpret</entry>
     <entry>Application of any of the fields of a symbol interpretation to the
-key in question (see <link linkend='assigning_actions_to_keys'>Assigning
+key in question (see <link linkend='Assigning_Actions_To_Keys'>Assigning
 Actions To Keys</link>).</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitAutoRepeat</entry>
     <entry>Automatic determination of autorepeat status for the key, as
-specified in a symbol interpretation (see <link linkend='assigning_actions_to_keys'>Assigning Actions To
+specified in a symbol interpretation (see <link linkend='Assigning_Actions_To_Keys'>Assigning Actions To
 Keys</link>).</entry>
   </row>
   <row rowsep='0'>
@@ -285,14 +285,14 @@ Keys</link>).</entry>
 KB_Lock</emphasis>
  behavior to the key, if the <emphasis>
 LockingKey</emphasis>
- flag is set in a symbol interpretation (see <link linkend='assigning_actions_to_keys'>Assigning Actions To
+ flag is set in a symbol interpretation (see <link linkend='Assigning_Actions_To_Keys'>Assigning Actions To
 Keys</link>).</entry>
   </row>
   <row rowsep='0'>
     <entry>ExplicitVModMap</entry>
     <entry>Automatic determination of the virtual modifier map for the key
 based on the actions assigned to the key and the symbol interpretations which
-match the key (see <link linkend='assigning_actions_to_keys'>Assigning
+match the key (see <link linkend='Assigning_Actions_To_Keys'>Assigning
 Actions To Keys</link>).</entry>
   </row>
 </tbody>
@@ -300,7 +300,7 @@ Actions To Keys</link>).</entry>
 </informaltable>
 
 </sect2>
-<sect2 id='assigning_symbols_to_groups'>
+<sect2 id='Assigning_Symbols_To_Groups'>
 <title>Assigning Symbols To Groups</title>
 
 <para>
@@ -310,7 +310,7 @@ ChangeKeyboardMapping</emphasis>
 groups that are defined for the key and the width of each group. The XKB
 extension does not change key types in response to core protocol <emphasis>
 SetModifierMapping</emphasis>
- requests, but it does choose key actions as described in <link linkend='assigning_actions_to_keys'>Assigning Actions To Keys</link>.
+ requests, but it does choose key actions as described in <link linkend='Assigning_Actions_To_Keys'>Assigning Actions To Keys</link>.
 </para>
 
 
@@ -364,7 +364,7 @@ little more complicated.
 </para>
 
 
-<sect3 id="assigning_symbols_to_groups_one_and_two_with_explicitly_defined_key_types">
+<sect3 id='Assigning_Symbols_to_Groups_One_and_Two_with_Explicitly_Defined_Key_Types'>
 <title>Assigning Symbols to Groups One and Two with Explicitly Defined Key Types</title>
 
 <para>
@@ -423,7 +423,7 @@ with the core protocol.
 
 </sect3>
 </sect2>
-<sect2 id='assigning_types_to_groups_of_symbols_for_a_key'>
+<sect2 id='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>
 <title>Assigning Types To Groups of Symbols for a Key</title>
 
 <para>
@@ -487,7 +487,7 @@ ALPHABETIC</emphasis>
     <entry>Describes alphabetic keys that have exactly two symbols per group.
 The default definition of the <emphasis>
 ALPHABETIC</emphasis>
- type provides shift-cancels-caps behavior as described in <link linkend='key_types'>Key Types</link>. Index <emphasis>
+ type provides shift-cancels-caps behavior as described in <link linkend='Key_Types'>Key Types</link>. Index <emphasis>
 2</emphasis>
  in any key symbol map specifies key type <emphasis>
 ALPHABETIC</emphasis>
@@ -592,7 +592,7 @@ Group2</emphasis>
 
 
 </sect2>
-<sect2 id='assigning_actions_to_keys'>
+<sect2 id='Assigning_Actions_To_Keys'>
 <title>Assigning Actions To Keys</title>
 
 <para>
@@ -733,7 +733,7 @@ locking key</emphasis>
  field is set in the symbol interpretation, the behavior of the key is changed
 to <emphasis>
 KB_Lock</emphasis>
- (see <link linkend='key_behavior'>Key Behavior</link>). The
+ (see <link linkend='Key_Behavior'>Key Behavior</link>). The
 <emphasis>
 ExplicitBehavior</emphasis>
  component prevents this change.
@@ -766,7 +766,7 @@ XkbSetCompatMap</emphasis>
 
 
 </sect2>
-<sect2 id='updating_everything_else'>
+<sect2 id='Updating_Everything_Else'>
 <title>Updating Everything Else</title>
 
 <para>
@@ -780,14 +780,14 @@ indicator maps, internal modifiers or ignore locks modifiers.
 
 </sect2>
 </sect1>
-<sect1 id='effects_of_xkb_on_core_protocol_events'>
+<sect1 id='Effects_of_XKB_on_Core_Protocol_Events'>
 <title>Effects of XKB on Core Protocol Events</title>
 
 <para>
 After applying server actions which modify the base, latched or locked modifier
 or group state of the keyboard, the X server recomputes the effective group and
 state. Several components of the keyboard state are reported to XKB-aware
-clients depending on context (see <link linkend='keyboard_state'>
+clients depending on context (see <link linkend='Keyboard_State'>
 Keyboard State</link> for a detailed description of each of the keyboard state
 components):
 </para>
@@ -871,7 +871,7 @@ GrabsUseXKBState</emphasis>
 
 
 </sect1>
-<sect1 id='effect_of_xkb_on_core_protocol_requests'>
+<sect1 id='Effect_of_XKB_on_Core_Protocol_Requests'>
 <title>Effect of XKB on Core Protocol Requests</title>
 
 <para>
@@ -963,7 +963,7 @@ by all of the actions associated with the key plus all of the modifiers
 associated with any virtual modifiers bound to the key by the virtual modifier
 mapping. If any of the actions associated with a key affect any component of
 the keyboard group, any modifiers specified in any entry of the group
-compatibility map (see <link linkend='group_compatibility_map'>Group
+compatibility map (see <link linkend='Group_Compatibility_Map'>Group
 Compatibility Map</link>) are reported in the modifier mask. The <emphasis>
 SA_ISOLock</emphasis>
  action can theoretically affect any modifier, but the modifier map of an
@@ -988,7 +988,7 @@ MappingNotify</emphasis>
 
 
 </sect1>
-<sect1 id='sending_events_to_clients'>
+<sect1 id='Sending_Events_to_Clients'>
 <title>Sending Events to Clients</title>
 
 <para>
diff --git a/specs/ch13.xml b/specs/ch13.xml
index 9efa7b2..49a8c2e 100644
--- a/specs/ch13.xml
+++ b/specs/ch13.xml
@@ -1,4 +1,4 @@
-<chapter id='the_server_database_of_keyboard_components'>
+<chapter id='The_Server_Database_of_Keyboard_Components'>
 <title>The Server Database of Keyboard Components</title>
 
 <para>
@@ -16,7 +16,7 @@ current keyboard description with a complete keyboard description assembled as
 described below.
 </para>
 
-<sect1 id='component_names'>
+<sect1 id='Component_Names'>
 <title>Component Names</title>
 
 <para>
@@ -52,7 +52,7 @@ use of other characters is implementation-dependent.
 
 
 </sect1>
-<sect1 id='partial_components_and_combining_multiple_components'>
+<sect1 id='Partial_Components_and_Combining_Multiple_Components'>
 <title>Partial Components and Combining Multiple Components</title>
 
 <para>
@@ -155,7 +155,7 @@ where necessary).
 
 
 </sect1>
-<sect1 id='component_hints'>
+<sect1 id='Component_Hints'>
 <title>Component Hints</title>
 
 <para>
@@ -216,7 +216,7 @@ listed in the section below that describes that kind of component.
 
 
 </sect1>
-<sect1 id='keyboard_components'>
+<sect1 id='Keyboard_Components'>
 <title>Keyboard Components</title>
 
 <para>
@@ -235,7 +235,7 @@ types</emphasis>
 </para>
 
 </sect1>
-<sect1 id='the_keycodes_component'>
+<sect1 id='The_Keycodes_Component'>
 <title>The Keycodes Component</title>
 
 <para>
@@ -266,7 +266,7 @@ XKB defines no hints that are specific to the keycodes component.
 </para>
 
 
-<sect2 id='the_types_component'>
+<sect2 id='The_Types_Component'>
 <title>The Types Component</title>
 
 <para>
@@ -276,7 +276,7 @@ types</emphasis>
 with the various keyboard keys. It affects the <emphasis>
 types</emphasis>
  symbolic name and the list of types associated with the keyboard (see
-<link linkend='key_types'>Key Types</link>). The types component
+<link linkend='Key_Types'>Key Types</link>). The types component
 of a keyboard mapping can also optionally contain real modifier bindings and
 symbolic names for one or more virtual modifiers.
 </para>
@@ -294,7 +294,7 @@ XKB defines no hints that are specific to the types component.
 
 
 </sect2>
-<sect2 id='the_compatibility_map_component'>
+<sect2 id='The_Compatibility_Map_Component'>
 <title>The Compatibility Map Component</title>
 
 <para>
@@ -315,7 +315,7 @@ XKB defines no hints that are specific to the compatibility map component.
 
 
 </sect2>
-<sect2 id='the_symbols_component'>
+<sect2 id='The_Symbols_Component'>
 <title>The Symbols Component</title>
 
 <para>
@@ -400,7 +400,7 @@ LC_AlternateGroup</emphasis>
  may be combined with any of the other flags).</para></note>
 
 </sect2>
-<sect2 id='the_geometry_component'>
+<sect2 id='The_Geometry_Component'>
 <title>The Geometry Component</title>
 
 <para>
@@ -422,7 +422,7 @@ XKB defines no hints that are specific to the geometry component.
 
 </sect2>
 </sect1>
-<sect1 id='complete_keymaps'>
+<sect1 id='Complete_Keymaps'>
 <title>Complete Keymaps</title>
 
 <para>
diff --git a/specs/ch14.xml b/specs/ch14.xml
index 2da16db..6a2f45a 100644
--- a/specs/ch14.xml
+++ b/specs/ch14.xml
@@ -1,4 +1,4 @@
-<chapter id='replacing_the_keyboard_on_the_fly'>
+<chapter id='Replacing_the_Keyboard_On_the_Fly'>
 <title>Replacing the Keyboard "On-the-Fly"</title>
 
 <para>
@@ -9,7 +9,7 @@ keycodes. The server can generate an <emphasis>
 XkbNewKeyboardNotify</emphasis>
  event when it detects a new keyboard, or in response to an <emphasis>
 XkbGetKeyboardByName</emphasis>
- request (see <link linkend='using_the_servers_database_of_keyboard_components'>Using the Server’s
+ request (see <link linkend='Using_the_Servers_Database_of_Keyboard_Components'>Using the Server’s
 Database of Keyboard Components</link>) which loads a new keyboard description.
 </para>
 
diff --git a/specs/ch15.xml b/specs/ch15.xml
index 6c56ad6..ec0ce72 100644
--- a/specs/ch15.xml
+++ b/specs/ch15.xml
@@ -1,4 +1,4 @@
-<chapter id='interactions_between_xkb_and_the_x_input_extension'>
+<chapter id='Interactions_Between_XKB_and_the_X_Input_Extension'>
 <title>Interactions Between XKB and the X Input Extension</title>
 
 <para>
@@ -79,7 +79,7 @@ supported XKB features for extension devices, or if a request from the client
 that is receiving the event attempted to use an unsupported feature.
 </para>
 
-<sect1 id='using_xkb_functions_with_input_extension_keyboards'>
+<sect1 id='Using_XKB_Functions_with_Input_Extension_Keyboards'>
 <title>Using XKB Functions with Input Extension Keyboards</title>
 
 <para>
@@ -108,12 +108,12 @@ Keyboard</emphasis>
 
 
 </sect1>
-<sect1 id='pointer_and_device_button_actions'>
+<sect1 id='Pointer_and_Device_Button_Actions'>
 <title>Pointer and Device Button Actions</title>
 
 <para>
 The XKB extension optionally allows clients to assign any key action (see
-<link linkend='key_actions'>Key Actions</link>) to core
+<link linkend='Key_Actions'>Key Actions</link>) to core
 pointer or input extension device buttons. This makes it possible to control
 the keyboard or generate keyboard key events from extension devices or from the
 core pointer.
@@ -141,7 +141,7 @@ cause an error condition.
 
 
 </sect1>
-<sect1 id='indicator_maps_for_extension_devices'>
+<sect1 id='Indicator_Maps_for_Extension_Devices'>
 <title>Indicator Maps for Extension Devices</title>
 
 <para>
@@ -186,7 +186,7 @@ XkbGetDeviceInfo</emphasis>
 
 
 </sect1>
-<sect1 id='indicator_names_for_extension_devices'>
+<sect1 id='Indicator_Names_for_Extension_Devices'>
 <title>Indicator Names for Extension Devices</title>
 
 <para>
diff --git a/specs/ch16.xml b/specs/ch16.xml
index 643ebce..83cc8f8 100644
--- a/specs/ch16.xml
+++ b/specs/ch16.xml
@@ -1,5 +1,5 @@
 
-<chapter id='xkb_protocol_requests'>
+<chapter id='XKB_Protocol_Requests'>
 <title>XKB Protocol Requests</title>
 
 <para>
@@ -8,7 +8,7 @@ specification of the core X protocol with a number of additions, which are
 detailed below.
 </para>
 
-<sect1 id='errors'>
+<sect1 id='Errors'>
 <title>Errors</title>
 
 <para>
@@ -23,7 +23,7 @@ extension.
 </para>
 
 
-<sect2 id='keyboard_errors'>
+<sect2 id='Keyboard_Errors'>
 <title>Keyboard Errors</title>
 
 <para>
@@ -85,7 +85,7 @@ indicated id</entry>
 </informaltable>
 
 </sect2>
-<sect2 id='side_effects_of_errors'>
+<sect2 id='Side_Effects_of_Errors'>
 <title>Side-Effects of Errors</title>
 
 <para>
@@ -103,7 +103,7 @@ ignored.
 
 </sect2>
 </sect1>
-<sect1 id='common_types'>
+<sect1 id='Common_Types'>
 <title>Common Types</title>
 
 <para>
@@ -820,7 +820,7 @@ maps: LISTofKB_INDICATORMAP ]</entry>
 </informaltable>
 
 </sect1>
-<sect1 id='requests'>
+<sect1 id='Requests'>
 <title>Requests</title>
 
 <para>
@@ -829,7 +829,7 @@ separated into categories of related requests.
 </para>
 
 
-<sect2 id='initializing_the_x_keyboard_extension'>
+<sect2 id='Initializing_the_X_Keyboard_Extension'>
 <title>Initializing the X Keyboard Extension</title>
 
 
@@ -897,7 +897,7 @@ XkbUseExtension</emphasis>
 
 
 </sect2>
-<sect2 id='selecting_events'>
+<sect2 id='Selecting_Events'>
 <title>Selecting Events</title>
 
 
@@ -1215,13 +1215,13 @@ affectWhich</emphasis>
 <para>
 If any components are specified in a client’s event masks, the X server sends
 the client an appropriate event whenever any of those components change state.
-Unless explicitly modified, all event detail masks are empty. <link linkend='events'>Events</link> describes all XKB events
+Unless explicitly modified, all event detail masks are empty. <link linkend='Events'>Events</link> describes all XKB events
 and the conditions under which the server generates them.
 </para>
 
 
 </sect2>
-<sect2 id='generating_named_keyboard_bells'>
+<sect2 id='Generating_Named_Keyboard_Bells'>
 <title>Generating Named Keyboard Bells</title>
 
 
@@ -1406,7 +1406,7 @@ honor them.
 
 
 </sect2>
-<sect2 id='querying_and_changing_keyboard_state'>
+<sect2 id='Querying_and_Changing_Keyboard_State'>
 <title>Querying and Changing Keyboard State</title>
 
 
@@ -1532,7 +1532,7 @@ effective modifiers minus any server internal modifiers. The <emphasis>
 grabMods</emphasis>
  return value reports the grab modifiers, which consist of the lookup modifiers
 minus any members of the ignore locks mask that are not either latched or
-logically depressed. <link linkend='keyboard_state'>Keyboard
+logically depressed. <link linkend='Keyboard_State'>Keyboard
 State</link> describes the lookup modifiers and grab modifiers in more detail.
 </para>
 
@@ -1556,7 +1556,7 @@ compatGrabMods</emphasis>
  return values report the core protocol compatibility states that correspond to
 the XKB lookup and grab state. All of the compatibility states are computed by
 applying the group compatibility mapping to the corresponding XKB modifier and
-group states, as described in <link linkend='group_compatibility_map'>
+group states, as described in <link linkend='Group_Compatibility_Map'>
 Group Compatibility Map</link>.
 </para>
 
@@ -1694,7 +1694,7 @@ If any errors occur, this request has no effect.
 
 
 </sect2>
-<sect2 id='querying_and_changing_keyboard_controls'>
+<sect2 id='Querying_and_Changing_Keyboard_Controls'>
 <title>Querying and Changing Keyboard Controls</title>
 
 
@@ -1821,14 +1821,14 @@ The <emphasis>
 numGroups</emphasis>
  return value reports the current number of groups, and <emphasis>
 groupsWrap</emphasis>
- reports the treatment of out-of-range groups, as described in <link linkend='key_symbol_map'>Key Symbol Map</link>. The <emphasis>
+ reports the treatment of out-of-range groups, as described in <link linkend='Key_Symbol_Map'>Key Symbol Map</link>. The <emphasis>
 internalMods</emphasis>
  and <emphasis>
 ignoreLockMods</emphasis>
  return values report the current values of the server internal and ignore
-locks modifiers as described in <link linkend='keyboard_state'>
+locks modifiers as described in <link linkend='Keyboard_State'>
 Keyboard State</link>. Both are modifier definitions (
-<link linkend='modifier_definitions'>Modifier Definitions</link>) which
+<link linkend='Modifier_Definitions'>Modifier Definitions</link>) which
 report the real modifiers, virtual modifiers, and the resulting combination of
 real modifiers that are bound to the corresponding control.
 </para>
@@ -1855,7 +1855,7 @@ mouseKeysMaxSpeed</emphasis>
  and <emphasis>
 mouseKeysCurve</emphasis>
  return values report the current acceleration applied to mouse keys, as
-described in <link linkend='the_mousekeysaccel_control'>The MouseKeysAccel
+described in <link linkend='The_MouseKeysAccel_Control'>The MouseKeysAccel
 Control</link>. All times are reported in milliseconds.
 </para>
 
@@ -2223,7 +2223,7 @@ repeatDelay</emphasis>
  and <emphasis>
 repeatInterval</emphasis>
  change the autorepeat characteristics of the keyboard, as described in
-<link linkend='the_repeatkeys_control'>The RepeatKeys Control</link>. If
+<link linkend='The_RepeatKeys_Control'>The RepeatKeys Control</link>. If
 specified, <emphasis>
 repeatDelay</emphasis>
  and <emphasis>
@@ -2239,7 +2239,7 @@ If applied, the <emphasis>
 slowKeysDelay</emphasis>
  field specifies a new delay for the <emphasis>
 SlowKeys</emphasis>
- control, as defined in <link linkend='the_slowkeys_control'>The
+ control, as defined in <link linkend='The_SlowKeys_Control'>The
 SlowKeys Control</link>. If specified, <emphasis>
 slowKeysDelay</emphasis>
  must be non-zero, or a <emphasis>
@@ -2253,7 +2253,7 @@ If applied, the <emphasis>
 debounceDelay</emphasis>
  field specifies a new delay for the <emphasis>
 BounceKeys</emphasis>
- control, as described in <link linkend='the_bouncekeys_control'>The
+ control, as described in <link linkend='The_BounceKeys_Control'>The
 BounceKeys Control</link>. If present, the <emphasis>
 debounceDelay</emphasis>
  must be non-zero or a <emphasis>
@@ -2274,7 +2274,7 @@ SA_LockPtrBtn</emphasis>
 mouseKeysDfltBtn</emphasis>
  must specify a legal button for the core pointer device, or a <emphasis>
 Value</emphasis>
- error results. <link linkend='key_actions'>Key
+ error results. <link linkend='Key_Actions'>Key
 Actions</link> describes the <emphasis>
 SA_PtrBtn</emphasis>
  and <emphasis>
@@ -2297,7 +2297,7 @@ mouseKeysCurve</emphasis>
  fields change the rate at which the pointer moves when a key which generates a
 <emphasis>
 SA_MovePtr</emphasis>
- action is held down. <link linkend='the_mousekeysaccel_control'>The
+ action is held down. <link linkend='The_MouseKeysAccel_Control'>The
 MouseKeysAccel Control</link> describes these <emphasis>
 MouseKeysAccel</emphasis>
  parameters in more detail. If defined, the <emphasis>
@@ -2324,7 +2324,7 @@ Value</emphasis>
 If applied, the <emphasis>
 accessXOptions</emphasis>
  field sets the AccessX options, which are described in detail in
-<link linkend='the_accessxkeys_control'>The AccessXKeys Control</link>. If
+<link linkend='The_AccessXKeys_Control'>The AccessXKeys Control</link>. If
 either one of <emphasis>
 XkbStickyKeysMask</emphasis>
  and <emphasis>
@@ -2358,7 +2358,7 @@ accessXTimeoutOptionsMask</emphasis>
  and <emphasis>
 accessXTimeoutOptionsValues</emphasis>
  fields change the behavior of the AccessX Timeout control, as described in
-<link linkend='the_accessxtimeout_control'>The AccessXTimeout
+<link linkend='The_AccessXTimeout_Control'>The AccessXTimeout
 Control</link>. The <emphasis>
 accessXTimeout</emphasis>
  must be greater than zero, or a <emphasis>
@@ -2386,7 +2386,7 @@ Match</emphasis>
 If present, the <emphasis>
 groupsWrap</emphasis>
  field specifies the treatment of out-of-range keyboard groups, as described in
-<link linkend='key_symbol_map'>Key Symbol Map</link>. If the
+<link linkend='Key_Symbol_Map'>Key Symbol Map</link>. If the
 <emphasis>
 groupsWrap</emphasis>
  field does not specify a legal treatment for out-of-range groups, a <emphasis>
@@ -2471,7 +2471,7 @@ Value</emphasis>
 
 
 </sect2>
-<sect2 id='querying_and_changing_the_keyboard_mapping'>
+<sect2 id='Querying_and_Changing_the_Keyboard_Mapping'>
 <title>Querying and Changing the Keyboard Mapping</title>
 
 
@@ -3326,7 +3326,7 @@ flags</emphasis>
 last key type specified by this request is the last element in the list. If the
 list of key types is shrunk, any existing key definitions that use key types
 that eliminated are automatically assigned key types from the list of canonical
-key types as described in <link linkend='assigning_types_to_groups_of_symbols_for_a_key'>
+key types as described in <link linkend='Assigning_Types_To_Groups_of_Symbols_for_a_Key'>
 Assigning Types To Groups of Symbols for a Key</link>. The list of key types
 bound to a keyboard must always include the four canonical types and cannot
 have more than <emphasis>
@@ -3740,7 +3740,7 @@ XkbSetMapRecomputeActions</emphasis>
 flags</emphasis>
 , the actions associated with any keys for which symbol or modifier bindings
 were changed by this request are recomputed as described in
-<link linkend='assigning_actions_to_keys'>Assigning Actions To Keys</link>. Note
+<link linkend='Assigning_Actions_To_Keys'>Assigning Actions To Keys</link>. Note
 that actions are recomputed <emphasis>
 after </emphasis>
 any actions specified in this request are bound to keys, so the actions
@@ -3818,7 +3818,7 @@ XkbIndicatorStateNotify</emphasis>
 
 
 </sect2>
-<sect2 id='querying_and_changing_the_compatibility_map'>
+<sect2 id='Querying_and_Changing_the_Compatibility_Map'>
 <title>Querying and Changing the Compatibility Map</title>
 
 
@@ -4086,13 +4086,13 @@ recomputeActions</emphasis>
 True</emphasis>
 , the server regenerates recalculates the actions bound to all keyboard keys by
 applying the new symbol interpretations to the entire key symbol map, as
-described in <link linkend='assigning_actions_to_keys'>Assigning Actions To
+described in <link linkend='Assigning_Actions_To_Keys'>Assigning Actions To
 Keys</link>.
 </para>
 
 
 </sect2>
-<sect2 id='querying_and_changing_indicators'>
+<sect2 id='Querying_and_Changing_Indicators'>
 <title>Querying and Changing Indicators</title>
 
 
@@ -4243,7 +4243,7 @@ XkbIndicatorStateNotify</emphasis>
 The <emphasis>
 maps</emphasis>
  return value reports the requested indicator maps. Indicator maps are
-described in <link linkend='indicator_maps'>Indicator Maps</link>
+described in <link linkend='Indicator_Maps'>Indicator Maps</link>
 </para>
 
 
@@ -4717,7 +4717,7 @@ If <emphasis>
 setMap </emphasis>
 is <emphasis>
 True</emphasis>
-, XKB changes the map for the indicator (see <link linkend='indicator_maps'>Indicator Maps</link>) to reflect the
+, XKB changes the map for the indicator (see <link linkend='Indicator_Maps'>Indicator Maps</link>) to reflect the
 values specified in <emphasis>
 map</emphasis>
 .
@@ -4753,7 +4753,7 @@ map and the current state of the keyboard.
 
 
 </sect2>
-<sect2 id='querying_and_changing_symbolic_names'>
+<sect2 id='Querying_and_Changing_Symbolic_Names'>
 <title>Querying and Changing Symbolic Names</title>
 
 
@@ -5426,7 +5426,7 @@ Atom</emphasis>
 
 
 </sect2>
-<sect2 id='querying_and_changing_keyboard_geometry'>
+<sect2 id='Querying_and_Changing_Keyboard_Geometry'>
 <title>Querying and Changing Keyboard Geometry</title>
 
 
@@ -5526,7 +5526,7 @@ name</emphasis>
  is a valid atom other than <emphasis>
 None</emphasis>
 , the server returns the keyboard geometry description with that name in the
-server database of keyboard components (see <link linkend='the_server_database_of_keyboard_components'>The Server Database of Keyboard
+server database of keyboard components (see <link linkend='The_Server_Database_of_Keyboard_Components'>The Server Database of Keyboard
 Components</link>) if one exists. If <emphasis>
 deviceSpec</emphasis>
  does not specify a valid keyboard device, a <emphasis>
@@ -5566,7 +5566,7 @@ found</emphasis>
 True</emphasis>
 , the remaining fields of the reply describe the requested keyboard geometry.
 The interpretation of the components that make up a keyboard geometry is
-described in detail in <link linkend='keyboard_geometry'>Keyboard
+described in detail in <link linkend='Keyboard_Geometry'>Keyboard
 Geometry</link>
 </para>
 
@@ -5762,7 +5762,7 @@ keyboard definition, but XKB does not check for or guarantee it.
 
 
 </sect2>
-<sect2 id='querying_and_changing_per_client_flags'>
+<sect2 id='Querying_and_Changing_Per_Client_Flags'>
 <title>Querying and Changing Per-Client Flags</title>
 
 
@@ -5859,35 +5859,35 @@ per-client-flags are:
     <entry><emphasis>
 XkbPCF_DetectableAutorepeat</emphasis>
 </entry>
-    <entry><link linkend='detectable_autorepeat'>Detectable
+    <entry><link linkend='Detectable_Autorepeat'>Detectable
 Autorepeat</link></entry>
   </row>
   <row rowsep='0'>
     <entry><emphasis>
 XkbPCF_GrabsUseXKBStateMask</emphasis>
 </entry>
-    <entry><link linkend='setting_a_passive_grab_for_an_xkb_state'>Setting a Passive Grab
+    <entry><link linkend='Setting_a_Passive_Grab_for_an_XKB_State'>Setting a Passive Grab
 for an XKB State</link></entry>
   </row>
   <row rowsep='0'>
     <entry><emphasis>
 XkbPCF_AutoResetControlsMask</emphasis>
 </entry>
-    <entry><link linkend='automatic_reset_of_boolean_controls'>Automatic Reset of
+    <entry><link linkend='Automatic_Reset_of_Boolean_Controls'>Automatic Reset of
 Boolean Controls</link></entry>
   </row>
   <row rowsep='0'>
     <entry><emphasis>
 XkbPCF_LookupStateWhenGrabbed</emphasis>
 </entry>
-    <entry><link linkend='effects_of_xkb_on_core_protocol_events'>Effects of XKB on Core
+    <entry><link linkend='Effects_of_XKB_on_Core_Protocol_Events'>Effects of XKB on Core
 Protocol Events</link></entry>
   </row>
   <row rowsep='0'>
     <entry><emphasis>
 XkbPCF_SendEventUsesXKBState</emphasis>
 </entry>
-    <entry><link linkend='sending_events_to_clients'>Sending Events to
+    <entry><link linkend='Sending_Events_to_Clients'>Sending Events to
 Clients</link></entry>
   </row>
 </tbody>
@@ -5987,7 +5987,7 @@ autoCtrlValues</emphasis>
 
 
 </sect2>
-<sect2 id='using_the_servers_database_of_keyboard_components'>
+<sect2 id='Using_the_Servers_Database_of_Keyboard_Components'>
 <title>Using the Server’s Database of Keyboard Components</title>
 
 
@@ -6113,7 +6113,7 @@ components.
 <para>
 Each pattern uses the ISO Latin-1 encoding and should contain only parentheses,
 the wildcard characters "?" and "*" or characters that are permitted in a
-component class or member name (see <link linkend='component_names'>Component Names</link>). Illegal
+component class or member name (see <link linkend='Component_Names'>Component Names</link>). Illegal
 characters in a pattern are simply ignored; no error results if a pattern
 contains illegal characters.
 </para>
@@ -6157,14 +6157,14 @@ compatMaps</emphasis>
 symbols</emphasis>
  and <emphasis>
 geometries</emphasis>
- return the hints (see <link linkend='component_hints'>Component
+ return the hints (see <link linkend='Component_Hints'>Component
 Hints</link>) and names of any components from the server database that match
 the corresponding pattern.
 </para>
 
 
 <para>
-<link linkend='the_server_database_of_keyboard_components'>The Server Database of Keyboard
+<link linkend='The_Server_Database_of_Keyboard_Components'>The Server Database of Keyboard
 Components</link> describes the X server database of keyboard components in
 more detail.
 </para>
@@ -6304,7 +6304,7 @@ compatMapSpec</emphasis>
 symbolsSpec</emphasis>
  and <emphasis>
 geometrySpec</emphasis>
- component expressions (see <link linkend='partial_components_and_combining_multiple_components'>
+ component expressions (see <link linkend='Partial_Components_and_Combining_Multiple_Components'>
 Partial Components and Combining Multiple Components</link>) specify the
 database components to be used to assemble the keyboard description.
 </para>
@@ -6414,7 +6414,7 @@ If either field contains a GBN component that depends on some database
 component for which the request does not supply an expression, XKB
 automatically substitutes the special pattern "%" which copies the
 corresponding component from the current keyboard description, as described in
-<link linkend='partial_components_and_combining_multiple_components'>Partial Components and Combining
+<link linkend='Partial_Components_and_Combining_Multiple_Components'>Partial Components and Combining
 Multiple Components</link>.
 </para>
 
@@ -6439,7 +6439,7 @@ description is loaded. If the new keyboard description has a different geometry
 or keycode range than the previous keyboard description, XKB sends <emphasis>
 XkbNewKeyboardNotify</emphasis>
  events to all interested clients. See
-<link linkend='replacing_the_keyboard_on_the_fly'>Replacing the Keyboard
+<link linkend='Replacing_the_Keyboard_On_the_Fly'>Replacing the Keyboard
 "On-the-Fly"</link> for more information about the effects of replacing the
 keyboard description on the fly.
 </para>
@@ -6609,7 +6609,7 @@ description.
 
 
 </sect2>
-<sect2 id='querying_and_changing_input_extension_devices'>
+<sect2 id='Querying_and_Changing_Input_Extension_Devices'>
 <title>Querying and Changing Input Extension Devices</title>
 
 
@@ -6891,7 +6891,7 @@ which values are being returned. The <emphasis>
 supported</emphasis>
  return value reports the set of optional XKB extension device features that
 are supported by this implementation (see
-<link linkend='interactions_between_xkb_and_the_x_input_extension'>
+<link linkend='Interactions_Between_XKB_and_the_X_Input_Extension'>
 Interactions Between XKB and the X Input
 Extension</link>) for the specified device, and the unsupported return value
 reports any <emphasis>
@@ -7231,7 +7231,7 @@ for it and, if generated, is not sent to any other clients.
 
 
 </sect2>
-<sect2 id='debugging_the_x_keyboard_extension'>
+<sect2 id='Debugging_the_X_Keyboard_Extension'>
 <title>Debugging the X Keyboard Extension</title>
 
 
@@ -7382,7 +7382,7 @@ Length</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='events'>
+<sect1 id='Events'>
 <title>Events</title>
 
 <para>
@@ -7396,7 +7396,7 @@ distinguish XKB event type.
 </para>
 
 
-<sect2 id='tracking_keyboard_replacement'>
+<sect2 id='Tracking_Keyboard_Replacement'>
 <title>Tracking Keyboard Replacement</title>
 
 
@@ -7539,7 +7539,7 @@ Once a client receives a new keyboard notify event which reports a new keycode
 range, the X server reports events from all keys in the new range to that
 client. Clients that do not request or receive new keyboard notify events
 receive events only from keys that fall in the last range for legal keys
-reported to that client. See <link linkend='replacing_the_keyboard_on_the_fly'>
+reported to that client. See <link linkend='Replacing_the_Keyboard_On_the_Fly'>
 Replacing the Keyboard "On-the-Fly"</link> for a more detailed explanation.
 </para>
 
@@ -7595,7 +7595,7 @@ both fields have the value <emphasis>
 
 
 </sect2>
-<sect2 id='tracking_keyboard_mapping_changes'>
+<sect2 id='Tracking_Keyboard_Mapping_Changes'>
 <title>Tracking Keyboard Mapping Changes</title>
 
 
@@ -7835,7 +7835,7 @@ modifier mappings. Otherwise, both fields are <emphasis>
 
 
 </sect2>
-<sect2 id='tracking_keyboard_state_changes'>
+<sect2 id='Tracking_Keyboard_State_Changes'>
 <title>Tracking Keyboard State Changes</title>
 
 
@@ -7907,7 +7907,7 @@ requestMajor, requestMinor: CARD8</entry>
 <para>
 An <emphasis>XkbStateNotify</emphasis>
 event reports that some component of the XKB state (see
-<link linkend='keyboard_state'>Keyboard State</link>) has changed.
+<link linkend='Keyboard_State'>Keyboard State</link>) has changed.
 State notify events are usually caused by key or pointer activity, but they can
 also result from explicit state changes requested by the <emphasis>
 XkbLatchLockState</emphasis>
@@ -7922,7 +7922,7 @@ deviceID</emphasis>
 <emphasis>
 changed</emphasis>
  field reports the XKB state components (see
-<link linkend='keyboard_state'>Keyboard State</link>) that have changed
+<link linkend='Keyboard_State'>Keyboard State</link>) that have changed
 and contain any combination of:
 </para>
 
@@ -8114,7 +8114,7 @@ change in state and have the value <emphasis>
 
 
 </sect2>
-<sect2 id='tracking_keyboard_control_changes'>
+<sect2 id='Tracking_Keyboard_Control_Changes'>
 <title>Tracking Keyboard Control Changes</title>
 
 
@@ -8171,9 +8171,9 @@ requestMinor: CARD8</entry>
 An <emphasis>
 XkbControlsNotify</emphasis>
  event reports a change in one or more of the global keyboard controls (see
-<link linkend='global_keyboard_controls'>Global Keyboard Controls</link>)
+<link linkend='Global_Keyboard_Controls'>Global Keyboard Controls</link>)
 or in the internal modifiers or ignore locks masks (see
-<link linkend='server_internal_modifiers_and_ignore_locks_behavior'>
+<link linkend='Server_Internal_Modifiers_and_Ignore_Locks_Behavior'>
 Server Internal Modifiers and Ignore
 Locks Behavior</link>). Controls notify events are usually caused by and
 <emphasis>
@@ -8265,7 +8265,7 @@ change in state and have the value <emphasis>
 
 
 </sect2>
-<sect2 id='tracking_keyboard_indicator_state_changes'>
+<sect2 id='Tracking_Keyboard_Indicator_State_Changes'>
 <title>Tracking Keyboard Indicator State Changes</title>
 
 
@@ -8355,7 +8355,7 @@ client.
 
 
 </sect2>
-<sect2 id='tracking_keyboard_indicator_map_changes'>
+<sect2 id='Tracking_Keyboard_Indicator_Map_Changes'>
 <title>Tracking Keyboard Indicator Map Changes</title>
 
 
@@ -8424,7 +8424,7 @@ state</emphasis>
 
 
 </sect2>
-<sect2 id='tracking_keyboard_name_changes'>
+<sect2 id='Tracking_Keyboard_Name_Changes'>
 <title>Tracking Keyboard Name Changes</title>
 
 
@@ -8643,7 +8643,7 @@ changed</emphasis>
 
 
 </sect2>
-<sect2 id='tracking_compatibility_map_changes'>
+<sect2 id='Tracking_Compatibility_Map_Changes'>
 <title>Tracking Compatibility Map Changes</title>
 
 
@@ -8750,7 +8750,7 @@ XkbGroupCompatMask</emphasis>
 </itemizedlist>
 
 </sect2>
-<sect2 id='tracking_application_bell_requests'>
+<sect2 id='Tracking_Application_Bell_Requests'>
 <title>Tracking Application Bell Requests</title>
 
 
@@ -8896,7 +8896,7 @@ XkbBell</emphasis>
 
 
 </sect2>
-<sect2 id='tracking_messages_generated_by_key_actions'>
+<sect2 id='Tracking_Messages_Generated_by_Key_Actions'>
 <title>Tracking Messages Generated by Key Actions</title>
 
 
@@ -9012,7 +9012,7 @@ message</emphasis>
 
 
 </sect2>
-<sect2 id='tracking_changes_to_accessx_state_and_keys'>
+<sect2 id='Tracking_Changes_to_AccessX_State_and_Keys'>
 <title>Tracking Changes to AccessX State and Keys</title>
 
 
@@ -9178,14 +9178,14 @@ slowKeysDelay</emphasis>
  and <emphasis>
 debounceDelay</emphasis>
  fields always reports the current slow keys acceptance delay (see
-<link linkend='the_slowkeys_control'>The SlowKeys Control</link>) and
-debounce delay (see <link linkend='the_bouncekeys_control'>The BounceKeys
+<link linkend='The_SlowKeys_Control'>The SlowKeys Control</link>) and
+debounce delay (see <link linkend='The_BounceKeys_Control'>The BounceKeys
 Control</link>) for the specified keyboard.
 </para>
 
 
 </sect2>
-<sect2 id='tracking_changes_to_extension_devices'>
+<sect2 id='Tracking_Changes_To_Extension_Devices'>
 <title>Tracking Changes To Extension Devices</title>
 
 
@@ -9344,7 +9344,7 @@ extension device feature that is not supported by the XKB implementation in the
 server for the specified device. The <emphasis>
 unsupported</emphasis>
  mask reports the requested features that are not available on the specified
-device. See <link linkend='interactions_between_xkb_and_the_x_input_extension'>Interactions Between
+device. See <link linkend='Interactions_Between_XKB_and_the_X_Input_Extension'>Interactions Between
 XKB and the X Input Extension</link> for more information about possible XKB
 interactions with the X Input Extension.
 </para>