Merge remote-tracking branch 'origin/released'

22 files changed, 249 insertions, 250 deletions

diff --git a/libX11/specs/XKB/ch01.xml b/libX11/specs/XKB/ch01.xml
index 5079a411a..e756d1a96 100644
--- a/libX11/specs/XKB/ch01.xml
+++ b/libX11/specs/XKB/ch01.xml
@@ -1,4 +1,4 @@
-<chapter id='overview'>
+<chapter id='Overview'>
 <title>Overview</title>
 
 <para>
@@ -6,7 +6,7 @@ The X Keyboard Extension provides capabilities that are lacking or are
 cumbersome in the core X protocol.
 </para>
 
-<sect1 id='core_x_protocol_support_for_keyboards'>
+<sect1 id='Core_X_Protocol_Support_for_Keyboards'>
 <title>Core X Protocol Support for Keyboards</title>
 
 <para>
@@ -74,7 +74,7 @@ heuristics.
 </itemizedlist>
 
 </sect1>
-<sect1 id='xkb_keyboard_extension_support_for_keyboards'>
+<sect1 id='Xkb_Keyboard_Extension_Support_for_Keyboards'>
 <title>Xkb Keyboard Extension Support for Keyboards</title>
 
 <para>
@@ -93,7 +93,7 @@ designed to make keyboards more accessible to people with movement impairments.
 
 </sect1>
 
-<sect1 id='xkb_extension_components'>
+<sect1 id='Xkb_Extension_Components'>
 <title>Xkb Extension Components</title>
 
 <para>
@@ -214,7 +214,7 @@ configuration from its database of named components. Partial reconfiguration
 and incremental reconfiguration are both supported.
 </para>
 
-<sect2 id='groups_and_shift_levels'>
+<sect2 id='Groups_and_Shift_Levels'>
 <title>Groups and Shift Levels</title>
 
 <para>
@@ -225,7 +225,7 @@ description of groups and levels.
 
 
 </sect2>
-<sect2 id='radio_groups'>
+<sect2 id='Radio_Groups'>
 <title>Radio Groups</title>
 
 <para>
@@ -242,7 +242,7 @@ XkbKB_RadioGroup</emphasis>
 </sect2>
 </sect1>
 
-<sect1 id='client_types'>
+<sect1 id='Client_Types'>
 <title>Client Types</title>
 
 <para>
@@ -285,7 +285,7 @@ operate properly.
 
 </sect1>
 
-<sect1 id='compatibility_with_the_core_protocol'>
+<sect1 id='Compatibility_With_the_Core_Protocol'>
 <title>Compatibility With the Core Protocol</title>
 
 <para>
@@ -301,7 +301,7 @@ configuration.
 
 
 </sect1>
-<sect1 id='additional_protocol_errors'>
+<sect1 id='Additional_Protocol_Errors'>
 <title>Additional Protocol Errors</title>
 
 <para>
@@ -315,7 +315,7 @@ BadKeyboard</emphasis>
 
 
 </sect1>
-<sect1 id='extension_library_functions'>
+<sect1 id='Extension_Library_Functions'>
 <title>Extension Library Functions</title>
 
 <para>
@@ -345,7 +345,7 @@ directly manipulate the new capabilities.
 </para>
 
 
-<sect2 id='error_indications'>
+<sect2 id='Error_Indications'>
 <title>Error Indications</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch02.xml b/libX11/specs/XKB/ch02.xml
index 55f15a322..57286a475 100644
--- a/libX11/specs/XKB/ch02.xml
+++ b/libX11/specs/XKB/ch02.xml
@@ -1,6 +1,6 @@
-<chapter id='initialization_and_general_programming_information'>
+<chapter id='Initialization_and_General_Programming_Information'>
 <title>Initialization and General Programming Information</title>
-<sect1 id='extension_header_files'>
+<sect1 id='Extension_Header_Files'>
 <title>Extension Header Files</title>
 <para>
 The following include files are part of the Xkb standard:
@@ -48,7 +48,7 @@ keyboard geometry descriptions.
   </listitem>
 </itemizedlist>
 </sect1>
-<sect1 id='extension_name'>
+<sect1 id='Extension_Name'>
 <title>Extension Name</title>
 <para>
 The name of the Xkb extension is given in <emphasis>
@@ -70,7 +70,7 @@ XInitExtension</emphasis>
  directly.
 </para>
 </sect1>
-<sect1 id='determining_library_compatibility'>
+<sect1 id='Determining_Library_Compatibility'>
 <title>Determining Library Compatibility</title>
 <para>
 If an application is dynamically linked, both the X server and the client-side
@@ -160,7 +160,7 @@ XkbQueryExtension</emphasis>
 </para>
 
 </sect1>
-<sect1 id='initializing_the_keyboard_extension'>
+<sect1 id='Initializing_the_Keyboard_Extension'>
 <title>Initializing the Keyboard Extension</title>
 <para>
 Call <emphasis>
@@ -469,7 +469,7 @@ XkbOD_Success</emphasis>
 </itemizedlist>
 </sect1>
 
-<sect1 id='disabling_the_keyboard_extension'>
+<sect1 id='Disabling_the_Keyboard_Extension'>
 <title>Disabling the Keyboard Extension</title>
 <para>
 If a server supports the Xkb extension, the X library normally implements
@@ -538,7 +538,7 @@ False</emphasis>
 </para>
 
 </sect1>
-<sect1 id='protocol_errors'>
+<sect1 id='Protocol_Errors'>
 <title>Protocol Errors</title>
 <para>
 Many of the Xkb extension library functions described in this document can
@@ -712,7 +712,7 @@ indicated ID
 </table>
 </sect1>
 
-<sect1 id='display_and_device_specifications_in_function_calls'>
+<sect1 id='Display_and_Device_Specifications_in_Function_Calls'>
 <title>Display and Device Specifications in Function Calls</title>
 <para>
 Where a connection to the server is passed as an argument (Display*) and an
diff --git a/libX11/specs/XKB/ch03.xml b/libX11/specs/XKB/ch03.xml
index 5ea411c4e..06d6d93f0 100644
--- a/libX11/specs/XKB/ch03.xml
+++ b/libX11/specs/XKB/ch03.xml
@@ -1,4 +1,4 @@
-<chapter id='data_structures'>
+<chapter id='Data_Structures'>
 <title>Data Structures</title>
 
 <para>
@@ -27,7 +27,7 @@ structures. You should use them instead of allocating and freeing the
 structures yourself.
 </para>
 
-<sect1 id='allocating_xkb_data_structures'>
+<sect1 id='Allocating_Xkb_Data_Structures'>
 <title>Allocating Xkb Data Structures</title>
 
 <para>
@@ -62,7 +62,7 @@ might be invalidated by calls to allocator functions.
 </para>
 
 </sect1>
-<sect1 id='adding_data_and_editing_data_structures'>
+<sect1 id='Adding_Data_and_Editing_Data_Structures'>
 <title>Adding Data and Editing Data Structures</title>
 
 <para>
@@ -141,7 +141,7 @@ num_</emphasis>
 
 
 </sect1>
-<sect1 id='making_changes_to_the_servers_keyboard_description'>
+<sect1 id='Making_Changes_to_the_Servers_Keyboard_Description'>
 <title>Making Changes to the Server’s Keyboard Description</title>
 
 <para>
@@ -178,7 +178,7 @@ changes data structure causes indeterminate behavior.
 
 
 </sect1>
-<sect1 id='tracking_keyboard_changes_in_the_server'>
+<sect1 id='Tracking_Keyboard_Changes_in_the_Server'>
 <title>Tracking Keyboard Changes in the Server</title>
 
 <para>
@@ -224,7 +224,7 @@ keyboard description.
 </para>
 
 </sect1>
-<sect1 id='freeing_data_structures'>
+<sect1 id='Freeing_Data_Structures'>
 <title>Freeing Data Structures</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch04.xml b/libX11/specs/XKB/ch04.xml
index dc9065d79..f267ee512 100644
--- a/libX11/specs/XKB/ch04.xml
+++ b/libX11/specs/XKB/ch04.xml
@@ -1,4 +1,4 @@
-<chapter id='xkb_events'>
+<chapter id='Xkb_Events'>
 <title>Xkb Events</title>
 
 <para>
@@ -39,7 +39,7 @@ XkbSelectEventDetails</emphasis>
 specify have been met.
 </para>
 
-<sect1 id='xkb_event_types'>
+<sect1 id='Xkb_Event_Types'>
 <title>Xkb Event Types</title>
 
 <para>
@@ -264,7 +264,7 @@ event.
 </table>
 
 </sect1>
-<sect1 id='xkb_event_data_structures'>
+<sect1 id='Xkb_Event_Data_Structures'>
 <title>Xkb Event Data Structures</title>
 
 <para>
@@ -334,7 +334,7 @@ chapters where the events are described.
 
 
 </sect1>
-<sect1 id='selecting_xkb_events'>
+<sect1 id='Selecting_Xkb_Events'>
 <title>Selecting Xkb Events</title>
 
 <para>
@@ -635,7 +635,7 @@ XkbSelectEventDetails</emphasis>
 </para>
 
 
-<sect2 id='event_masks'>
+<sect2 id='Event_Masks'>
 <title>Event Masks</title>
 
 <para>
@@ -767,7 +767,7 @@ XkbSelectEvents</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='unified_xkb_event_type'>
+<sect1 id='Unified_Xkb_Event_Type'>
 <title>Unified Xkb Event Type</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch05.xml b/libX11/specs/XKB/ch05.xml
index 3785c44d7..626a0c040 100644
--- a/libX11/specs/XKB/ch05.xml
+++ b/libX11/specs/XKB/ch05.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_state'>
+<chapter id='Keyboard_State'>
 <title>Keyboard State</title>
 
 <para>
@@ -13,7 +13,7 @@ Keyboard state encompasses all of the transitory information necessary to map a
 </mediaobject>
 
 
-<sect1 id='keyboard_state_description'>
+<sect1 id='Keyboard_State_Description'>
 <title>Keyboard State Description</title>
 <para>
 The Xkb keyboard state is comprised of the state of all keyboard modifiers, the keyboard group, and the state of the pointer buttons. These are grouped into the following components:
@@ -294,10 +294,10 @@ The X11 protocol interpretation of modifiers does not include direct support for
 
 
 </sect1>
-<sect1 id='changing_the_keyboard_state'>
+<sect1 id='Changing_the_Keyboard_State'>
 <title>Changing the Keyboard State</title>
 
-<sect2 id='changing_modifiers'>
+<sect2 id='Changing_Modifiers'>
 <title>Changing Modifiers</title>
 
 <para>
@@ -492,7 +492,7 @@ False</emphasis>
 
 
 </sect2>
-<sect2 id='changing_groups'>
+<sect2 id='Changing_Groups'>
 <title>Changing Groups</title>
 
 <para>
@@ -645,7 +645,7 @@ False</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='determining_keyboard_state'>
+<sect1 id='Determining_Keyboard_State'>
 <title>Determining Keyboard State</title>
 
 <para>
@@ -739,7 +739,7 @@ All group values are expressed as group indices in the range [0..3]. Modifiers a
 
 
 </sect1>
-<sect1 id='tracking_keyboard_state'>
+<sect1 id='Tracking_Keyboard_State'>
 <title>Tracking Keyboard State</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch06.xml b/libX11/specs/XKB/ch06.xml
index 3bd77fab2..f74137131 100644
--- a/libX11/specs/XKB/ch06.xml
+++ b/libX11/specs/XKB/ch06.xml
@@ -1,4 +1,4 @@
-<chapter id='complete_keyboard_description'>
+<chapter id='Complete_Keyboard_Description'>
 <title>Complete Keyboard Description</title>
 
 <para>
@@ -8,7 +8,7 @@ this single structure and provides references to other sections of this
 document that discuss the major Xkb components in detail.
 </para>
 
-<sect1 id='the_xkbdescrec_structure'>
+<sect1 id='The_XkbDescRec_Structure'>
 <title>The XkbDescRec Structure</title>
 
 <para>
@@ -189,7 +189,7 @@ XkbDescRec</emphasis>
 </table>
 
 </sect1>
-<sect1 id='obtaining_a_keyboard_description_from_the_server'>
+<sect1 id='Obtaining_a_Keyboard_Description_from_the_Server'>
 <title>Obtaining a Keyboard Description from the Server</title>
 
 <para>
@@ -277,7 +277,7 @@ XkbFreeKeyboard</emphasis>
 
 
 </sect1>
-<sect1 id='tracking_changes_to_the_keyboard_description_in_the_server'>
+<sect1 id='Tracking_Changes_to_the_Keyboard_Description_in_the_Server'>
 <title>Tracking Changes to the Keyboard Description in the Server</title>
 
 <para>
@@ -288,7 +288,7 @@ tracking changes to the keyboard description.
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_a_keyboard_description'>
+<sect1 id='Allocating_and_Freeing_a_Keyboard_Description'>
 <title>Allocating and Freeing a Keyboard Description</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch07.xml b/libX11/specs/XKB/ch07.xml
index cd1b7dbd0..93d61d8cc 100644
--- a/libX11/specs/XKB/ch07.xml
+++ b/libX11/specs/XKB/ch07.xml
@@ -1,4 +1,4 @@
-<chapter id='virtual_modifiers'>
+<chapter id='Virtual_Modifiers'>
 <title>Virtual Modifiers</title>
 
 <para>
@@ -62,7 +62,7 @@ specify the desired behavior, without regard for the actual physical bindings
 in effect.
 </para>
 
-<sect1 id='virtual_modifier_names_and_masks'>
+<sect1 id='Virtual_Modifier_Names_and_Masks'>
 <title>Virtual Modifier Names and Masks</title>
 
 <para>
@@ -101,7 +101,7 @@ XkbGetNames</emphasis>
 
 
 </sect1>
-<sect1 id='modifier_definitions'>
+<sect1 id='Modifier_Definitions'>
 <title>Modifier Definitions</title>
 
 <para>
@@ -158,7 +158,7 @@ for the keyboard mapping of interest.
 
 
 </sect1>
-<sect1 id='binding_virtual_modifiers_to_real_modifiers'>
+<sect1 id='Binding_Virtual_Modifiers_to_Real_Modifiers'>
 <title>Binding Virtual Modifiers to Real Modifiers</title>
 
 <para>
@@ -174,7 +174,7 @@ Figure 16.2. <!-- xref -->
 
 
 </sect1>
-<sect1 id='virtual_modifier_key_mapping'>
+<sect1 id='Virtual_Modifier_Key_Mapping'>
 <title>Virtual Modifier Key Mapping</title>
 
 <para>
@@ -326,7 +326,7 @@ client has not requested it) while the server’s corresponding definition may
 contain virtual modifier information. </para></note>
 
 
-<sect2 id='inactive_modifier_sets'>
+<sect2 id='Inactive_Modifier_Sets'>
 <title>Inactive Modifier Sets</title>
 
 <para>
@@ -364,7 +364,7 @@ virtual modifiers are bound.
 
 </sect2>
 </sect1>
-<sect1 id='conventions'>
+<sect1 id='Conventions'>
 <title>Conventions</title>
 
 <para>
@@ -384,7 +384,7 @@ following names are suggested:
 </literallayout>
 
 </sect1>
-<sect1 id='example'>
+<sect1 id='Example'>
 <title>Example</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch08.xml b/libX11/specs/XKB/ch08.xml
index 0d19a3d7a..87c0c08f8 100644
--- a/libX11/specs/XKB/ch08.xml
+++ b/libX11/specs/XKB/ch08.xml
@@ -1,4 +1,4 @@
-<chapter id='indicators'>
+<chapter id='Indicators'>
 <title>Indicators</title>
 
 <para>
@@ -42,7 +42,7 @@ keyboard indicators, which makes it straightforward to provide an on-screen
 used for manipulating them.
 </para>
 
-<sect1 id='indicator_names'>
+<sect1 id='Indicator_Names'>
 <title>Indicator Names</title>
 
 <para>
@@ -62,7 +62,7 @@ XkbGetNames</emphasis>
 
 
 </sect1>
-<sect1 id='indicator_data_structures'>
+<sect1 id='Indicator_Data_Structures'>
 <title>Indicator Data Structures</title>
 
 <para>
@@ -74,7 +74,7 @@ XkbIndicatorMapRec</emphasis>
 </para>
 
 
-<sect2 id='xkbindicatorrec'>
+<sect2 id='XkbIndicatorRec'>
 <title>XkbIndicatorRec</title>
 
 <para>
@@ -129,7 +129,7 @@ phys_indicators</emphasis>
 
 
 </sect2>
-<sect2 id='xkbindicatormaprec'>
+<sect2 id='XkbIndicatorMapRec'>
 <title>XkbIndicatorMapRec</title>
 
 <para>
@@ -191,7 +191,7 @@ For more information on the effects of explicit changes to indicators and the
 relationship to the indicator map, see section 8.4.1. <!-- xref -->
 </para>
 
-<sect3 id='xkbindicatormaprec_flags_field'>
+<sect3 id='XkbIndicatorMapRec_flags_field'>
 <title>XkbIndicatorMapRec flags field</title>
 
 <para>
@@ -306,7 +306,7 @@ indicator on. If the conditions do not match, Xkb turns the indicator off.
 
 </sect3>
 
-<sect3 id='xkbindicatormaprec_which_groups_and_groups_fields'>
+<sect3 id='XkbIndicatorMapRec_which_groups_and_groups_fields'>
 <title>XkbIndicatorMapRec which_groups and groups fields</title>
 
 <para>
@@ -520,7 +520,7 @@ groups</emphasis>
 </table>
 
 </sect3>
-<sect3 id='xkbindicatormaprec_which_mods_and_mods_fields'>
+<sect3 id='XkbIndicatorMapRec_which_mods_and_mods_fields'>
 <title>XkbIndicatorMapRec which_mods and mods fields</title>
 
 <para>
@@ -787,7 +787,7 @@ mods</emphasis>
 </table>
 
 </sect3>
-<sect3 id='xkbindicatormaprec_ctrls_field'>
+<sect3 id='XkbIndicatorMapRec_ctrls_field'>
 <title>XkbIndicatorMapRec ctrls field</title>
 
 <para>
@@ -824,7 +824,7 @@ ctrls</emphasis>
 </sect3>
 </sect2>
 </sect1>
-<sect1 id='getting_information_about_indicators'>
+<sect1 id='Getting_Information_About_Indicators'>
 <title>Getting Information About Indicators</title>
 
 <para>
@@ -842,7 +842,7 @@ XkbIndicatorRec</emphasis>
 </para>
 
 
-<sect2 id='getting_indicator_state'>
+<sect2 id='Getting_Indicator_State'>
 <title>Getting Indicator State</title>
 
 <para>
@@ -923,7 +923,7 @@ XkbGetIndicatorState</emphasis>
 
 
 </sect2>
-<sect2 id='getting_indicator_information_by_index'>
+<sect2 id='Getting_Indicator_Information_by_Index'>
 <title>Getting Indicator Information by Index</title>
 
 <para>
@@ -1018,7 +1018,7 @@ XkbFreeIndicatorMaps</emphasis>
 
 
 </sect2>
-<sect2 id='getting_indicator_information_by_name'>
+<sect2 id='Getting_Indicator_Information_by_Name'>
 <title>Getting Indicator Information by Name</title>
 
 <para>
@@ -1189,7 +1189,7 @@ BadImplementation</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='changing_indicator_maps_and_state'>
+<sect1 id='Changing_Indicator_Maps_and_State'>
 <title>Changing Indicator Maps and State</title>
 
 <para>
@@ -1216,7 +1216,7 @@ XkbChangeIndicators</emphasis>.
 </para>
 
 
-<sect2 id='effects_of_explicit_changes_on_indicators'>
+<sect2 id='Effects_of_Explicit_Changes_on_Indicators'>
 <title>Effects of Explicit Changes on Indicators</title>
 
 <para>
@@ -1314,7 +1314,7 @@ ctrls</emphasis>
 
 
 </sect2>
-<sect2 id='changing_indicator_maps_by_index'>
+<sect2 id='Changing_Indicator_Maps_by_Index'>
 <title>Changing Indicator Maps by Index</title>
 
 <para>
@@ -1380,7 +1380,7 @@ desc</emphasis>
 
 
 </sect2>
-<sect2 id='changing_indicator_maps_by_name'>
+<sect2 id='Changing_Indicator_Maps_by_Name'>
 <title>Changing Indicator Maps by Name</title>
 
 <para>
@@ -1567,7 +1567,7 @@ XkbNamesNotify</emphasis>
 
 
 </sect2>
-<sect2 id='the_xkbindicatorchangesrec_structure'>
+<sect2 id='The_XkbIndicatorChangesRec_Structure'>
 <title>The XkbIndicatorChangesRec Structure</title>
 
 <para>
@@ -1704,7 +1704,7 @@ XkbIndicatorMapNotify</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='tracking_changes_to_indicator_state_or_map'>
+<sect1 id='Tracking_Changes_to_Indicator_State_or_Map'>
 <title>Tracking Changes to Indicator State or Map</title>
 
 <para>
@@ -1983,7 +1983,7 @@ BadMatch</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_indicator_maps'>
+<sect1 id='Allocating_and_Freeing_Indicator_Maps'>
 <title>Allocating and Freeing Indicator Maps</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch09.xml b/libX11/specs/XKB/ch09.xml
index d04669a12..9a6bc9b73 100644
--- a/libX11/specs/XKB/ch09.xml
+++ b/libX11/specs/XKB/ch09.xml
@@ -1,4 +1,4 @@
-<chapter id='bells'>
+<chapter id='Bells'>
 <title>Bells</title>
 
 <para>
@@ -95,7 +95,7 @@ This chapter describes bell names, the functions used to generate named bells,
 and the events the server generates for bells.
 </para>
 
-<sect1 id='bell_names'>
+<sect1 id='Bell_Names'>
 <title>Bell Names</title>
 
 <para>
@@ -192,7 +192,7 @@ XkbBellNotify</emphasis>
 </table>
 
 </sect1>
-<sect1 id='audible_bells'>
+<sect1 id='Audible_Bells'>
 <title>Audible Bells</title>
 
 <para>
@@ -232,7 +232,7 @@ information on auto-reset controls, see section 10.1.2. <!-- xref -->
 </para>
 
 </sect1>
-<sect1 id='bell_functions'>
+<sect1 id='Bell_Functions'>
 <title>Bell Functions</title>
 
 <para>
@@ -334,7 +334,7 @@ XkbBellNotifyEvent</emphasis>
 </tgroup>
 </table>
 
-<sect2 id='generating_named_bells'>
+<sect2 id='Generating_Named_Bells'>
 <title>Generating Named Bells</title>
 
 <para>
@@ -564,7 +564,7 @@ XkbBell</emphasis>
 </para>
 
 </sect2>
-<sect2 id='generating_named_bell_events'>
+<sect2 id='Generating_Named_Bell_Events'>
 <title>Generating Named Bell Events</title>
 
 <para>
@@ -787,7 +787,7 @@ without first initializing the keyboard extension.
 </para>
 
 </sect2>
-<sect2 id='forcing_a_server_generated_bell'>
+<sect2 id='Forcing_a_Server_Generated_Bell'>
 <title>Forcing a Server-Generated Bell</title>
 
 <para>
@@ -980,7 +980,7 @@ XkbBell</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='detecting_bells'>
+<sect1 id='Detecting_Bells'>
 <title>Detecting Bells</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch10.xml b/libX11/specs/XKB/ch10.xml
index 76acd032f..97ce484e1 100644
--- a/libX11/specs/XKB/ch10.xml
+++ b/libX11/specs/XKB/ch10.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_controls'>
+<chapter id='Keyboard_Controls'>
 <title>Keyboard Controls</title>
 
 <para>
@@ -197,7 +197,7 @@ XkbControlsRec</emphasis>
 once follow at the end of the chapter.
 </para>
 
-<sect1 id='controls_that_enable_and_disable_other_controls'>
+<sect1 id='Controls_that_Enable_and_Disable_Other_Controls'>
 <title>Controls that Enable and Disable Other Controls</title>
 
 <para>
@@ -211,7 +211,7 @@ AutoReset</emphasis>
 </para>
 
 
-<sect2 id='the_enabledcontrols_control'>
+<sect2 id='The_EnabledControls_Control'>
 <title>The EnabledControls Control</title>
 
 <para>
@@ -337,7 +337,7 @@ its behavior in detail.
 
 
 </sect2>
-<sect2 id='the_autoreset_control'>
+<sect2 id='The_AutoReset_Control'>
 <title>The AutoReset Control</title>
 
 <para>
@@ -597,7 +597,7 @@ changes</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='control_for_bell_behavior'>
+<sect1 id='Control_for_Bell_Behavior'>
 <title>Control for Bell Behavior</title>
 
 <para>
@@ -607,7 +607,7 @@ AudibleBell</emphasis>
 </para>
 
 
-<sect2 id='the_audiblebell_control'>
+<sect2 id='The_AudibleBell_Control'>
 <title>The AudibleBell Control</title>
 
 <para>
@@ -627,7 +627,7 @@ sound is forced. See section 9.2. <!-- xref -->
 
 </sect2>
 </sect1>
-<sect1 id='controls_for_repeat_key_behavior'>
+<sect1 id='Controls_for_Repeat_Key_Behavior'>
 <title>Controls for Repeat Key Behavior</title>
 
 <para>
@@ -650,7 +650,7 @@ down.
 </para>
 
 
-<sect2 id='the_perkeyrepeat_control'>
+<sect2 id='The_PerKeyRepeat_Control'>
 <title>The PerKeyRepeat Control</title>
 
 <para>
@@ -672,7 +672,7 @@ XkbControlsRec</emphasis>
 
 
 </sect2>
-<sect2 id='the_repeatkeys_control'>
+<sect2 id='The_RepeatKeys_Control'>
 <title>The RepeatKeys Control</title>
 
 <para>
@@ -865,7 +865,7 @@ False</emphasis>
 
 
 </sect2>
-<sect2 id='the_detectableautorepeat_control'>
+<sect2 id='The_DetectableAutorepeat_Control'>
 <title>The DetectableAutorepeat Control</title>
 
 <para>
@@ -1110,7 +1110,7 @@ False</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='controls_for_keyboard_overlays_overlay1_and_overlay2_controls'>
+<sect1 id='Controls_for_Keyboard_Overlays_Overlay1_and_Overlay2_Controls'>
 <title>Controls for Keyboard Overlays (Overlay1 and Overlay2 Controls)</title>
 
 <para>
@@ -1159,7 +1159,7 @@ XkbKB_Overlay2</emphasis>
 
 
 </sect1>
-<sect1 id='controls_for_using_the_mouse_from_the_keyboard'>
+<sect1 id='Controls_for_Using_the_Mouse_from_the_Keyboard'>
 <title>Controls for Using the Mouse from the Keyboard</title>
 
 <para>
@@ -1183,7 +1183,7 @@ discussed in Chapter 16. <!-- xref -->
 </para>
 
 
-<sect2 id='the_mousekeys_control'>
+<sect2 id='The_MouseKeys_Control'>
 <title>The MouseKeys Control</title>
 
 <para>
@@ -1226,7 +1226,7 @@ Shift+Alt+NumLock</emphasis>
 , but this may vary depending on the keymap.</para></note>
 
 </sect2>
-<sect2 id='the_mousekeysaccel_control'>
+<sect2 id='The_MouseKeysAccel_Control'>
 <title>The MouseKeysAccel Control</title>
 
 <para>
@@ -1302,7 +1302,7 @@ XkbSA_MovePtr</emphasis>
  action (see section 16.1) specifies relative or absolute pointer motion. <!-- xref -->
 </para>
 
-<sect3 id='absolute_pointer_motion'>
+<sect3 id='Absolute_Pointer_Motion'>
 <title>Absolute Pointer Motion</title>
 
 <para>
@@ -1319,7 +1319,7 @@ stays at the same X position.
 
 
 </sect3>
-<sect3 id='relative_pointer_motion'>
+<sect3 id='Relative_Pointer_Motion'>
 <title>Relative Pointer Motion</title>
 
 <para>
@@ -1474,7 +1474,7 @@ MouseKeys Acceleration</H5>
 </sect3>
 </sect2>
 </sect1>
-<sect1 id='controls_for_better_keyboard_access_by_physically_impaired_persons'>
+<sect1 id='Controls_for_Better_Keyboard_Access_by_Physically_ImpairedPersons'>
 <title>Controls for Better Keyboard Access by Physically Impaired
 Persons</title>
 
@@ -1493,7 +1493,7 @@ Wisconsin-Madison WI 53705-2280. Phone: 608-262-6966. e-mail: info@trace.wisc.ed
 </para></footnote>.
 </para>
 
-<sect2 id='the_accessxkeys_control'>
+<sect2 id='The_AccessXKeys_Control'>
 <title>The AccessXKeys Control</title>
 
 <para>
@@ -1561,7 +1561,7 @@ in state, as described in section 10.6.3, or  <!-- xref -->
 </para>
 
 </sect2>
-<sect2 id='the_accessxtimeout_control'>
+<sect2 id='The_AccessXTimeout_Control'>
 <title>The AccessXTimeout Control</title>
 
 <para>
@@ -1849,7 +1849,7 @@ False</emphasis>
 
 
 </sect2>
-<sect2 id='the_accessxfeedback_control'>
+<sect2 id='The_AccessXFeedback_Control'>
 <title>The AccessXFeedback Control</title>
 
 <para>
@@ -1989,7 +1989,7 @@ XkbBellNotify</emphasis>
 
 
 </sect2>
-<sect2 id='accessxnotify_events'>
+<sect2 id='AccessXNotify_Events'>
 <title>AccessXNotify Events</title>
 
 <para>
@@ -2089,7 +2089,7 @@ BounceKeys</emphasis>
  debounce delay.
 </para>
 
-<sect3 id='selecting_for_accessx_events'>
+<sect3 id='Selecting_for_AccessX_Events'>
 <title>Selecting for AccessX Events</title>
 
 <para>
@@ -2183,7 +2183,7 @@ values_for_bits</emphasis>
 
 </sect3>
 </sect2>
-<sect2 id='stickykeys_repeatkeys_and_mousekeys_events'>
+<sect2 id='StickyKeys_RepeatKeys_and_MouseKeys_Events'>
 <title>StickyKeys, RepeatKeys, and MouseKeys Events</title>
 
 <para>
@@ -2211,7 +2211,7 @@ MouseKeys</emphasis>
 
 
 </sect2>
-<sect2 id='the_slowkeys_control'>
+<sect2 id='The_SlowKeys_Control'>
 <title>The SlowKeys Control</title>
 
 <para>
@@ -2399,7 +2399,7 @@ False</emphasis>
 
 
 </sect2>
-<sect2 id='the_bouncekeys_control'>
+<sect2 id='The_BounceKeys_Control'>
 <title>The BounceKeys Control</title>
 
 <para>
@@ -2581,7 +2581,7 @@ False</emphasis>
 </para>
 
 </sect2>
-<sect2 id='the_stickykeys_control'>
+<sect2 id='The_StickyKeys_Control'>
 <title>The StickyKeys Control</title>
 
 <para>
@@ -2698,7 +2698,7 @@ configured: one to automatically disable it, and one to control the latching
 behavior of modifier keys.
 </para>
 
-<sect3 id='stickykeys_options'>
+<sect3 id='StickyKeys_Options'>
 <title>StickyKeys Options</title>
 
 <para>
@@ -2904,7 +2904,7 @@ False</emphasis>
 </sect3>
 </sect2>
 </sect1>
-<sect1 id='controls_for_general_keyboard_mapping'>
+<sect1 id='Controls_for_General_Keyboard_Mapping'>
 <title>Controls for General Keyboard Mapping</title>
 
 <para>
@@ -2944,7 +2944,7 @@ IgnoreGroupLock</emphasis>
 specifying a grab for every possible modifier combination.
 </para>
 
-<sect2 id='the_groupswrap_control'>
+<sect2 id='The_GroupsWrap_Control'>
 <title>The GroupsWrap Control</title>
 
 <para>
@@ -3019,7 +3019,7 @@ group_info</emphasis>
 , which also normalizes a group under certain circumstances.</para></note>
 
 </sect2>
-<sect2 id='the_ignorelockmods_control'>
+<sect2 id='The_IgnoreLockMods_Control'>
 <title>The IgnoreLockMods Control</title>
 
 <para>
@@ -3202,7 +3202,7 @@ False</emphasis>
 </para>
 
 </sect2>
-<sect2 id='the_ignoregrouplock_control'>
+<sect2 id='The_IgnoreGroupLock_Control'>
 <title>The IgnoreGroupLock Control</title>
 
 <para>
@@ -3222,7 +3222,7 @@ functions (see section 10.1) to change its state. <!-- xref -->
 
 
 </sect2>
-<sect2 id='the_internalmods_control'>
+<sect2 id='The_InternalMods_Control'>
 <title>The InternalMods Control</title>
 
 <para>
@@ -3397,7 +3397,7 @@ False</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='the_xkbcontrolsrec_structure'>
+<sect1 id='The_XkbControlsRec_Structure'>
 <title>The XkbControlsRec Structure</title>
 
 <para>
@@ -4303,7 +4303,7 @@ indicates that the key is a repeating key.
 </sect3>
 </sect2>
 </sect1>
-<sect1 id='querying_controls'>
+<sect1 id='Querying_Controls'>
 <title>Querying Controls</title>
 
 <para>
@@ -4443,7 +4443,7 @@ which</emphasis>
 
 
 </sect1>
-<sect1 id='changing_controls'>
+<sect1 id='Changing_Controls'>
 <title>Changing Controls</title>
 
 <para>
@@ -4585,7 +4585,7 @@ XkbChangeEnabledControls</emphasis>
 </para>
 
 
-<sect2 id='the_xkbcontrolschangesrec_structure'>
+<sect2 id='The_XkbControlsChangesRec_Structure'>
 <title>The XkbControlsChangesRec Structure</title>
 
 <para>
@@ -4707,7 +4707,7 @@ dpy</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='tracking_changes_to_keyboard_controls'>
+<sect1 id='Tracking_Changes_to_Keyboard_Controls'>
 <title>Tracking Changes to Keyboard Controls</title>
 
 <para>
@@ -5019,7 +5019,7 @@ BadMatch</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_an_xkbcontrolsrec'>
+<sect1 id='Allocating_and_Freeing_an_XkbControlsRec'>
 <title>Allocating and Freeing an XkbControlsRec</title>
 
 <para>
@@ -5208,7 +5208,7 @@ NULL.</emphasis>
 </para>
 
 </sect1>
-<sect1 id='the_miscellaneous_per_client_controls'>
+<sect1 id='The_Miscellaneous_Per_client_Controls'>
 <title>The Miscellaneous Per-client Controls</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch11.xml b/libX11/specs/XKB/ch11.xml
index fe05e9cb2..1d8d1dc2a 100644
--- a/libX11/specs/XKB/ch11.xml
+++ b/libX11/specs/XKB/ch11.xml
@@ -1,4 +1,4 @@
-<chapter id='x_library_controls'>
+<chapter id='X_Library_Controls'>
 <title>X Library Controls</title>
 
 <para>
@@ -53,7 +53,7 @@ normally; however, the feedback that would normally occur with the controls
 enabled may be missing.
 </para>
 
-<sect1 id='controls_affecting_keycode_to_string_translation'>
+<sect1 id='Controls_Affecting_Keycode_to_String_Translation'>
 <title>Controls Affecting Keycode-to-String Translation</title>
 
 <para>
@@ -71,7 +71,7 @@ affecting simple string lookups are:
      <emphasis>LevelOneUsesShiftAndLock</emphasis>
 </programlisting></para>
 
-<sect2 id='forcelatin1lookup'>
+<sect2 id='ForceLatin1Lookup'>
 <title>ForceLatin1Lookup</title>
 
 <para>
@@ -89,7 +89,7 @@ is disabled, allowing characters outside of the Latin1 set to be returned.
 
 
 </sect2>
-<sect2 id='consumelookupmods'>
+<sect2 id='ConsumeLookupMods'>
 <title>ConsumeLookupMods</title>
 
 <para>
@@ -166,7 +166,7 @@ refer to Chapter 12.
 
 
 </sect2>
-<sect2 id='alwaysconsumeshiftandlock'>
+<sect2 id='AlwaysConsumeShiftAndLock'>
 <title>AlwaysConsumeShiftAndLock</title>
 
 <para>
@@ -187,7 +187,7 @@ AlwaysConsumeShiftAndLock</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='controls_affecting_compose_processing'>
+<sect1 id='Controls_Affecting_Compose_Processing'>
 <title>Controls Affecting Compose Processing</title>
 
 <para>
@@ -216,7 +216,7 @@ the compose processing controls is optional in an Xkb implementation.
 </para>
 
 
-<sect2 id='consumekeysoncomposefail'>
+<sect2 id='ConsumeKeysOnComposeFail'>
 <title>ConsumeKeysOnComposeFail</title>
 
 <para>
@@ -255,7 +255,7 @@ ConsumeKeysOnComposeFail</emphasis>
 
 
 </sect2>
-<sect2 id='composeled'>
+<sect2 id='ComposeLED'>
 <title>ComposeLED</title>
 
 <para>
@@ -288,7 +288,7 @@ this purpose.
 
 
 </sect2>
-<sect2 id='beeponcomposefail'>
+<sect2 id='BeepOnComposeFail'>
 <title>BeepOnComposeFail</title>
 
 <para>
@@ -325,10 +325,10 @@ ComposeFail</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='controls_effecting_event_delivery'>
+<sect1 id='Controls_Effecting_Event_Delivery'>
 <title>Controls Effecting Event Delivery</title>
 
-<sect2 id='ignorenewkeyboards'>
+<sect2 id='IgnoreNewKeyboards'>
 <title>IgnoreNewKeyboards</title>
 
 <para>
@@ -361,7 +361,7 @@ MappingNotify</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='manipulating_the_library_controls'>
+<sect1 id='Manipulating_the_Library_Controls'>
 <title>Manipulating the Library Controls</title>
 
 <para>
@@ -418,7 +418,7 @@ defined in Table 11.1. <!-- xref -->
 </tgroup>
 </table>
 
-<sect2 id='determining_which_library_controls_are_implemented'>
+<sect2 id='Determining_Which_Library_Controls_are_Implemented'>
 <title>Determining Which Library Controls are Implemented</title>
 
 <para>
@@ -459,7 +459,7 @@ library and is composed of an inclusive OR of bits from Table 11.1.
 
 
 </sect2>
-<sect2 id='determining_the_state_of_the_library_controls'>
+<sect2 id='Determining_the_State_of_the_Library_Controls'>
 <title>Determining the State of the Library Controls</title>
 
 <para>
@@ -502,7 +502,7 @@ is enabled does not imply that it is actually implemented.
 </para>
 
 </sect2>
-<sect2 id='changing_the_state_of_the_library_controls'>
+<sect2 id='Changing_the_State_of_the_Library_Controls'>
 <title>Changing the State of the Library Controls</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch12.xml b/libX11/specs/XKB/ch12.xml
index 1f10261c7..928d83828 100644
--- a/libX11/specs/XKB/ch12.xml
+++ b/libX11/specs/XKB/ch12.xml
@@ -1,4 +1,4 @@
-<chapter id='interpreting_key_events'>
+<chapter id='Interpreting_Key_Events'>
 <title>Interpreting Key Events</title>
 
 <para>
@@ -7,7 +7,7 @@ to directly interpret Xkb data structures. Xkb also modifies the behavior of
 several core X library functions.
 </para>
 
-<sect1 id='effects_of_xkb_on_the_core_x_library'>
+<sect1 id='Effects_of_Xkb_on_the_Core_X_Library'>
 <title>Effects of Xkb on the Core X Library</title>
 
 <para>
@@ -24,7 +24,7 @@ includes ways to control or disable it.
 </para>
 
 
-<sect2 id='effects_of_xkb_on_event_state'>
+<sect2 id='Effects_of_Xkb_on_Event_State'>
 <title>Effects of Xkb on Event State</title>
 
 <para>
@@ -38,7 +38,7 @@ by the core protocol.
 
 
 </sect2>
-<sect2 id='effects_of_xkb_on_mappingnotify_events'>
+<sect2 id='Effects_of_Xkb_on_MappingNotify_Events'>
 <title>Effects of Xkb on MappingNotify Events</title>
 
 <para>
@@ -112,7 +112,7 @@ requesting notification of changes to the legal range of keycodes.
 
 
 </sect2>
-<sect2 id='x_library_functions_affected_by_xkb'>
+<sect2 id='X_Library_Functions_Affected_by_Xkb'>
 <title>X Library Functions Affected by Xkb</title>
 
 <para>
@@ -228,7 +228,7 @@ the keysym are consumed and are not used to look up the string.
 
 </sect2>
 </sect1>
-<sect1 id='xkb_event_and_keymap_functions'>
+<sect1 id='Xkb_Event_and_Keymap_Functions'>
 <title>Xkb Event and Keymap Functions</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch13.xml b/libX11/specs/XKB/ch13.xml
index 6f8fce033..101003817 100644
--- a/libX11/specs/XKB/ch13.xml
+++ b/libX11/specs/XKB/ch13.xml
@@ -1,4 +1,4 @@
-<chapter id='keyboard_geometry'>
+<chapter id='Keyboard_Geometry'>
 <title>Keyboard Geometry</title>
 
 <para>
@@ -244,7 +244,7 @@ section.
 Keyboard with Four Sections</H5>
 -->
 
-<sect1 id='shapes_and_outlines'>
+<sect1 id='Shapes_and_Outlines'>
 <title>Shapes and Outlines</title>
 
 <para>
@@ -348,7 +348,7 @@ degraded image of the keyboard.
 </para>
 
 </sect1>
-<sect1 id='sections'>
+<sect1 id='Sections'>
 <title>Sections</title>
 
 <para>
@@ -436,7 +436,7 @@ containing the entire section.
 </listitem>
 </itemizedlist>
 </sect1>
-<sect1 id='rows_and_keys'>
+<sect1 id='Rows_and_Keys'>
 <title>Rows and Keys</title>
 
 <para>
@@ -464,7 +464,7 @@ between a key and its predecessor.
 
 
 </sect1>
-<sect1 id='doodads'>
+<sect1 id='Doodads'>
 <title>Doodads</title>
 
 <para>
@@ -629,7 +629,7 @@ XkbLogoDoodad</emphasis>
 </table>
 
 </sect1>
-<sect1 id='overlay_rows_and_overlay_keys'>
+<sect1 id='Overlay_Rows_and_Overlay_Keys'>
 <title>Overlay Rows and Overlay Keys</title>
 
 <para>
@@ -660,7 +660,7 @@ while the key specified in over must not be.
 
 
 </sect1>
-<sect1 id='drawing_a_keyboard_representation'>
+<sect1 id='Drawing_a_Keyboard_Representation'>
 <title>Drawing a Keyboard Representation</title>
 
 <para>
@@ -678,7 +678,7 @@ To draw a representation of the keyboard, draw in the following order:
 </programlisting></para>
 
 </sect1>
-<sect1 id='geometry_data_structures'>
+<sect1 id='Geometry_Data_Structures'>
 <title>Geometry Data Structures</title>
 
 <para>
@@ -956,7 +956,7 @@ angle</emphasis>
  degrees.
 </para>
 
-<sect2 id='doodadrec_structures'>
+<sect2 id='DoodadRec_Structures'>
 <title>DoodadRec Structures</title>
 
 <para>
@@ -1071,7 +1071,7 @@ typedef struct _XkbLogoDoodad {
 
 </sect2>
 </sect1>
-<sect1 id='getting_keyboard_geometry_from_the_server'>
+<sect1 id='Getting_Keyboard_Geometry_From_the_Server'>
 <title>Getting Keyboard Geometry From the Server</title>
 
 <para>
@@ -1202,7 +1202,7 @@ name</emphasis>
 </para>
 
 </sect1>
-<sect1 id='using_keyboard_geometry'>
+<sect1 id='Using_Keyboard_Geometry'>
 <title>Using Keyboard Geometry</title>
 
 <para>
@@ -1544,7 +1544,7 @@ under</emphasis>
 
 
 </sect1>
-<sect1 id='adding_elements_to_a_keyboard_geometry'>
+<sect1 id='Adding_Elements_to_a_Keyboard_Geometry'>
 <title>Adding Elements to a Keyboard Geometry</title>
 
 <para>
@@ -2402,7 +2402,7 @@ NULL</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_geometry_components'>
+<sect1 id='Allocating_and_Freeing_Geometry_Components'>
 <title>Allocating and Freeing Geometry Components</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch14.xml b/libX11/specs/XKB/ch14.xml
index cc376dba4..518e1aca4 100644
--- a/libX11/specs/XKB/ch14.xml
+++ b/libX11/specs/XKB/ch14.xml
@@ -1,4 +1,4 @@
-<chapter id='xkb_keyboard_mapping'>
+<chapter id='Xkb_Keyboard_Mapping'>
 <title>Xkb Keyboard Mapping</title>
 
 <para>
@@ -30,7 +30,7 @@ Chapter 15, "Xkb Client Keyboard Mapping" and Chapter 16, "Xkb Server Keyboard
 Mapping."
 </para>
 
-<sect1 id='notation_and_terminology'>
+<sect1 id='Notation_and_Terminology'>
 <title>Notation and Terminology</title>
 
 <para>
@@ -118,7 +118,7 @@ A</emphasis>
 .
 </para>
 
-<sect2 id='core_implementation'>
+<sect2 id='Core_Implementation'>
 <title>Core Implementation</title>
 
 <para>
@@ -161,7 +161,7 @@ Num_Lock</emphasis>
 
 
 </sect2>
-<sect2 id='xkb_implementation'>
+<sect2 id='Xkb_Implementation'>
 <title>Xkb Implementation</title>
 
 <para>
@@ -209,7 +209,7 @@ detail in section 16.2. <!-- xref -->
 
 </sect2>
 </sect1>
-<sect1 id='getting_map_components_from_the_server'>
+<sect1 id='Getting_Map_Components_from_the_Server'>
 <title>Getting Map Components from the Server</title>
 
 <para>
@@ -571,7 +571,7 @@ the reply from the server was invalid).
 </para>
 
 </sect1>
-<sect1 id='changing_map_components_in_the_server'>
+<sect1 id='Changing_Map_Components_in_the_Server'>
 <title>Changing Map Components in the Server</title>
 
 <para>
@@ -679,7 +679,7 @@ helper functions and provides a pointer to where they are defined.
 </para>
 
 
-<sect2 id='the_xkbmapchangesrec_structure'>
+<sect2 id='The_XkbMapChangesRec_Structure'>
 <title>The XkbMapChangesRec Structure</title>
 
 <para>
@@ -944,7 +944,7 @@ BadValue</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='tracking_changes_to_map_components'>
+<sect1 id='Tracking_Changes_to_Map_Components'>
 <title>Tracking Changes to Map Components</title>
 
 <para>
@@ -1042,7 +1042,7 @@ resized</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_client_and_server_maps'>
+<sect1 id='Allocating_and_Freeing_Client_and_Server_Maps'>
 <title>Allocating and Freeing Client and Server Maps</title>
 
 <para>
@@ -1082,7 +1082,7 @@ Xfree</emphasis>
 </para>
 
 
-<sect2 id='allocating_an_empty_client_map'>
+<sect2 id='Allocating_an_Empty_Client_Map'>
 <title>Allocating an Empty Client Map</title>
 
 <para>
@@ -1271,7 +1271,7 @@ BadValue</emphasis>
 
 
 </sect2>
-<sect2 id='freeing_a_client_map'>
+<sect2 id='Freeing_a_Client_Map'>
 <title>Freeing a Client Map</title>
 
 <para>
@@ -1363,7 +1363,7 @@ NULL.</emphasis>
 
 
 </sect2>
-<sect2 id='allocating_an_empty_server_map'>
+<sect2 id='Allocating_an_Empty_Server_Map'>
 <title>Allocating an Empty Server Map</title>
 
 <para>
@@ -1548,7 +1548,7 @@ BadAlloc</emphasis>
 
 
 </sect2>
-<sect2 id='freeing_a_server_map'>
+<sect2 id='Freeing_a_Server_Map'>
 <title>Freeing a Server Map</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch15.xml b/libX11/specs/XKB/ch15.xml
index 25ee61f5f..5ab96ae13 100644
--- a/libX11/specs/XKB/ch15.xml
+++ b/libX11/specs/XKB/ch15.xml
@@ -1,4 +1,4 @@
-<chapter id='xkb_client_keyboard_mapping'>
+<chapter id='Xkb_Client_Keyboard_Mapping'>
 <title>Xkb Client Keyboard Mapping</title>
 
 <para>
@@ -25,7 +25,7 @@ Figure 15.1 shows the relationships between elements in the client map:
 Xkb Client Map</H5>
 -->
 
-<sect1 id='the_xkbclientmaprec_structure'>
+<sect1 id='The_XkbClientMapRec_Structure'>
 <title>The XkbClientMapRec Structure</title>
 
 <para>
@@ -58,7 +58,7 @@ XkbClientMapRec</emphasis>
 
 
 </sect1>
-<sect1 id='key_types'>
+<sect1 id='Key_Types'>
 <title>Key Types</title>
 
 <para>
@@ -398,7 +398,7 @@ level-one symbols.
 </para>
 
 
-<sect2 id='the_canonical_key_types'>
+<sect2 id='The_Canonical_Key_Types'>
 <title>The Canonical Key Types</title>
 
 <para>
@@ -423,7 +423,7 @@ types</emphasis>
      <emphasis>XkbKeypadIndex</emphasis>
 </programlisting></para>
 
-<sect3 id='one_level'>
+<sect3 id='ONE_LEVEL'>
 <title>ONE_LEVEL</title>
 
 <para>
@@ -451,7 +451,7 @@ XkbOneLevelIndex</emphasis>
 
 
 </sect3>
-<sect3 id='two_level'>
+<sect3 id='TWO_LEVEL'>
 <title>TWO_LEVEL</title>
 
 <para>
@@ -484,7 +484,7 @@ XkbTwoLevelIndex</emphasis>
 
 
 </sect3>
-<sect3 id='alphabetic'>
+<sect3 id='ALPHABETIC'>
 <title>ALPHABETIC</title>
 
 <para>
@@ -561,7 +561,7 @@ XkbAlphabeticIndex</emphasis>
 
 
 </sect3>
-<sect3 id='keypad'>
+<sect3 id='KEYPAD'>
 <title>KEYPAD</title>
 
 <para>
@@ -635,7 +635,7 @@ XkbKeypadIndex</emphasis>
 
 
 </sect3>
-<sect3 id='initializing_the_canonical_key_types_in_a_new_client_map'>
+<sect3 id='Initializing_the_Canonical_Key_Types_in_a_New_Client_Map'>
 <title>Initializing the Canonical Key Types in a New Client Map</title>
 
 <para>
@@ -740,7 +740,7 @@ xkb</emphasis>
 
 </sect3>
 </sect2>
-<sect2 id='getting_key_types_from_the_server'>
+<sect2 id='Getting_Key_Types_from_the_Server'>
 <title>Getting Key Types from the Server</title>
 
 <para>
@@ -834,7 +834,7 @@ num</emphasis>
 
 
 </sect2>
-<sect2 id='changing_the_number_of_levels_in_a_key_type'>
+<sect2 id='Changing_the_Number_of_Levels_in_a_Key_Type'>
 <title>Changing the Number of Levels in a Key Type</title>
 
 <para>
@@ -1004,7 +1004,7 @@ Success</emphasis>
 
 
 </sect2>
-<sect2 id='copying_key_types'>
+<sect2 id='Copying_Key_Types'>
 <title>Copying Key Types</title>
 
 <para>
@@ -1182,7 +1182,7 @@ Success</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='key_symbol_map'>
+<sect1 id='Key_Symbol_Map'>
 <title>Key Symbol Map</title>
 
 <para>
@@ -1264,7 +1264,7 @@ These fields are described in detail in the following sections.
 </para>
 
 
-<sect2 id='per_key_key_type_indices'>
+<sect2 id='Per_Key_Key_Type_Indices'>
 <title>Per-Key Key Type Indices</title>
 
 <para>
@@ -1392,7 +1392,7 @@ group</emphasis>
 
 
 </sect2>
-<sect2 id='per_key_group_information'>
+<sect2 id='Per_Key_Group_Information'>
 <title>Per-Key Group Information</title>
 
 <para>
@@ -1646,7 +1646,7 @@ XkbSymMapRec</emphasis>
 
 
 </sect2>
-<sect2 id='key_width'>
+<sect2 id='Key_Width'>
 <title>Key Width</title>
 
 <para>
@@ -1664,7 +1664,7 @@ symbols or set of types bound to a key are changed.
 
 
 </sect2>
-<sect2 id='offset_in_to_the_symbol_map'>
+<sect2 id='Offset_in_to_the_Symbol_Map'>
 <title>Offset in to the Symbol Map</title>
 
 <para>
@@ -1974,7 +1974,7 @@ keycode</emphasis>
 
 
 </sect2>
-<sect2 id='getting_the_symbol_map_for_keys_from_the_server'>
+<sect2 id='Getting_the_Symbol_Map_for_Keys_from_the_Server'>
 <title>Getting the Symbol Map for Keys from the Server</title>
 
 <para>
@@ -2090,7 +2090,7 @@ BadAlloc</emphasis>
 
 
 </sect2>
-<sect2 id='changing_the_number_of_groups_and_types_bound_to_a_key'>
+<sect2 id='Changing_the_Number_of_Groups_and_Types_Bound_to_a_Key'>
 <title>Changing the Number of Groups and Types Bound to a Key</title>
 
 <para>
@@ -2332,7 +2332,7 @@ BadAlloc</emphasis>
 
 
 </sect2>
-<sect2 id='changing_the_number_of_symbols_bound_to_a_key'>
+<sect2 id='Changing_the_Number_of_Symbols_Bound_to_a_Key'>
 <title>Changing the Number of Symbols Bound to a Key</title>
 
 <para>
@@ -2458,7 +2458,7 @@ a key.</para></note>
 
 </sect2>
 </sect1>
-<sect1 id='the_per_key_modifier_map'>
+<sect1 id='The_Per_Key_Modifier_Map'>
 <title>The Per-Key Modifier Map</title>
 
 <para>
@@ -2496,7 +2496,7 @@ Chapter 16).
 </para>
 
 
-<sect2 id='getting_the_per_key_modifier_map_from_the_server'>
+<sect2 id='Getting_the_Per_Key_Modifier_Map_from_the_Server'>
 <title>Getting the Per-Key Modifier Map from the Server</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch16.xml b/libX11/specs/XKB/ch16.xml
index 515323f7b..2cfdd8e2d 100644
--- a/libX11/specs/XKB/ch16.xml
+++ b/libX11/specs/XKB/ch16.xml
@@ -1,4 +1,4 @@
-<chapter id='xkb_server_keyboard_mapping'>
+<chapter id='Xkb_Server_Keyboard_Mapping'>
 <title>Xkb Server Keyboard Mapping</title>
 
 <para>
@@ -72,7 +72,7 @@ vmodmap</emphasis>
 and are defined in section 16.4.
 </para>
 
-<sect1 id='key_actions'>
+<sect1 id='Key_Actions'>
 <title>Key Actions</title>
 
 <para>
@@ -410,7 +410,7 @@ keycode</emphasis>
 </para>
 
 
-<sect2 id='the_xkbaction_structure'>
+<sect2 id='The_XkbAction_Structure'>
 <title>The XkbAction Structure</title>
 
 <para>
@@ -448,7 +448,7 @@ structures for each action in detail.
 
 
 </sect2>
-<sect2 id='the_xkbanyaction_structure'>
+<sect2 id='The_XkbAnyAction_Structure'>
 <title>The XkbAnyAction Structure</title>
 
 <para>
@@ -598,7 +598,7 @@ have an associated data structure.
 </table>
 
 </sect2>
-<sect2 id='actions_for_changing_modifiers_state'>
+<sect2 id='Actions_for_Changing_Modifiers_State'>
 <title>Actions for Changing Modifiers’ State</title>
 
 <para>
@@ -973,7 +973,7 @@ XkbISOAction</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_changing_group_state'>
+<sect2 id='Actions_for_Changing_Group_State'>
 <title>Actions for Changing Group State</title>
 
 <para>
@@ -1272,7 +1272,7 @@ XkbISOAction</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_moving_the_pointer'>
+<sect2 id='Actions_for_Moving_the_Pointer'>
 <title>Actions for Moving the Pointer</title>
 
 <para>
@@ -1563,7 +1563,7 @@ y</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_simulating_pointer_button_press_and_release'>
+<sect2 id='Actions_for_Simulating_Pointer_Button_Press_and_Release'>
 <title>Actions for Simulating Pointer Button Press and Release</title>
 
 <para>
@@ -1782,7 +1782,7 @@ XkbSA_LockPtrBtn</emphasis>
 </table>
 
 </sect2>
-<sect2 id='actions_for_changing_the_pointer_button_simulated'>
+<sect2 id='Actions_for_Changing_the_Pointer_Button_Simulated'>
 <title>Actions for Changing the Pointer Button Simulated</title>
 
 <para>
@@ -1982,7 +1982,7 @@ val</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_locking_modifiers_and_group'>
+<sect2 id='Actions_for_Locking_Modifiers_and_Group'>
 <title>Actions for Locking Modifiers and Group</title>
 
 <para>
@@ -2424,7 +2424,7 @@ SA_LockControls</emphasis>
 </table>
 
 </sect2>
-<sect2 id='actions_for_changing_the_active_screen'>
+<sect2 id='Actions_for_Changing_the_Active_Screen'>
 <title>Actions for Changing the Active Screen</title>
 
 <para>
@@ -2596,7 +2596,7 @@ s</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_changing_boolean_controls_state'>
+<sect2 id='Actions_for_Changing_Boolean_Controls_State'>
 <title>Actions for Changing Boolean Controls State</title>
 
 <para>
@@ -2858,7 +2858,7 @@ ctrls</emphasis>
 
 
 </sect2>
-<sect2 id='actions_for_generating_messages'>
+<sect2 id='Actions_for_Generating_Messages'>
 <title>Actions for Generating Messages</title>
 
 <para>
@@ -2954,7 +2954,7 @@ XkbActionMessageLength</emphasis>
  unsigned characters and may be set to anything the keymap designer wishes.
 </para>
 
-<sect3 id='detecting_key_action_messages'>
+<sect3 id='Detecting_Key_Action_Messages'>
 <title>Detecting Key Action Messages</title>
 
 <para>
@@ -3090,7 +3090,7 @@ XkbActionMessageLength</emphasis>
 
 </sect3>
 </sect2>
-<sect2 id='actions_for_generating_a_different_keycode'>
+<sect2 id='Actions_for_Generating_a_Different_Keycode'>
 <title>Actions for Generating a Different Keycode</title>
 
 <para>
@@ -3351,7 +3351,7 @@ v</emphasis>
 </literallayout>
 
 </sect2>
-<sect2 id='actions_for_generating_devicebuttonpress_and_devicebuttonrelease'>
+<sect2 id='Actions_for_Generating_DeviceButtonPress_and_DeviceButtonRelease'>
 <title>Actions for Generating DeviceButtonPress and DeviceButtonRelease</title>
 
 <para>
@@ -3531,7 +3531,7 @@ XkbSA_LockDeviceBtn</emphasis>
 </table>
 
 </sect2>
-<sect2 id='actions_for_simulating_events_from_device_valuators'>
+<sect2 id='Actions_for_Simulating_Events_from_Device_Valuators'>
 <title>Actions for Simulating Events from Device Valuators</title>
 
 <para>
@@ -3683,7 +3683,7 @@ For a dial box with eight dials, any value in the range 0..7 would be correct.
 
 
 </sect2>
-<sect2 id='obtaining_key_actions_for_keys_from_the_server'>
+<sect2 id='Obtaining_Key_Actions_for_Keys_from_the_Server'>
 <title>Obtaining Key Actions for Keys from the Server</title>
 
 <para>
@@ -3802,7 +3802,7 @@ BadAlloc</emphasis>
 
 
 </sect2>
-<sect2 id='changing_the_number_of_actions_bound_to_a_key'>
+<sect2 id='Changing_the_Number_of_Actions_Bound_to_a_Key'>
 <title>Changing the Number of Actions Bound to a Key</title>
 
 <para>
@@ -3932,7 +3932,7 @@ a key.</para></note>
 
 </sect2>
 </sect1>
-<sect1 id='key_behavior'>
+<sect1 id='Key_Behavior'>
 <title>Key Behavior</title>
 
 <para>
@@ -3944,7 +3944,7 @@ pressed again.
 </para>
 
 
-<sect2 id='radio_groups2'>
+<sect2 id='Radio_Groups_2'>
 <title>Radio Groups</title>
 
 <para>
@@ -3989,7 +3989,7 @@ currently defined is:
 </programlisting></para>
 
 </sect2>
-<sect2 id='the_xkbbehavior_structure'>
+<sect2 id='The_XkbBehavior_Structure'>
 <title>The XkbBehavior Structure</title>
 
 <para>
@@ -4123,7 +4123,7 @@ keyboard to implement the behavior.
 
 
 </sect2>
-<sect2 id='obtaining_key_behaviors_for_keys_from_the_server'>
+<sect2 id='Obtaining_Key_Behaviors_for_Keys_from_the_Server'>
 <title>Obtaining Key Behaviors for Keys from the Server</title>
 
 <para>
@@ -4242,7 +4242,7 @@ BadAlloc</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='explicit_components_avoiding_automatic_remapping_by_the_server'>
+<sect1 id='Explicit_ComponentsAvoiding_Automatic_Remapping_by_the_Server'>
 <title>Explicit Components—Avoiding Automatic Remapping by the Server</title>
 
 <para>
@@ -4354,7 +4354,7 @@ match the key.
 </tgroup>
 </table>
 
-<sect2 id='obtaining_explicit_components_for_keys_from_the_server'>
+<sect2 id='Obtaining_Explicit_Components_for_Keys_from_the_Server'>
 <title>Obtaining Explicit Components for Keys from the Server</title>
 
 <para>
@@ -4473,7 +4473,7 @@ BadAlloc</emphasis>
 
 </sect2>
 </sect1>
-<sect1 id='virtual_modifier_mapping'>
+<sect1 id='Virtual_Modifier_Mapping'>
 <title>Virtual Modifier Mapping</title>
 
 <para>
@@ -4565,7 +4565,7 @@ keyboard description are shown in Figure 16.2.
 Virtual Modifier Relationships</H5>
 -->
 
-<sect2 id='obtaining_virtual_modifier_bindings_from_the_server'>
+<sect2 id='Obtaining_Virtual_Modifier_Bindings_from_the_Server'>
 <title>Obtaining Virtual Modifier Bindings from the Server</title>
 
 <para>
@@ -4670,7 +4670,7 @@ BadAlloc</emphasis>.
 
 
 </sect2>
-<sect2 id='obtaining_per_key_virtual_modifier_mappings_from_the_server'>
+<sect2 id='Obtaining_Per_Key_Virtual_Modifier_Mappings_from_the_Server'>
 <title>Obtaining Per-Key Virtual Modifier Mappings from the Server</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch17.xml b/libX11/specs/XKB/ch17.xml
index 3c44da5c1..2bf30275b 100644
--- a/libX11/specs/XKB/ch17.xml
+++ b/libX11/specs/XKB/ch17.xml
@@ -1,4 +1,4 @@
-<chapter id='the_xkb_compatibility_map'>
+<chapter id='The_Xkb_Compatibility_Map'>
 <title>The Xkb Compatibility Map</title>
 
 <para>
@@ -122,7 +122,7 @@ subsequent transformations have a particular result.
 </para>
 
 
-<sect1 id='the_xkbcompatmap_structure'>
+<sect1 id='The_XkbCompatMap_Structure'>
 <title>The XkbCompatMap Structure</title>
 
 <para>
@@ -171,7 +171,7 @@ override controls are used in each of the three cases where compatibility
 transformations are made.
 </para>
 
-<sect2 id='xkb_state_to_core_protocol_state_transformation'>
+<sect2 id='Xkb_State_to_Core_Protocol_State_Transformation'>
 <title>Xkb State to Core Protocol State Transformation</title>
 
 <para>
@@ -247,7 +247,7 @@ event as zero.
 </para>
 
 </sect2>
-<sect2 id='core_keyboard_mapping_to_xkb_keyboard_mapping_transformation'>
+<sect2 id='Core_Keyboard_Mapping_to_Xkb_Keyboard_Mapping_Transformation'>
 <title>Core Keyboard Mapping to Xkb Keyboard Mapping Transformation</title>
 
 <para>
@@ -399,7 +399,7 @@ XkbCompatMapRec</emphasis>
  (see Figure 17.3).
 </para>
 
-<sect3 id='symbol_interpretations_the_xkbsyminterpretrec_structure'>
+<sect3 id='Symbol_Interpretations__the_XkbSymInterpretRec_Structure'>
 <title>Symbol Interpretations — the XkbSymInterpretRec Structure</title>
 
 <para>
@@ -671,7 +671,7 @@ KB_Lock</emphasis>
 
 </sect3>
 </sect2>
-<sect2 id='xkb_keyboard_mapping_to_core_keyboard_mapping_transformations'>
+<sect2 id='Xkb_Keyboard_Mapping_to_Core_Keyboard_Mapping_Transformations'>
 <title>Xkb Keyboard Mapping to Core Keyboard Mapping Transformations</title>
 
 <para>
@@ -733,7 +733,7 @@ modifier mapping.
 
 </sect2>
 </sect1>
-<sect1 id='getting_compatibility_map_components_from_the_server'>
+<sect1 id='Getting_Compatibility_Map_Components_From_the_Server'>
 <title>Getting Compatibility Map Components From the Server</title>
 
 <para>
@@ -883,7 +883,7 @@ BadLength</emphasis>
 
 
 </sect1>
-<sect1 id='using_the_compatibility_map'>
+<sect1 id='Using_the_Compatibility_Map'>
 <title>Using the Compatibility Map</title>
 
 <para>
@@ -1241,7 +1241,7 @@ bindings of the key.
 
 
 </sect1>
-<sect1 id='changing_the_servers_compatibility_map'>
+<sect1 id='Changing_the_Servers_Compatibility_Map'>
 <title>Changing the Server’s Compatibility Map</title>
 
 <para>
@@ -1456,7 +1456,7 @@ NULL</emphasis>
 
 
 </sect1>
-<sect1 id='tracking_changes_to_the_compatibility_map'>
+<sect1 id='Tracking_Changes_to_the_Compatibility_Map'>
 <title>Tracking Changes to the Compatibility Map</title>
 
 <para>
@@ -1585,7 +1585,7 @@ compat.sym_interpret</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_the_compatibility_map'>
+<sect1 id='Allocating_and_Freeing_the_Compatibility_Map'>
 <title>Allocating and Freeing the Compatibility Map</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch18.xml b/libX11/specs/XKB/ch18.xml
index 025d777f9..98239bf2f 100644
--- a/libX11/specs/XKB/ch18.xml
+++ b/libX11/specs/XKB/ch18.xml
@@ -1,4 +1,4 @@
-<chapter id='symbolic_names'>
+<chapter id='Symbolic_Names'>
 <title>Symbolic Names</title>
 
 <para>
@@ -26,7 +26,7 @@ names</emphasis>
  component of the keyboard description.
 </para>
 
-<sect1 id='the_xkbnamesrec_structure'>
+<sect1 id='The_XkbNamesRec_Structure'>
 <title>The XkbNamesRec Structure</title>
 
 <para>
@@ -227,7 +227,7 @@ radio_groups</emphasis>
 
 
 </sect1>
-<sect1 id='symbolic_names_masks'>
+<sect1 id='Symbolic_Names_Masks'>
 <title>Symbolic Names Masks</title>
 
 <para>
@@ -361,7 +361,7 @@ description are shown in Table 18.1.
 </table>
 
 </sect1>
-<sect1 id='getting_symbolic_names_from_the_server'>
+<sect1 id='Getting_Symbolic_Names_From_the_Server'>
 <title>Getting Symbolic Names From the Server</title>
 
 <para>
@@ -495,7 +495,7 @@ XkbFreeNames</emphasis>
 
 
 </sect1>
-<sect1 id='changing_symbolic_names_on_the_server'>
+<sect1 id='Changing_Symbolic_Names_on_the_Server'>
 <title>Changing Symbolic Names on the Server</title>
 
 <para>
@@ -621,7 +621,7 @@ num_types</emphasis>
 <sect2>
 <title/>
 
-<sect3 id='the_xkbnamechangesrec_structure'>
+<sect3 id='The_XkbNameChangesRec_Structure'>
 <title>The XkbNameChangesRec Structure</title>
 
 <para>
@@ -814,7 +814,7 @@ changes</emphasis>
 </sect3>
 </sect2>
 </sect1>
-<sect1 id='tracking_name_changes'>
+<sect1 id='Tracking_Name_Changes'>
 <title>Tracking Name Changes</title>
 
 <para>
@@ -1044,7 +1044,7 @@ BadMatch</emphasis>
 
 
 </sect1>
-<sect1 id='allocating_and_freeing_symbolic_names'>
+<sect1 id='Allocating_and_Freeing_Symbolic_Names'>
 <title>Allocating and Freeing Symbolic Names</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch19.xml b/libX11/specs/XKB/ch19.xml
index 9e675b358..b00afc34b 100644
--- a/libX11/specs/XKB/ch19.xml
+++ b/libX11/specs/XKB/ch19.xml
@@ -1,4 +1,4 @@
-<chapter id='replacing_a_keyboard_on_the_fly'>
+<chapter id='Replacing_a_Keyboard_On_the_Fly'>
 <title>Replacing a Keyboard "On the Fly"</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch20.xml b/libX11/specs/XKB/ch20.xml
index e58686f35..20d5b27d4 100644
--- a/libX11/specs/XKB/ch20.xml
+++ b/libX11/specs/XKB/ch20.xml
@@ -1,4 +1,4 @@
-<chapter id='server_database_of_keyboard_components'>
+<chapter id='Server_Database_of_Keyboard_Components'>
 <title>Server Database of Keyboard Components</title>
 
 <para>
@@ -117,7 +117,7 @@ When a keyboard description is built, the components are processed in the order
 in which they appear in Table 20.1; later definitions override earlier ones.
 </para>
 
-<sect1 id='component_names'>
+<sect1 id='Component_Names'>
 <title>Component Names</title>
 
 <para>
@@ -151,7 +151,7 @@ use of other characters is implementation-dependent.
 </para>
 
 </sect1>
-<sect1 id='listing_the_known_keyboard_components'>
+<sect1 id='Listing_the_Known_Keyboard_Components'>
 <title>Listing the Known Keyboard Components</title>
 
 <para>
@@ -389,7 +389,7 @@ XkbComponentListRec</emphasis>
 
 
 </sect1>
-<sect1 id='component_hints'>
+<sect1 id='Component_Hints'>
 <title>Component Hints</title>
 
 <para>
@@ -523,7 +523,7 @@ XkbLC_AlternateGroup</emphasis>
 </table>
 
 </sect1>
-<sect1 id='building_a_keyboard_description_using_the_server_database'>
+<sect1 id='Building_a_Keyboard_Description_Using_the_Server_Database'>
 <title>Building a Keyboard Description Using the Server Database</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch21.xml b/libX11/specs/XKB/ch21.xml
index aef8378fe..bd5738991 100644
--- a/libX11/specs/XKB/ch21.xml
+++ b/libX11/specs/XKB/ch21.xml
@@ -1,4 +1,4 @@
-<chapter id='attaching_xkb_actions_to_x_input_extension_devices'>
+<chapter id='Attaching_Xkb_Actions_to_X_Input_Extension_Devices'>
 <title>Attaching Xkb Actions to X Input Extension Devices</title>
 
 <para>
@@ -154,7 +154,7 @@ KeyClass</emphasis>
 silently if Xkb access to those devices is not supported by the X server.
 </para>
 
-<sect1 id='xkbdeviceinforec'>
+<sect1 id='XkbDeviceInfoRec'>
 <title>XkbDeviceInfoRec</title>
 
 <para>
@@ -364,7 +364,7 @@ them.
 </para>
 
 </sect1>
-<sect1 id='querying_xkb_features_for_non_keyclass_input_extension_devices'>
+<sect1 id='Querying_Xkb_Features_for_Non_KeyClass_Input_Extension_Devices'>
 <title>Querying Xkb Features for Non-KeyClass Input Extension Devices</title>
 
 <para>
@@ -923,8 +923,7 @@ Match</emphasis>
 
 
 </sect1>
-<sect1
-id='allocating_initializing_and_freeing_the_xkbdeviceinforec_structure'>
+<sect1 id='Allocating_Initializing_and_Freeing_the_XkbDeviceInfoRecStructure'>
 <title>Allocating, Initializing, and Freeing the XkbDeviceInfoRec
 Structure</title>
 
@@ -1319,8 +1318,8 @@ themselves are preserved.
 
 
 </sect1>
-<sect1 id='setting_xkb_features_for_non_keyclass_input_extension_devices_'>
-<title>Setting Xkb Features for Non-KeyClass Input Extension Devices </title>
+<sect1 id='Setting_Xkb_Features_for_Non_KeyClass_Input_Extension_Devices'>
+<title>Setting Xkb Features for Non-KeyClass Input Extension Devices</title>
 
 <para>
 The Xkb extension allows clients to assign any key action to either core
@@ -1681,7 +1680,7 @@ BadMatch</emphasis>
 
 
 </sect1>
-<sect1 id='xkbextensiondevicenotify_event'>
+<sect1 id='XkbExtensionDeviceNotify_Event'>
 <title>XkbExtensionDeviceNotify Event</title>
 
 <para>
@@ -1783,7 +1782,7 @@ state or configuration.
 
 
 </sect1>
-<sect1 id='tracking_changes_to_extension_devices'>
+<sect1 id='Tracking_Changes_to_Extension_Devices'>
 <title>Tracking Changes to Extension Devices</title>
 
 <para>
diff --git a/libX11/specs/XKB/ch22.xml b/libX11/specs/XKB/ch22.xml
index ba16bffbc..8a509b7d4 100644
--- a/libX11/specs/XKB/ch22.xml
+++ b/libX11/specs/XKB/ch22.xml
@@ -1,4 +1,4 @@
-<chapter id='debugging_aids'>
+<chapter id='Debugging_Aids'>
 <title>Debugging Aids</title>
 
 <para>