diff --git a/specs/XKB/ch02.xml b/specs/XKB/ch02.xml
index b140e42f..6d8755fe 100644
--- a/specs/XKB/ch02.xml
+++ b/specs/XKB/ch02.xml
@@ -663,7 +663,7 @@ Device, Feedback Class, or Feedback ID invalid
 The Xkb extension adds a single protocol error,
 <errorname>BadKeyboard</errorname>,
 to the core protocol error set. This error code will be reported as the
-<emphasis>error_rtrn</emphasis>
+<parameter>error_rtrn</parameter>
  when
 <function>XkbQueryExtension</function>
  is called. When a
diff --git a/specs/XKB/ch05.xml b/specs/XKB/ch05.xml
index 4b84f15c..18dadc14 100644
--- a/specs/XKB/ch05.xml
+++ b/specs/XKB/ch05.xml
@@ -883,9 +883,9 @@ To receive
  and pass
 <symbol>XkbStateNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -899,9 +899,9 @@ To receive
  as the
 <structfield>event_type</structfield>
  and specifying the desired state changes in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  using mask bits from <link linkend="table5.3">Table 5.3</link>.
 </para>
 
diff --git a/specs/XKB/ch08.xml b/specs/XKB/ch08.xml
index c6f07677..cc6fde6c 100644
--- a/specs/XKB/ch08.xml
+++ b/specs/XKB/ch08.xml
@@ -1179,13 +1179,9 @@ indicator is mapped to a physical LED, the
 
 
 <para>
-Each of the "
-<emphasis>_rtrn</emphasis>
-" arguments is optional; you can pass
+Each of the "<parameter>_rtrn</parameter>" arguments is optional; you can pass
 <symbol>NULL</symbol>
- for any unneeded "
-<emphasis>_rtrn</emphasis>
-" arguments.
+ for any unneeded "<parameter>_rtrn</parameter>" arguments.
 </para>
 
 
@@ -1745,9 +1741,9 @@ To receive
  events, use
 <function>XkbSelectEvents</function>
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) with both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
 and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  parameters containing
 <symbol>XkbIndicatorStateNotifyMask</symbol>.
 To receive
@@ -1769,9 +1765,9 @@ Set the
  or
 <symbol>XkbIndicatorMapNotify</symbol>,
 and set both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
 and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  detail parameters to a mask where each bit specifies one indicator, turning on
 those bits that specify the indicators for which you want to receive events.
 </para>
diff --git a/specs/XKB/ch09.xml b/specs/XKB/ch09.xml
index 3dede6fe..c3b361b4 100644
--- a/specs/XKB/ch09.xml
+++ b/specs/XKB/ch09.xml
@@ -560,7 +560,9 @@ Otherwise,
 calls
 <function>XkbDeviceBell</function>
  with the specified
-<emphasis>display, window, percent</emphasis>,
+<parameter>display</parameter>,
+<parameter>window</parameter>,
+<parameter>percent</parameter>,
 and
 <parameter>name</parameter>,
 a
@@ -812,7 +814,9 @@ Otherwise,
 calls
 <function>XkbDeviceBellEvent</function>
  with the specified
-<emphasis>display, window, percent</emphasis>,
+<parameter>display</parameter>,
+<parameter>window</parameter>,
+<parameter>percent</parameter>,
 and
 <parameter>name</parameter>,
 a
@@ -1069,9 +1073,9 @@ To receive
  events under all possible conditions, pass
 <symbol>XkbBellNotifyMask</symbol>
  in both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
 and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  parameters to
 <function>XkbSelectEvents</function>
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>).
@@ -1090,9 +1094,9 @@ can call
  and specifying
 <symbol>XkbAllBellEventsMask</symbol>
  in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
  This has the same effect as a call to
 <function>XkbSelectEvents</function>.
 </para>
diff --git a/specs/XKB/ch10.xml b/specs/XKB/ch10.xml
index c537759d..9f55e63b 100644
--- a/specs/XKB/ch10.xml
+++ b/specs/XKB/ch10.xml
@@ -2115,9 +2115,9 @@ To receive
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass
 <symbol>XkbAccessXNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -2131,9 +2131,9 @@ To receive
  as the
 <structfield>event_type</structfield>
  and specifying the desired state changes in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  using mask bits from <link linkend="table10.5">Table 10.5</link>.
 </para>
 
@@ -4725,9 +4725,9 @@ description, the server sends an
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass
 <symbol>XkbControlsNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -4741,9 +4741,9 @@ To receive
  as the
 <structfield>event_type</structfield>
  and specifying the desired state changes in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  using mask bits from <link linkend="table10.7">Table 10.7</link>.
 </para>
 
@@ -4920,7 +4920,7 @@ specified in <link linkend="table10.7">Table 10.7</link> with "ok" in the
  and specified in
 <parameter>wanted</parameter>
  into the changes record specified by
-<emphasis>old</emphasis>.
+<parameter>changes</parameter>.
 </para>
 
 
diff --git a/specs/XKB/ch13.xml b/specs/XKB/ch13.xml
index 155e64ee..68753562 100644
--- a/specs/XKB/ch13.xml
+++ b/specs/XKB/ch13.xml
@@ -1294,8 +1294,8 @@ If
  is
 <symbol>NULL</symbol>,
 the top surface is defined as the last outline in the
-<parameter>shape</parameter>
-’s array of outlines.
+<parameter>shape</parameter>’s
+ array of outlines.
 <function>XkbComputeShapeTop</function>
  returns
 <symbol>False</symbol>
diff --git a/specs/XKB/ch14.xml b/specs/XKB/ch14.xml
index 5c6baffa..a3bdb50e 100644
--- a/specs/XKB/ch14.xml
+++ b/specs/XKB/ch14.xml
@@ -990,9 +990,9 @@ To receive
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass
 <symbol>XkbMapNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -1006,9 +1006,9 @@ To receive
  as the
 <structfield>event_type</structfield>
  and specifying the desired map changes in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  using mask bits from <link linkend="table14.1">Table 14.1</link>.
 </para>
 
diff --git a/specs/XKB/ch16.xml b/specs/XKB/ch16.xml
index 819863ee..c4b829c2 100644
--- a/specs/XKB/ch16.xml
+++ b/specs/XKB/ch16.xml
@@ -421,7 +421,7 @@ corresponding to
  returns the key action corresponding to group
 <parameter>grp</parameter>
  and shift level
-<emphasis>lvl</emphasis>
+<parameter>shift</parameter>
  from the two-dimensional table of key actions associated with the key
 corresponding to
 <parameter>keycode</parameter>.
@@ -2986,9 +2986,9 @@ To receive
  and pass
 <symbol>XkbActionMessageMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -3004,9 +3004,9 @@ The
  and specifying
 <symbol>XkbAllActionMessagesMask</symbol>
  in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
  This has the same effect as a call to
 <function>XkbSelectEvents</function>.
 </para>
diff --git a/specs/XKB/ch17.xml b/specs/XKB/ch17.xml
index 93a1537f..02a4b007 100644
--- a/specs/XKB/ch17.xml
+++ b/specs/XKB/ch17.xml
@@ -1364,8 +1364,8 @@ the vector of
  copies compatibility map information from the keyboard description in
 <parameter>xkb</parameter>
  to the server specified in
-<parameter>display</parameter>
-’s compatibility map for the device specified by the
+<parameter>display</parameter>’s
+ compatibility map for the device specified by the
 <structfield>device_spec</structfield>
  field of
 <parameter>xkb</parameter>.
@@ -1535,9 +1535,9 @@ To receive
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) and pass
 <symbol>XkbCompatMapNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -1551,9 +1551,9 @@ To receive
  as the
 <structfield>event_type</structfield>
  and specifying the desired map changes in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  using mask bits from <link linkend="table17.2">Table 17.2</link>.
 </para>
 
diff --git a/specs/XKB/ch18.xml b/specs/XKB/ch18.xml
index cc2969f8..ee2d095e 100644
--- a/specs/XKB/ch18.xml
+++ b/specs/XKB/ch18.xml
@@ -447,7 +447,7 @@ If the
  obtains the values specified by
 <parameter>which</parameter>
  and copies them into the keyboard description
-<emphasis>Xkb</emphasis>.
+<parameter>xkb</parameter>.
 </para>
 
 
@@ -840,9 +840,9 @@ server sends a
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) with
 <symbol>XkbNamesNotifyMask</symbol>
  in both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  parameters.
 </para>
 
@@ -855,9 +855,9 @@ Set the
  parameter to
 <symbol>XkbNamesNotify</symbol>,
 and set both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
 and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  detail parameter to a mask composed of a bitwise OR of masks in
 <link linkend="table18.1">Table 18.1</link>.
 </para>
diff --git a/specs/XKB/ch19.xml b/specs/XKB/ch19.xml
index 37a2d62c..fa0d54f5 100644
--- a/specs/XKB/ch19.xml
+++ b/specs/XKB/ch19.xml
@@ -190,9 +190,9 @@ To receive name notify events, use
  (see <link linkend="Selecting_Xkb_Events">section 4.3</link>) with
 <symbol>XkbNewKeyboardNotifyMask</symbol>
  in both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  parameters. To receive events for only specific names, use
 <function>XkbSelectEventDetails</function>.
 Set the
@@ -200,9 +200,9 @@ Set the
  parameter to
 <symbol>XkbNewKeyboardNotify</symbol>,
 and set both the
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
 and
-<emphasis>values_for_bits</emphasis>
+<parameter>values_for_bits</parameter>
  detail parameter to a mask composed of a bitwise OR of masks in
 <link linkend="table19.1">Table 19.1</link>.
 </para>
diff --git a/specs/XKB/ch21.xml b/specs/XKB/ch21.xml
index 378b452c..7fdf4764 100644
--- a/specs/XKB/ch21.xml
+++ b/specs/XKB/ch21.xml
@@ -1778,9 +1778,9 @@ To receive
  and pass
 <symbol>XkbExtensionDeviceNotifyMask</symbol>
  in both
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
 </para>
 
 
@@ -1796,9 +1796,9 @@ The
  and specifying
 <symbol>XkbAllExtensionDeviceEventsMask</symbol>
  in
-<emphasis>bits_to_change</emphasis>
+<parameter>bits_to_change</parameter>
  and
-<emphasis>values_for_bits</emphasis>.
+<parameter>values_for_bits</parameter>.
  This has the same effect as a call to
 <function>XkbSelectEvents</function>.
 </para>