specs/XKB: Apply <emphasis> to semantic tag transformations from Xlib spec

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

22 files changed, 688 insertions, 688 deletions

diff --git a/specs/XKB/ch01.xml b/specs/XKB/ch01.xml
index 3093d5b1..3095830d 100644
--- a/specs/XKB/ch01.xml
+++ b/specs/XKB/ch01.xml
@@ -11,9 +11,9 @@ cumbersome in the core X protocol.
 
 <para>
 The core X protocol specifies the ways that the
-<emphasis>Shift</emphasis>,
-<emphasis>Control</emphasis>, and
-<emphasis>Lock</emphasis>
+<symbol>Shift</symbol>,
+<symbol>Control</symbol>, and
+<symbol>Lock</symbol>
 modifiers and the modifiers bound to the
 <emphasis>Mode_switch</emphasis> or
 <emphasis>Num_Lock</emphasis>
@@ -353,9 +353,9 @@ extension has been properly initialized prior to doing any other operations. If
 the extension has not been properly initialized or the application, library,
 and server versions are incompatible, these functions return an error
 indication as shown in Table 1.1. Because of this test,
-<emphasis>BadAccess</emphasis>
+<errorname>BadAccess</errorname>
  and
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  (due to incompatible versions) protocol errors should normally not be
 generated.
 </para>
diff --git a/specs/XKB/ch02.xml b/specs/XKB/ch02.xml
index 8c0eaabb..d0f97604 100644
--- a/specs/XKB/ch02.xml
+++ b/specs/XKB/ch02.xml
@@ -61,11 +61,11 @@ The name of the Xkb extension is given in
 
 <para>
 Most extensions to the X protocol are initialized by calling
-<emphasis>XInitExtension</emphasis>
+<function>XInitExtension</function>
  and passing the extension name. However, as explained in section 2.4, Xkb
 requires a more complex initialization sequence, and a client program should
 not call
-<emphasis>XInitExtension</emphasis>
+<function>XInitExtension</function>
  directly.
 </para>
 </sect1>
@@ -147,9 +147,9 @@ run time in
 If the versions of the compile time and run time libraries are compatible,
 <function>XkbLibraryVersion</function>
 returns
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 otherwise, it returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 <para>
@@ -169,9 +169,9 @@ Call
  to check for the presence and compatibility of the extension in the server and
 to initialize the extension. Because of potential version mismatches, you
 cannot use the generic extension mechanism functions (
-<emphasis>XQueryExtension </emphasis>
+<function>XQueryExtension</function>
 and
-<emphasis>XInitExtension</emphasis>
+<function>XInitExtension</function>
 ) for checking for the presence of, and initializing the Xkb extension.
 </para>
 
@@ -188,7 +188,7 @@ and a handful of audible-bell functions. You should not use any other Xkb
 functions if the extension is not present or is uninitialized. In general,
 calls to Xkb library functions made prior to initializing the Xkb extension
 cause
-<emphasis>BadAccess</emphasis>
+<errorname>BadAccess</errorname>
  protocol errors.
 </para>
 
@@ -284,9 +284,9 @@ The
 is present in the server. If a compatible extension is present,
 <function>XkbQueryExtension</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
 ; otherwise, it returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 <para>
@@ -430,7 +430,7 @@ returns
 If the library is compatible,
 <function>XkbOpenDisplay</function>
 next calls
-<emphasis>XOpenDisplay</emphasis>
+<function>XOpenDisplay</function>
  with the
 <emphasis>display_name</emphasis>.
 If this fails, the function returns
@@ -464,7 +464,7 @@ The possible values for
  indicates
 <function>XkbLibraryVersion</function>
 returned
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
   </para>
 </listitem>
 <listitem>
@@ -533,7 +533,7 @@ disable use of the extension once a connection is established.
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> means ignore the extension
+        <symbol>True</symbol> means ignore the extension
       </para>
     </listitem>
   </varlistentry>
@@ -543,18 +543,18 @@ disable use of the extension once a connection is established.
 <function>XkbIgnoreExtension</function>
  tells the X library whether to use the X Keyboard Extension on any
 subsequently opened X display connections. If ignore is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the library does not initialize the Xkb extension when it opens a new
 display. This forces the X server to use compatibility mode and communicate
 with the client using only core protocol requests and events. If ignore is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the library treats subsequent calls to
-<emphasis>XOpenDisplay</emphasis>
+<function>XOpenDisplay</function>
  normally and uses Xkb extension requests, events, and state. Do not explicitly
 use Xkb on a connection for which it is disabled.
 <function>XkbIgnoreExtension</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if it was unable to apply the ignore request.
 </para>
 
@@ -644,7 +644,7 @@ An argument is out of range
     <entry>
 <para>
 A name is neither a valid Atom or
-<emphasis>None</emphasis>
+<symbol>None</symbol>
 </para>
     </entry>
   </row>
@@ -670,7 +670,7 @@ to the core protocol error set. This error code will be reported as the
  is called. When a
 <emphasis>BadKeyboard</emphasis>
  error is reported in an
-<emphasis>XErrorEvent</emphasis>,
+<structname>XErrorEvent</structname>,
 additional information is reported in the
 <emphasis>resource_id</emphasis>
  field. The most significant byte of the
@@ -755,9 +755,9 @@ If they don’t match or the
  field is not
 <emphasis>NULL</emphasis>,
 a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error is returned (either in the return value or a backfilled
-<emphasis>Status</emphasis>
+<type>Status</type>
  variable). Upon successful return, the
 <emphasis>dpy</emphasis>
  field of the
@@ -811,9 +811,9 @@ and if the function returns successfully, the
  field of the
 <emphasis>XkbDescPtr</emphasis>
  argument. If they don’t match, a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error is returned (either in the return value or a backfilled
-<emphasis>Status</emphasis>
+<type>Status</type>
  variable).
 </para>
 
diff --git a/specs/XKB/ch04.xml b/specs/XKB/ch04.xml
index 2ca7b5b3..31c65bdc 100644
--- a/specs/XKB/ch04.xml
+++ b/specs/XKB/ch04.xml
@@ -281,7 +281,7 @@ described in the
 typedef struct {
       int                type;        /* Xkb extension base event code */
       unsigned long      serial;      /* X server serial number for event */
-      Bool               send_event;  /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool               send_event;  /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *          display;     /* server connection where event
 generated */
       Time               time;        /* server time when event generated */
@@ -473,13 +473,13 @@ If a bit is not set in the
  parameter, but the corresponding bit is set in the
 <emphasis>values_for_bits</emphasis>
  parameter, a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  protocol error results. If an undefined bit is set in either the
 <emphasis>bits_to_change</emphasis>
  or the
 <emphasis>values_for_bits</emphasis>
  parameter, a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error results.
 </para>
 
@@ -495,9 +495,9 @@ clear them via another call to
 <para>
 <function>XkbSelectEvents</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if the Xkb extension has not been initilialized and
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  otherwise.
 </para>
 
@@ -617,19 +617,19 @@ the detail in the
 
 <para>
 If an invalid event type is specified, a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error results. If a bit is not set in the
 <emphasis>bits_to_change</emphasis>
  parameter, but the corresponding bit is set in the
 <emphasis>values_for_bits</emphasis>
  parameter, a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  protocol error results. If an undefined bit is set in either the
 <emphasis>bits_to_change</emphasis>
  or the
 <emphasis>values_for_bits</emphasis>
  parameter, a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error results.
 </para>
 
@@ -781,7 +781,7 @@ The
 <emphasis>XkbEvent</emphasis>
  structure is a union of the individual structures declared for each Xkb event
 type and for the core protocol
-<emphasis>XEvent</emphasis>
+<structname>XEvent</structname>
  type. Given an
 <emphasis>XkbEvent</emphasis>
  structure, you may use the
@@ -817,7 +817,7 @@ typedef union _XkbEvent {
 
 <para>
 This unified Xkb event type includes a normal
-<emphasis>XEvent</emphasis>
+<structname>XEvent</structname>
  as used by the core protocol, so it is straightforward for applications that
 use Xkb events to call the X library event functions without having to cast
 every reference. For example, to get the next event, you can simply declare a
diff --git a/specs/XKB/ch05.xml b/specs/XKB/ch05.xml
index d9e809b7..8d6fabbb 100644
--- a/specs/XKB/ch05.xml
+++ b/specs/XKB/ch05.xml
@@ -51,13 +51,13 @@ The state of the core pointer buttons
 The
 <emphasis>modifiers</emphasis>
  are
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
-<emphasis>Control</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
+<symbol>Control</symbol>,
 and
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
 -
-<emphasis>Mod5</emphasis>,
+<symbol>Mod5</symbol>,
 as defined by the core protocol. A modifier can be thought of as a toggle that is either set or unset. All modifiers are initially unset. When a modifier is locked, it is set and remains set for all future key events, until it is explicitly unset. A latched modifier is set, but automatically unsets after the next key event that does not change the keyboard state. Locked and latched modifier state can be changed by keyboard activity or via Xkb extension library functions.
 </para>
 
@@ -99,9 +99,9 @@ Changing to a different group changes the keyboard state to produce characters f
 The
 <emphasis>pointer buttons</emphasis>
  are
-<emphasis>Button1</emphasis>
+<symbol>Button1</symbol>
  -
-<emphasis>Button5</emphasis>,
+<symbol>Button5</symbol>,
 as defined by the core protocol.
 </para>
 
@@ -210,9 +210,9 @@ The
  and
 <emphasis>lookup group</emphasis>
  are represented in the state field of core X events. The modifier state and keycode of a key event are used to determine the symbols associated with the event. For
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events, the lookup modifiers are computed as:
 </para>
 
@@ -414,9 +414,9 @@ To lock and unlock any of the eight real keyboard modifiers, use
 <emphasis>values</emphasis>.
 <function>XkbLockModifiers</function>
  does not wait for a reply from the server. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -496,9 +496,9 @@ To latch and unlatch any of the eight real keyboard modifiers, use
 <emphasis>values</emphasis>.
 <function>XkbLatchModifiers</function>
  does not wait for a reply from the server. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -598,9 +598,9 @@ To lock the keysym group, use
  sends a request to the server to lock the specified
 <emphasis>group </emphasis>
 and does not wait for a reply. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -660,9 +660,9 @@ To latch the keysym group, use
 <para>
 <function>XkbLatchGroup</function>
  sends a request to the server to latch the specified group and does not wait for a reply. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -912,7 +912,7 @@ The structure for
 typedef struct {
       int            type;            /* Xkb extension base event code */
       unsigned long  serial;          /* X server serial number for event */
-      Bool           send_event;      /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool           send_event;      /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *      display;         /* server connection where event generated */
       Time           time;            /* server time when event generated */
       int            xkb_type;        /* <emphasis> XkbStateNotify</emphasis> */
@@ -982,14 +982,14 @@ caused the state change, the
 <emphasis>keycode</emphasis>
  field gives the keycode of the key event, and the
 <emphasis>event_type</emphasis>
- field is set to either <emphasis>KeyPress</emphasis>
+ field is set to either <symbol>KeyPress</symbol>
  or
-<emphasis>KeyRelease</emphasis>.
+<symbol>KeyRelease</symbol>.
 If a pointer button event caused the state change, the
 <emphasis>keycode</emphasis>
  field is zero, and the <emphasis>event_type</emphasis>
- field is set to either <emphasis>ButtonPress</emphasis>
- or <emphasis>ButtonRelease</emphasis>.
+ field is set to either <symbol>ButtonPress</symbol>
+ or <symbol>ButtonRelease</symbol>.
 Otherwise, the major and minor codes of the request that caused the
 state change are given in the
 <emphasis>req_major</emphasis>
diff --git a/specs/XKB/ch06.xml b/specs/XKB/ch06.xml
index b2ad5965..e6f6c4ee 100644
--- a/specs/XKB/ch06.xml
+++ b/specs/XKB/ch06.xml
@@ -267,7 +267,7 @@ The valid masks for
 <para>
 <function>XkbGetKeyboard</function>
  can generate
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  protocol errors.
 </para>
 
@@ -378,7 +378,7 @@ To destroy either an entire an
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; free all components and <parameter>xkb</parameter>
+        <symbol>True</symbol> =&gt; free all components and <parameter>xkb</parameter>
       </para>
     </listitem>
   </varlistentry>
@@ -395,7 +395,7 @@ To destroy either an entire an
 If
 <emphasis>free_all</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 <function>XkbFreeKeyboard</function>
  frees every non-
 <emphasis>NULL</emphasis>
diff --git a/specs/XKB/ch07.xml b/specs/XKB/ch07.xml
index aeec2592..4b1ae095 100644
--- a/specs/XKB/ch07.xml
+++ b/specs/XKB/ch07.xml
@@ -10,9 +10,9 @@ when the
 shifted and unshifted state for the numeric keypad keys. The core protocol does
 not provide a convenient way to determine the mapping of modifier bits (in
 particular
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
  through
-<emphasis>Mod5</emphasis>
+<symbol>Mod5</symbol>
 ) to keysyms such as
 <emphasis>Num_Lock</emphasis>
  and
@@ -33,13 +33,13 @@ Xkb provides a set of sixteen named
 <emphasis>virtual modifiers</emphasis>.
 Each virtual modifier can be bound to any set of the real modifiers
 (
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
-<emphasis>Control</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
+<symbol>Control</symbol>,
  and
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
 -
-<emphasis>Mod5</emphasis>
+<symbol>Mod5</symbol>
 ).
 </para>
 
@@ -50,9 +50,9 @@ specify more clearly the intent of a binding. X servers do not all assign
 modifiers the same way — for example,
 <emphasis>Num_Lock</emphasis>
  might be bound to
-<emphasis>Mod2</emphasis>
+<symbol>Mod2</symbol>
  for one vendor and to
-<emphasis>Mod4</emphasis>
+<symbol>Mod4</symbol>
  for another. This makes it cumbersome to automatically remap the keyboard to a
 desired configuration without some kind of prior knowledge about the keyboard
 layout and bindings. With XKB, applications can use virtual modifiers to
@@ -65,7 +65,7 @@ in effect.
 
 <para>
 Virtual modifiers are named by converting their string name to an X
-<emphasis>Atom</emphasis>
+<type>Atom</type>
  and storing the Atom in the
 <emphasis>names.vmods</emphasis>
  array in an
@@ -203,7 +203,7 @@ use virtual modifier mappings (see section 16.4).
 
 <para>
 For example, if
-<emphasis>Mod3</emphasis>
+<symbol>Mod3</symbol>
  is bound to the
 <emphasis>Num_Lock</emphasis>
  key by the core protocol modifier mapping, and the
@@ -211,7 +211,7 @@ For example, if
  virtual modifier is bound to they
 <emphasis>Num_Lock</emphasis>
  key by the virtual modifier mapping,
-<emphasis>Mod3</emphasis>
+<symbol>Mod3</symbol>
  is added to the set of modifiers associated with
 <emphasis>NumLock</emphasis>.
 </para>
@@ -312,9 +312,9 @@ description in
  does not include virtual modifier bindings,
 <function>XkbVirtualModsToReal</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
 ; otherwise, it returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 <note><para>It is possible for a local (client-side) keyboard description (the
@@ -352,7 +352,7 @@ If the
 <emphasis>NumLock</emphasis>
  virtual modifier is not bound to any real modifiers, the effective masks for
 these two cases are identical (that is, contain only
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
 ). When it is essential to distinguish between
 <emphasis>OneThing</emphasis>
  and Another, Xkb considers only those modifier definitions for which all
@@ -393,11 +393,11 @@ bit for the
  virtual modifier. If
 <emphasis>server.vmods</emphasis>
 [2] contains
-<emphasis>Mod3Mask</emphasis>,
+<symbol>Mod3Mask</symbol>,
 then the
 <emphasis>NumLock</emphasis>
  virtual modifier is bound to the
-<emphasis>Mod3</emphasis>
+<symbol>Mod3</symbol>
  real modifier.
 </para>
 
@@ -425,10 +425,10 @@ Continuing the example, if the keyboard has a
 
 <para>
 Finally, if the keyboard also used the real
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
  modifier for numeric lock operations, the modifier definition below would
 represent the situation where either the key bound to
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
  or the
 <emphasis>NumLock</emphasis>
  virtual modifier could be used for this purpose:
diff --git a/specs/XKB/ch08.xml b/specs/XKB/ch08.xml
index ffcff0a8..dded5bff 100644
--- a/specs/XKB/ch08.xml
+++ b/specs/XKB/ch08.xml
@@ -18,7 +18,7 @@ Furthermore, the core X implementation does not provide clients with the
 ability to determine what bits in the
 <emphasis>led_mask</emphasis>
  field of the
-<emphasis>XKeyboardState</emphasis>
+<structname>XKeyboardState</structname>
  map to the particular LEDs on the keyboard. For example, X does not provide a
 method for a client to determine what bit to set in the
 <emphasis>led_mask</emphasis>
@@ -179,7 +179,7 @@ The effect (if any) of attempts to explicitly change the state of the indicator
 using the functions
 <function>XkbSetControls</function>
  or
-<emphasis>XChangeKeyboardControl</emphasis>
+<function>XChangeKeyboardControl</function>
 
   </para>
 </listitem>
@@ -910,12 +910,12 @@ set in
 If a compatible version of the Xkb extension is not available in the server,
 <function>XkbGetIndicatorState</function>
  returns a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error. Otherwise, it sends the request to the X server, places the state of
 the indicators into
 <emphasis>state_return</emphasis>,
  and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 Thus the value reported by
 <function>XkbGetIndicatorState</function>
  is identical to the value reported by the core protocol.
@@ -1000,11 +1000,11 @@ If the
 <para>
 <function>XkbGetIndicatorMap</function>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadLength</emphasis>,
-<emphasis>BadMatch</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadLength</errorname>,
+<errorname>BadMatch</errorname>,
 and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors.
 </para>
 
@@ -1130,7 +1130,7 @@ Use
     </term>
     <listitem>
       <para>
-        backfilled with <emphasis>True</emphasis>
+        backfilled with <symbol>True</symbol>
          if the named indicator is real (physical)
       </para>
     </listitem>
@@ -1144,12 +1144,12 @@ If the device specified by
 <emphasis>name</emphasis>,
 <function>XkbGetNamedIndicator</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  and populates the rest of the parameters with information about the indicator.
 Otherwise,
 <function>XkbGetNamedIndicator</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -1163,16 +1163,16 @@ bits, as well as the indicator’s index into the
  array of indicator maps.
 <emphasis>state_rtrn</emphasis>
  returns the current state of the named indicator (
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  = on,
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  = off).
 <emphasis>map_rtrn</emphasis>
  returns the indicator map for the named indicator. In addition, if the
 indicator is mapped to a physical LED, the
 <emphasis>real_rtrn</emphasis>
  parameter is set to
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
@@ -1190,9 +1190,9 @@ Each of the "
 <para>
 <function>XkbGetNamedIndicator</function>
  can generate
-<emphasis>BadAtom</emphasis>
+<errorname>BadAtom</errorname>
  and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors.
 </para>
 
@@ -1303,10 +1303,10 @@ does not extinguish an indicator with
  and
 <emphasis>mods</emphasis>
  of
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  if, at the time Xkb processes the request to extinguish the indicator, one of
 the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  keys is physically depressed.
 </para>
 
@@ -1525,12 +1525,12 @@ Set the indicator map for the indicator
 If a compatible version of the Xkb extension is not available in the server,
 <function>XkbSetNamedIndicator</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise, it sends a request to the X server to change the indicator
 specified by
 <emphasis>name</emphasis>
  and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
@@ -1538,7 +1538,7 @@ specified by
 If
 <emphasis>change_state</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 and the optional parameter,
 <emphasis>state</emphasis>,
 is not
@@ -1558,7 +1558,7 @@ If an indicator with the name specified by
  parameter tells the server whether it should create a new named indicator. If
 <emphasis>create_new</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the server finds the first indicator that doesn’t have a name and gives it
 the name specified by
 <emphasis>name</emphasis>.
@@ -1578,9 +1578,9 @@ in <emphasis>map</emphasis>.
 <para>
 <function>XkbSetNamedIndicator</function>
  can generate
-<emphasis>BadAtom</emphasis>
+<errorname>BadAtom</errorname>
  and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors. In addition, it can also generate
 <emphasis>XkbIndicatorStateNotify</emphasis>
  (see section 8.5), <emphasis> <!-- xref -->
@@ -1709,9 +1709,9 @@ If any bits are set in the
 <para>
 <emphasis>XkbChangeIndicator</emphasis>
 s can generate
-<emphasis>BadAtom</emphasis>
+<errorname>BadAtom</errorname>
  and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors. In addition, it can also generate
 <emphasis>XkbIndicatorStateNotify</emphasis>
  and
@@ -1781,7 +1781,7 @@ Both types of indicator events use the same structure:
 typedef struct _XkbIndicatorNotify {
       int            type;        /* Xkb extension base event code */
       unsigned long  serial;      /* X server serial number for event */
-      Bool           send_event;  /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool           send_event;  /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *      display;     /* server connection where event generated */
       Time           time;        /* server time when event generated */
       int            xkb_type;    /* specifies state or map notify */
@@ -1997,10 +1997,10 @@ If the
 <para>
 <function>XkbGetIndicatorChanges</function>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadImplementation</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadImplementation</errorname>,
  and
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  errors.
 </para>
 
@@ -2047,13 +2047,13 @@ The
  parameter must point to a valid keyboard description. If it doesn’t,
 <function>XkbAllocIndicatorMaps</function>
  returns a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error. Otherwise,
 <function>XkbAllocIndicatorMaps</function>
  allocates and initializes the
 <emphasis>indicators</emphasis>
  member of the keyboard description record and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 If
 <function>XkbAllocIndicatorMaps</function>
  was unable to allocate the indicators record, it reports a Bad
diff --git a/specs/XKB/ch09.xml b/specs/XKB/ch09.xml
index c16800ff..594aeeca 100644
--- a/specs/XKB/ch09.xml
+++ b/specs/XKB/ch09.xml
@@ -437,7 +437,7 @@ To ring the bell on an X input extension device or the default keyboard, use
 Set
 <emphasis>percent</emphasis>
  to be the volume relative to the base volume for the keyboard as described for
-<emphasis>XBell</emphasis>.
+<function>XBell</function>.
 </para>
 
 <para>
@@ -462,11 +462,11 @@ See the X input extension documentation for more information on
 If a compatible keyboard extension is not present in the X server,
 <function>XkbDeviceBell</function>
  immediately returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbDeviceBell</function>
 rings the bell as specified for the display and keyboard device and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 If you have disabled the audible bell, the server does not ring the system
 bell, although it does generate a
 <emphasis>XkbBellNotify</emphasis>
@@ -546,13 +546,13 @@ default keyboard:
 If a compatible keyboard extension isn’t present in the X server,
 <function>XkbBell</function>
  calls
-<emphasis>XBell </emphasis>
+<function>XBell</function>
 with the specified
 <emphasis>display</emphasis>
  and
 <emphasis>percent</emphasis>,
 and returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbBell</function>
 calls
@@ -574,7 +574,7 @@ and a
 of
 <emphasis>XkbDfltXIId</emphasis>,
  and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 <para>
@@ -709,17 +709,17 @@ without ringing the corresponding bell, use
 If a compatible keyboard extension isn’t present in the X server,
 <function>XkbDeviceBellEvent</function>
  immediately returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbDeviceBellEvent</function>
  causes an
 <emphasis>XkbBellNotify</emphasis>
  event to be sent to all interested clients and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Set
 <emphasis>percent</emphasis>
  to be the volume relative to the base volume for the keyboard as described for
-<emphasis>XBell</emphasis>.
+<function>XBell</function>.
 </para>
 
 
@@ -727,7 +727,7 @@ Set
 In addition,
 <function>XkbDeviceBellEvent</function>
  may generate
-<emphasis>Atom</emphasis>
+<type>Atom</type>
  protocol errors as well as
 <emphasis>XkbBellNotify</emphasis>
  events. You can call
@@ -804,7 +804,7 @@ the keyboard without ringing the bell:
 If a compatible keyboard extension isn’t present in the X server,
 <function>XkbBellEvent</function>
  immediately returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbBellEvent</function>
 calls
@@ -935,15 +935,15 @@ audible bells, use <function>XkbForceDeviceBell</function>.
 If a compatible keyboard extension isn’t present in the X server,
 <function>XkbForceDeviceBell</function>
  immediately returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbForceDeviceBell</function>
 rings the bell as specified for the display and keyboard device and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Set
 <emphasis>percent</emphasis>
  to be the volume relative to the base volume for the keyboard as described for
-<emphasis>XBell</emphasis>.
+<function>XBell</function>.
 There is no
 <emphasis>name</emphasis>
  parameter because
@@ -1003,13 +1003,13 @@ for audible bells, use
 If a compatible keyboard extension isn’t present in the X server,
 <function>XkbForceBell</function>
  calls
-<emphasis>XBell </emphasis>
+<function>XBell</function>
 with the specified
 <emphasis>display</emphasis>
  and
 <emphasis>percent</emphasis>
  and returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbForceBell</function>
 calls
@@ -1105,7 +1105,7 @@ The structure for the
 typedef struct _XkbBellNotify {
       int             type;        /* Xkb extension base event code */
       unsigned long   serial;      /* X server serial number for event */
-      Bool            send_event;  /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool            send_event;  /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *       display;     /* server connection where event generated */
       Time            time;        /* server time when event generated */
       int             xkb_type;    /* <emphasis> XkbBellNotify</emphasis> */
@@ -1117,7 +1117,7 @@ typedef struct _XkbBellNotify {
       unsigned int    bell_id;     /* X input extension feedback ID */
       Atom            name;        /* "name" of requested bell */
       Window          window;      /* window associated with event */
-      Bool            event_only;  /* <emphasis> False</emphasis> -&gt; the server did not produce a beep */
+      Bool            event_only;  /* <symbol>False</symbol> -&gt; the server did not produce a beep */
 } <emphasis>XkbBellNotifyEvent</emphasis>;
 </programlisting></para>
 
diff --git a/specs/XKB/ch10.xml b/specs/XKB/ch10.xml
index 02ee88a9..8531b23c 100644
--- a/specs/XKB/ch10.xml
+++ b/specs/XKB/ch10.xml
@@ -312,9 +312,9 @@ If the X server does not support a compatible version of Xkb or the Xkb
 extension has not been properly initialized,
 <function>XkbChangeEnabledControls</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
 ; otherwise, it sends the request to the X server and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
@@ -438,9 +438,9 @@ To get the current values of the auto-reset controls, use
  with the
 <emphasis>AutoReset</emphasis>
  control attributes for this particular client. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -768,11 +768,11 @@ To get the current attributes of the
  and
 <emphasis>interval_rtrn</emphasis>
  with them, and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 If a compatible version of the Xkb extension is not available in the server
 <function>XkbGetAutoRepeatRate</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -853,18 +853,18 @@ To set the attributes of the RepeatKeys control for a keyboard device, use
 <para>
 <function>XkbSetAutoRepeatRate</function>
  does not wait for a reply; it normally returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Specifying a zero value for either
 <emphasis>timeout</emphasis>
  or
 <emphasis>interval</emphasis>
  causes the server to generate a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error. If a compatible version of the Xkb extension is not available
 in the server,
 <function>XkbSetAutoRepeatRate</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -876,21 +876,21 @@ in the server,
 Auto-repeat is the generation of multiple key events by a keyboard when the
 user presses a key and holds it down. Keyboard hardware and device-dependent X
 server software often implement auto-repeat by generating multiple
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  events with no intervening
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event. The standard behavior of the X server is to generate a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event for every
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event. If the keyboard hardware and device-dependent software of the X server
 implement auto-repeat by generating multiple
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  events, the device-independent part of the X server by default synthetically
 generates a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event after each
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event. This provides predictable behavior for X clients, but does not allow
 those clients to detect the fact that a key is auto-repeating.
 </para>
@@ -902,13 +902,13 @@ Xkb allows clients to request
 If a client requests and the server supports
 <emphasis>DetectableAutorepeat</emphasis>,
 Xkb generates
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events only when the key is physically released. If
 <emphasis>DetectableAutorepeat</emphasis>
  is not supported or has not been requested, the server synthesizes a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event for each repeating
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event it generates.
 </para>
 
@@ -975,7 +975,7 @@ use
     </term>
     <listitem>
       <para>
-        backfilled <emphasis>True</emphasis> if
+        backfilled <symbol>True</symbol> if
 <emphasis>DetectableAutorepeat</emphasis>
          supported
       </para>
@@ -992,21 +992,21 @@ use
  is not
 <emphasis>NULL</emphasis>,
 it backfills supported_rtrn with
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the server supports
 <emphasis>DetectableAutorepeat</emphasis>,
 and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 <function>XkbGetDetectableAutorepeat</function>
  returns the current state of
 <emphasis>DetectableAutorepeat</emphasis>
  for the requesting client:
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if
 <emphasis>DetectableAutorepeat</emphasis>
  is set, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -1052,7 +1052,7 @@ they have requested otherwise.
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; set
+        <symbol>True</symbol> =&gt; set
 <emphasis>DetectableAutorepeat</emphasis>
       </para>
     </listitem>
@@ -1063,7 +1063,7 @@ they have requested otherwise.
     </term>
     <listitem>
       <para>
-        backfilled <emphasis>True</emphasis> if
+        backfilled <symbol>True</symbol> if
 <emphasis>DetectableAutorepeat</emphasis>
          supported
       </para>
@@ -1078,11 +1078,11 @@ they have requested otherwise.
  on for the current client if
 <emphasis>detectable</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 and off it
 <emphasis>detectable</emphasis>
  is
-<emphasis>False</emphasis>
+<symbol>False</symbol>
 ; it then waits for a reply. If
 <emphasis>supported_rtrn</emphasis>
  is not
@@ -1091,21 +1091,21 @@ and off it
  backfills
 <emphasis>supported_rtrn</emphasis>
  with
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the server supports
 <emphasis>DetectableAutorepeat</emphasis>,
 and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if it does not.
 <function>XkbSetDetectableAutorepeat</function>
  returns the current state of
 <emphasis>DetectableAutorepeat</emphasis>
  for the requesting client:
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if
 <emphasis>DetectableAutorepeat</emphasis>
  is set, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -1197,9 +1197,9 @@ When
  are enabled, all keys with
 <emphasis>MouseKeys</emphasis>
  actions bound to them generate core pointer events instead of normal
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events.
 </para>
 
@@ -1526,7 +1526,7 @@ Holding down a shift key by itself for eight seconds toggles the
 <listitem>
   <para>
 Pressing and releasing the left or right
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key five times in a row, without any intervening key events and with less than
 30 seconds delay between consecutive presses, toggles the state of the
 <emphasis>StickyKeys</emphasis>
@@ -1709,12 +1709,12 @@ which is a field in the
  structure (see section 10.8).  <!-- xref -->
 <function>XkbGetAccessXTimeout</function>
 returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful; if a compatible version of the Xkb extension is not available
 in the server,
 <function>XkbGetAccessXTimeout</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -1850,11 +1850,11 @@ for the
 <emphasis>AccessXTimeout</emphasis>
  control to the server.
 It does not wait for a reply, and normally returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 If a compatible version of the Xkb extension is not available in the server,
 <function>XkbSetAccessXTimeout</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -2015,7 +2015,7 @@ The server can generate
 typedef struct {
       int             type;            /* Xkb extension base event code */
       unsigned long   serial;          /* X server serial number for event */
-      Bool            send_event;      /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool            send_event;      /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *       display;         /* server connection where event generated */
       Time            time;            /* server time when event generated */
       int             xkb_type;        /* <emphasis> XkbAccessXNotify</emphasis> */
@@ -2208,10 +2208,10 @@ locking, or unlocking of modifiers using
 <emphasis>StickyKeys</emphasis>
  generates
 <emphasis>XkbStateNotify</emphasis>
- events as described in section 5.4. Repeating keys generate normal <emphasis> <!-- xref -->
-KeyPress</emphasis>
+ events as described in section 5.4. Repeating keys generate normal
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events, though the auto-repeat can be detected using
 <emphasis>DetectableAutorepeat</emphasis>
  (see section 10.3.3). Finally, <emphasis> <!-- xref -->
@@ -2317,12 +2317,12 @@ with the
  delay attribute.
 <function>XkbGetSlowKeysDelay</function>
 returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful; if a compatible version of the Xkb extension is not available
 in the server,
 <function>XkbGetSlowKeysDelay</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -2388,7 +2388,7 @@ To set the
 <emphasis>SlowKeys</emphasis>
  control to the server.
 It does not wait for a reply, and normally returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Specifying a value of
 <emphasis>0</emphasis>
  for the
@@ -2396,12 +2396,12 @@ Specifying a value of
 parameter causes
 <emphasis>XkbSetSlowKeys</emphasis>
  to generate a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error. If a compatible version of the Xkb extension is not available
 in the server
 <function>XkbSetSlowKeysDelay</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -2499,12 +2499,12 @@ with the
  delay attribute.
 <function>XkbGetBounceKeysDelay</function>
 returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful; if a compatible version of the Xkb extension is not available
 in the server
 <function>XkbGetSlowKeysDelay</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -2570,7 +2570,7 @@ To set the
 <emphasis>BounceKeys</emphasis>
  control to the server.
 It does not wait for a reply and normally returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Specifying a value of
 <emphasis>zero </emphasis>
 for the
@@ -2578,12 +2578,12 @@ for the
 parameter causes
 <function>XkbSetBounceKeysDelay</function>
  to generate a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error. If a compatible version of the Xkb extension is not available
 in the server,
 <function>XkbSetBounceKeysDelay</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 </sect2>
@@ -2593,7 +2593,7 @@ in the server,
 <para>
 Some people find it difficult or even impossible to press two keys at once. For
 example, a one-fingered typist or someone using a mouth stick cannot press the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
 <emphasis>1</emphasis>
  keys at the same time. The
@@ -2604,7 +2604,7 @@ With
 the user can first press a modifier, release it, then press another key. For
 example, to get an exclamation point on a PC-style keyboard, the user can press
 the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key, release it, and then press the
 <emphasis>1</emphasis>
  key.
@@ -2625,39 +2625,39 @@ it one more time.
 <para>
 When a modifier is latched, it becomes unlatched when the user presses a
 nonmodifier key or a pointer button. For instance, to enter the sequence
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
 +
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
 +
 <emphasis>Z</emphasis>
  the user could press and release the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key to latch it, then press and release the
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  key to latch it, and finally press and release the Z key. Because the
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  key is a modifier key, pressing it does not unlatch the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key. Thus, after the user presses the
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  key, both the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  modifiers are latched. When the user presses the
 <emphasis>Z</emphasis>
  key, the effect is as though the user had pressed
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
 +
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
 +
 <emphasis>Z</emphasis>.
 In addition, because the
 <emphasis>Z</emphasis>
  key is not a modifier key, the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  modifiers are unlatched.
 </para>
 
@@ -2668,9 +2668,9 @@ button the user presses until the user unlocks it or it is unlocked
 programmatically. For example, to enter the sequence ("XKB") on a keyboard
 where ‘(’ is a shifted ‘9’, ‘)’ is a shifted ‘0’, and ‘"’
 is a shifted single quote, the user could press and release the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key twice to lock the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier. Then, when the user presses the
 <emphasis>9</emphasis>,
 <emphasis>‘</emphasis>,
@@ -2681,9 +2681,9 @@ is a shifted single quote, the user could press and release the
 and
 <emphasis>0</emphasis>
  keys in sequence, it generates ("XKB"). To unlock the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier, the user can press and release the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key.
 </para>
 
@@ -2802,12 +2802,12 @@ with a mask indicating whether the individual
 <para>
 <function>XkbGetStickyKeysOptions</function>
 returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful; if a compatible version of the Xkb extension is not available
 in the server
 <function>XkbGetStickyKeysOptions</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -2883,7 +2883,7 @@ To set the
 <emphasis>StickyKeys</emphasis>
  control to the server.
 It does not wait for a reply and normally returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 The valid bits to use for both the
 <emphasis>mask</emphasis>
  and
@@ -2902,7 +2902,7 @@ The valid bits to use for both the
  If a compatible version of the Xkb extension is not available in the server,
 <function>XkbSetStickyKeysOptions</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 </sect3>
@@ -3036,9 +3036,9 @@ The
 <emphasis>IgnoreLockMods</emphasis>
  control specifies modifiers that should be excluded from grab calculations.
 These modifiers are also not reported in any core events except
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events that do not activate a passive grab and that do not occur while a grab
 is active.
 </para>
@@ -3175,12 +3175,12 @@ added and removed from the server’s
  and
 <emphasis>real_values</emphasis>
  consist of any combination of the eight core modifier bits:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>
  -
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 <emphasis>affect_virtual</emphasis>
  and
 <emphasis>virtual_values</emphasis>
@@ -3206,9 +3206,9 @@ affect_virtual</emphasis>
 <emphasis>virtual_values</emphasis>.
 <function>XkbSetIgnoreLockMods</function>
  does not wait for a reply from the server. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -3378,12 +3378,12 @@ selected by both
  and
 <emphasis>real_values</emphasis>
  consist of any combination of the eight core modifier bits:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>
  -
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 <emphasis>affect_virtual</emphasis>
  and
 <emphasis>virtual_values</emphasis>
@@ -3404,9 +3404,9 @@ affect_virtual</emphasis>
 <emphasis>virtual_values</emphasis>.
 <function>XkbSetServerInternalMods</function>
  does not wait for a reply from the server. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was sent and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -3847,9 +3847,9 @@ The individual fields of the
 ). It</emphasis>
  specifies the mouse button number to use for keyboard simulated mouse button
 operations. Its value should be one of the core symbols
-<emphasis>Button1</emphasis>
+<symbol>Button1</symbol>
  -
-<emphasis>Button5</emphasis>.
+<symbol>Button5</symbol>.
 </para>
 
 
@@ -3930,12 +3930,12 @@ its four low-order bits specify the index of the group to use.
  control (see section 10.7.4). It specifies modifiers to be consumed in the  <!-- xref -->
 server and not passed on to clients when events are reported. Valid values
 consist of any combination of the eight core modifier bits:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>
  -
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 </para>
 
 
@@ -3950,12 +3950,12 @@ consist of any combination of the eight core modifier bits:
  control (see section 10.7.2). It specifies modifiers to be ignored in grab  <!-- xref -->
 calculations. Valid values consist of any combination of the eight core
 modifier bits:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>
  -
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 </para>
 
 
@@ -4234,9 +4234,9 @@ accepts a pointer to an
  structure and a feedback option from the table above. If both the
 <emphasis>AccessXFeedback</emphasis>
  control and the specified feedback option are enabled, the macro returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 Otherwise it returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -4269,7 +4269,7 @@ The
  field mirrors the
 <emphasis>auto_repeats</emphasis>
  field of the core protocol
-<emphasis>XKeyboardState</emphasis>
+<structname>XKeyboardState</structname>
  structure: changing the
 <emphasis>auto_repeats</emphasis>
  field automatically changes
@@ -4281,7 +4281,7 @@ delay and rate, use
 If the
 <emphasis>per_key_repeat</emphasis>
  were not in this structure, you would have to call both
-<emphasis>XGetKeyboardControl</emphasis>
+<function>XGetKeyboardControl</function>
  and
 <function>XkbGetControls</function>
  to get this information. The bits correspond to keycodes. The first seven keys
@@ -4396,11 +4396,11 @@ If
 <para>
 <function>XkbGetControls</function>
  returns
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if successful; otherwise, it returns
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  if it cannot obtain sufficient storage,
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  if
 <emphasis>xkb</emphasis>
  is
@@ -4408,7 +4408,7 @@ If
  or
 <emphasis>which</emphasis>
  is empty, or
-<emphasis>BadImplementation</emphasis>.
+<errorname>BadImplementation</errorname>.
 </para>
 
 
@@ -4529,9 +4529,9 @@ the server does not support a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbSetControls</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise, it sends the request to the X server and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
@@ -4601,7 +4601,7 @@ changes, to be propagated to the server. The
 typedef struct _XkbControlsChanges {
       unsigned int changed_ctrls;          /* bits indicating changed control data */
       unsigned int enabled_ctrls_changes;  /* bits indicating enabled/disabled controls */
-      Bool         num_groups_changed;     /* <emphasis> True</emphasis> if
+      Bool         num_groups_changed;     /* <symbol>True</symbol> if
                                               number of keyboard groups changed */
 } <emphasis>XkbControlsChangesRec</emphasis>,*XkbControlsChangesPtr;
 </programlisting></para>
@@ -4624,7 +4624,7 @@ XkbControlsRec Data Fields" column in Table 10.6 have been modified. The
 <emphasis>enabled_ctrls</emphasis>
  field have changed. If the number of keyboard groups has changed, the
 <emphasis>num_groups_changed</emphasis>
- field is set to <emphasis>True</emphasis>.
+ field is set to <symbol>True</symbol>.
 </para>
 
 
@@ -4745,7 +4745,7 @@ The structure for the
 typedef struct {
       int            type;            /* Xkb extension base event code */
       unsigned long  serial;          /* X server serial number for event */
-      Bool           send_event;      /* <emphasis> True</emphasis> =&gt; synthetically generated */
+      Bool           send_event;      /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *      display;         /* server connection where event generated */
       Time           time;            /* server time when event generated */
       int            xkb_type;        /* <emphasis> XkbCompatMapNotify</emphasis> */
@@ -4805,13 +4805,13 @@ and the
  value is the same as the major extension opcode. Otherwise,
 <emphasis>event_type</emphasis>
  is set to the type of event that caused the change (one of
-<emphasis>KeyPress</emphasis>,
-<emphasis>KeyRelease</emphasis>,
+<symbol>KeyPress</symbol>,
+<symbol>KeyRelease</symbol>,
 <emphasis>DeviceKeyPress</emphasis>,
 <emphasis>DeviceKeyRelease</emphasis>,
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  or
-<emphasis>ButtonRelease</emphasis>
+<symbol>ButtonRelease</symbol>
 ), and
 <emphasis>req_major</emphasis>
  and
@@ -4819,8 +4819,8 @@ and the
  are undefined. If
 <emphasis>event_type</emphasis>
  is
-<emphasis>KeyPress</emphasis>,
-<emphasis>KeyRelease</emphasis>,
+<symbol>KeyPress</symbol>,
+<symbol>KeyRelease</symbol>,
 <emphasis>DeviceKeyPress</emphasis>,
 or
 <emphasis>DeviceKeyRelease</emphasis>,
@@ -4829,9 +4829,9 @@ the
  field is set to the key that caused the change. If
 <emphasis>event_type</emphasis>
  is
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  or
-<emphasis>ButtonRelease</emphasis>,
+<symbol>ButtonRelease</symbol>,
 <emphasis>keycode</emphasis>
  contains the button number.
 </para>
@@ -4993,12 +4993,12 @@ results into the
 <para>
 <function>XkbGetControlsChanges</function>
  returns
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if successful and can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadImplementation</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadImplementation</errorname>,
  and
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  errors.
 </para>
 
@@ -5062,25 +5062,25 @@ allocate one by calling
  field of the
 <emphasis>xkb</emphasis>
  parameter, initializes all fields to zero, and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 If the
 <emphasis>ctrls</emphasis>
  field is not
 <emphasis>NULL</emphasis>,
 <function>XkbAllocControls</function>
  simply returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 If
 <emphasis>xkb</emphasis>
  is
 <emphasis>NULL</emphasis>,
 <function>XkbAllocControls</function>
  reports a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error. If the
 <emphasis>ctrls</emphasis>
  field could not be allocated, it reports a
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  error.
 </para>
 
@@ -5146,7 +5146,7 @@ structure, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; free everything + ctrls itself
+        <symbol>True</symbol> =&gt; free everything + ctrls itself
       </para>
     </listitem>
   </varlistentry>
@@ -5175,7 +5175,7 @@ The
 If
 <emphasis>free_all</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 <function>XkbFreeControls</function>
  frees every non-
 <emphasis>NULL</emphasis>
@@ -5252,9 +5252,9 @@ To get the current values of the
  with the
 <emphasis>per-client </emphasis>
 control attributes for this particular client. It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
@@ -5325,9 +5325,9 @@ by OR-ing the values together. XkbSetPerClientControls backfills value with the
 <emphasis>per-client </emphasis>
 <emphasis>control attributes for this particular client</emphasis>.
 It returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise.
 </para>
 
diff --git a/specs/XKB/ch11.xml b/specs/XKB/ch11.xml
index 8c71814b..6021ff9b 100644
--- a/specs/XKB/ch11.xml
+++ b/specs/XKB/ch11.xml
@@ -36,7 +36,7 @@ Controls affecting event delivery
 
 <para>
 There are two types of string lookups performed by
-<emphasis>XLookupString</emphasis>.
+<function>XLookupString</function>.
 The first type involves translating a single keycode into a string; the
 controls in the first category affect this type of lookup. The second type
 involves translating a series of keysyms into a string; the controls in the
@@ -78,11 +78,11 @@ affecting simple string lookups are:
 If the
 <emphasis>ForceLatin1Lookup</emphasis>
  control is enabled,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  only returns strings using the Latin1 character set. If
 <emphasis>ForceLatin1Lookup</emphasis>
  is not enabled,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  can return characters that are not in the Latin1 set. By default, this control
 is disabled, allowing characters outside of the Latin1 set to be returned.
 </para>
@@ -94,7 +94,7 @@ is disabled, allowing characters outside of the Latin1 set to be returned.
 
 <para>
 Simple string lookups in
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  involve two different translation phases. The first phase translates raw
 device keycodes to individual keysyms. The second phase attempts to map the
 resulting keysym into a string of one or more characters. In the first phase,
@@ -107,12 +107,12 @@ level for a key.
 The
 <emphasis>ConsumeLookupMods</emphasis>
  control determines whether or not
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
 <emphasis>consumes</emphasis>
  the modifiers it uses during the first phase of processing (mapping a keycode
 to a keysym). When a modifier is consumed, it is effectively removed from the
 working copy of the keyboard state information
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  is using and appears to be unset for the remainder of the processing.
 </para>
 
@@ -121,21 +121,21 @@ working copy of the keyboard state information
 If the
 <emphasis>ConsumeLookupMods</emphasis>
  control is enabled,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  does not use the modifiers used to translate the keycode of the event to a
 keysym when it is determining the string associated with a keysym. For example,
 assume the keymap for the ‘A’ key only contains the shift modifier and the
 <emphasis>ConsumeLookupMods</emphasis>
  control is enabled. If a user presses the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key and the
 <emphasis>A</emphasis>
  key while the
 <emphasis>Num_Lock</emphasis>
  key is locked,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  uses the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier when mapping the keycode for the ‘a’ key to the keysym for
 ‘A’; subsequently, it only uses the
 <emphasis>NumLock</emphasis>
@@ -147,10 +147,10 @@ assume the keymap for the ‘A’ key only contains the shift modifier and the
 If the
 <emphasis>ConsumeLookupMods</emphasis>
  control is not enabled,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  uses all of the event modifiers to determine the string associated with a
 keysym. This behavior mirrors the behavior of
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  in the core implementation.
 </para>
 
@@ -171,11 +171,11 @@ refer to Chapter 12.
 The
 <emphasis>AlwaysConsumeShiftAndLock</emphasis>
  control, if enabled, forces
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  to consume the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifiers when processing all keys, even if the definition for the key type
 does not specify these modifiers. The
 <emphasis>AlwaysConsumeShiftAndLock</emphasis>
@@ -190,10 +190,10 @@ does not specify these modifiers. The
 
 <para>
 The second type of string lookup performed by
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  involves translating a series of keysyms into a string. Because these lookups
 can involve more than one key event, they require
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  to retain some state information between successive calls. The process of
 mapping a series of keysyms to a string is known as
 <emphasis>compose processing</emphasis>.
@@ -229,7 +229,7 @@ translation, some decision must be made about what to do with the key events
 that were processed while attempting the compose. The
 <emphasis>ConsumeKeysOnComposeFail</emphasis>
  control allows a client to specify what happens with the key events
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  has been considering when it reaches a dead end in a compose sequence.
 </para>
 
@@ -331,7 +331,7 @@ When Xkb is initialized, it implicitly forces requests for
 <emphasis>NewKeyboardNotify</emphasis>
  events. These events may be used by the Xkb library extension internally; they
 are normally translated into core protocol
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events before being passed to the client. While delivering the event to the
 client is appropriate in most cases, it is not appropriate for some clients
 that maintain per-key data structures. This is because once the server has sent
@@ -349,7 +349,7 @@ The
  control, if enabled, prevents Xkb from mapping
 <emphasis>NewKeyboardNotify</emphasis>
  events to core
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events and passing them to the client. The control is initially disabled.
 </para>
 
diff --git a/specs/XKB/ch12.xml b/specs/XKB/ch12.xml
index 95dcf820..3506cbea 100644
--- a/specs/XKB/ch12.xml
+++ b/specs/XKB/ch12.xml
@@ -12,7 +12,7 @@ several core X library functions.
 
 <para>
 When support for Xkb is built into the X library, the
-<emphasis>XOpenDisplay</emphasis>
+<function>XOpenDisplay</function>
  function looks for a compatible version of Xkb on the server. If it finds a
 compatible version, it initializes the extension and enables
 <emphasis>implicit support</emphasis>
@@ -29,7 +29,7 @@ includes ways to control or disable it.
 
 <para>
 Because
-<emphasis>XOpenDisplay</emphasis>
+<function>XOpenDisplay</function>
  initializes Xkb, some events contain an Xkb description of the keyboard state
 instead of that normally used by the core protocol. See section 17.1.1 for more
 information about the differences between Xkb keyboard state and that reported
@@ -44,14 +44,14 @@ by the core protocol.
 <para>
 When Xkb is missing or disabled, the X library tracks changes to the keyboard
 mapping using
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events. Whenever the keyboard mapping is changed, the server sends all clients
 a
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  event to report the change. When a client receives a
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  event, it is supposed to call
-<emphasis>XRefreshKeyboardMapping</emphasis>
+<function>XRefreshKeyboardMapping</function>
  to update the keyboard description used internally by the X library.
 </para>
 
@@ -66,7 +66,7 @@ receives either event, it should call
 <function>XkbRefreshKeyboardMapping</function>
  to update the keyboard description used internally by the X library. To avoid
 duplicate events, the X server does not send core protocol
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events to a client that has selected for
 <emphasis>XkbMapNotify</emphasis>
  events.
@@ -79,11 +79,11 @@ The implicit support for Xkb selects for
  events. This means that clients that do not explicitly use Xkb but that are
 using a version of the X library that has implicit support for Xkb do not
 receive
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events over the wire. Clients that were not written with Xkb in mind do not
 recognize or properly handle the new Xkb events, so the implicit support
 converts them to
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events that report approximately the same information, unless the client has
 explicitly selected for the Xkb version of the event.
 </para>
@@ -119,12 +119,12 @@ The following X library functions are modified by Xkb:
 </para>
 
 <para><programlisting>
-     <emphasis>XKeycodeToKeysym</emphasis>
-     <emphasis>XKeysymToKeycode</emphasis>
-     <emphasis>XLookupKeysym</emphasis>
-     <emphasis>XLookupString</emphasis>
-     <emphasis>XRefreshKeyboardMapping</emphasis>
-     <emphasis>XRebindKeysym</emphasis>
+     <function>XKeycodeToKeysym</function>
+     <function>XKeysymToKeycode</function>
+     <function>XLookupKeysym</function>
+     <function>XLookupString</function>
+     <function>XRefreshKeyboardMapping</function>
+     <function>XRebindKeysym</function>
 </programlisting></para>
 
 <para>
@@ -139,7 +139,7 @@ clients.
 
 <para>
 The
-<emphasis>XKeycodeToKeysym</emphasis>
+<function>XKeycodeToKeysym</function>
  function reports the keysym associated with a particular index for a single
 key. The index specifies a column of symbols in the core keyboard mapping (that
 is, as reported by the core protocol
@@ -152,7 +152,7 @@ the differences.
 
 <para>
 The
-<emphasis>XKeysymToKeycode</emphasis>
+<function>XKeysymToKeycode</function>
  function reports a keycode to which a particular keysym is bound. When Xkb is
 missing or disabled, this function looks in each column of the core keyboard
 mapping in turn and returns the lowest numbered key that matches in the lowest
@@ -163,7 +163,7 @@ symbols instead.
 
 <para>
 The
-<emphasis>XLookupKeysym</emphasis>
+<function>XLookupKeysym</function>
  function reports the symbol in a specific column of the key associated with an
 event. Whether or not Xkb is present, the column specifies an index into the
 core symbol mapping.
@@ -172,20 +172,20 @@ core symbol mapping.
 
 <para>
 The
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  function reports the symbol and string associated with a key event, taking
 into account the keycode and keyboard state as reported in the event. When Xkb
 is disabled or missing,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  uses the rules specified by the core protocol and reports only ISO Latin-1
 characters. When Xkb is present,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  uses the explicit keyboard group, key types, and rules specified by Xkb. When
 Xkb is present,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  is allowed, but not required, to return strings in character sets other than
 ISO Latin-1, depending on the current locale. If any key bindings are defined,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  does not use any consumed modifiers (see sections 11.1.2 and 15.2) to
 determine matching bindings.
 </para>
@@ -193,30 +193,30 @@ determine matching bindings.
 
 <para>
 The
-<emphasis>XRefreshKeyboardMapping</emphasis>
+<function>XRefreshKeyboardMapping</function>
  function updates the X library’s internal representation of the keyboard to
 reflect changes reported via
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events. When Xkb is missing or disabled, this function reloads the entire
 modifier map or keyboard mapping. When Xkb is present, the implicit Xkb support
 keeps track of the changed components reported by each
 <emphasis>XkbMapNotify</emphasis>
  event and updates only those pieces of the keyboard description that have
 changed. If the implicit support has not noted any keyboard mapping changes,
-<emphasis>XRefreshKeyboardMapping</emphasis>
+<function>XRefreshKeyboardMapping</function>
  updates the entire keyboard description.
 </para>
 
 
 <para>
 The
-<emphasis>XRebindKeysym</emphasis>
+<function>XRebindKeysym</function>
  function associates a string with a keysym and a set of modifiers. Xkb does
 not directly change this function, but it does affect the way that the state
 reported in the event is compared to the state specified to
-<emphasis>XRebindKeysym</emphasis>.
+<function>XRebindKeysym</function>.
 When Xkb is missing or disabled,
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  returns the specified string if the modifiers in the event exactly match the
 modifiers from this call. When Xkb is present, any modifiers used to determine
 the keysym are consumed and are not used to look up the string.
@@ -302,7 +302,7 @@ particular key on the core keyboard. If
  are out of range for the specified key,
 <function>XkbKeycodeToKeysym</function>
  returns
-<emphasis>NoSymbol</emphasis>.
+<symbol>NoSymbol</symbol>.
 </para>
 
 
@@ -360,15 +360,15 @@ If no modifiers are bound to the keysym,
 <function>XkbKeysymToModifiers</function>
  returns zero; otherwise, it returns the inclusive OR of zero or more of the
 following:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>,
-<emphasis>Mod2Mask</emphasis>,
-<emphasis>Mod3Mask</emphasis>,
-<emphasis>Mod4Mask</emphasis>,
+<symbol>ShiftMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>Mod1Mask</symbol>,
+<symbol>Mod2Mask</symbol>,
+<symbol>Mod3Mask</symbol>,
+<symbol>Mod4Mask</symbol>,
  and
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 </para>
 
 
@@ -454,7 +454,7 @@ Use
 <para>
 <function>XkbLookupKeySym</function>
  is the equivalent of the core
-<emphasis>XLookupKeySym</emphasis>
+<symbol>XLookupKeySym</symbol>
  function. For the core keyboard, given a keycode
 <emphasis>key</emphasis>
  and an Xkb state
@@ -467,13 +467,13 @@ Use
 The
 <emphasis>state</emphasis>
  parameter is the state from a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  or
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event.
 <function>XkbLookupKeySym</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if it succeeds.
 </para>
 
@@ -485,7 +485,7 @@ Use
 <emphasis>XRebindKeySym</emphasis>.
 <function>XkbLookupKeyBinding</function>
  is the equivalent of the core
-<emphasis>XLookupString</emphasis>
+<function>XLookupString</function>
  function.
 </para>
 
@@ -575,7 +575,7 @@ Use
 </variablelist>
 
 <para>
-<emphasis>XRebindKeysym</emphasis>
+<function>XRebindKeysym</function>
  binds an ASCII string to a specified keysym, so that the string and keysym are
 returned when the key is pressed and a specified list of modifiers are also
 being held down.
@@ -743,7 +743,7 @@ To update the keyboard description that is internal to the X library, use
 <para>
 <function>XkbRefreshKeyboardMapping</function>
  is the Xkb equivalent of the core
-<emphasis>XRefreshKeyboardMapping</emphasis>
+<function>XRefreshKeyboardMapping</function>
  function. It requests that the X server send the current key mapping
 information to this client. A client usually invokes
 <function>XkbRefreshKeyboardMapping</function>
@@ -752,9 +752,9 @@ information to this client. A client usually invokes
  event.
 <function>XkbRefreshKeyboardMapping</function>
  returns
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if it succeeds and
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  if the event is not an Xkb event.
 </para>
 
@@ -849,14 +849,14 @@ To translate a keycode to a key symbol and modifiers, use
  is backfilled with the modifiers consumed by the translation process.
 <emphasis>mods</emphasis>
  is a bitwise inclusive OR of the legal modifier masks:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>,
-<emphasis>Mod2Mask</emphasis>,
-<emphasis>Mod3Mask</emphasis>,
-<emphasis>Mod4Mask</emphasis>,
-<emphasis>Mod5Mask</emphasis>.
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>,
+<symbol>Mod2Mask</symbol>,
+<symbol>Mod3Mask</symbol>,
+<symbol>Mod4Mask</symbol>,
+<symbol>Mod5Mask</symbol>.
 The
 <emphasis>AlwaysConsumeShiftAndLock</emphasis>
  library control (see section 11.1.3), if enabled, causes
@@ -864,11 +864,11 @@ The
  to consume shift and lock.
 <function>XkbTranslateKeyCode</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the translation resulted in a keysym, and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if it resulted in
-<emphasis>NoSymbol</emphasis>.
+<symbol>NoSymbol</symbol>.
 </para>
 </sect1>
 </chapter>
diff --git a/specs/XKB/ch13.xml b/specs/XKB/ch13.xml
index e6a8c639..4f3b16b9 100644
--- a/specs/XKB/ch13.xml
+++ b/specs/XKB/ch13.xml
@@ -854,8 +854,8 @@ typedef struct _XkbRow {             /* row in a section */
       short               left;      /* left coordinate of row origin, relative to section’s origin */
       unsigned short      num_keys;  /* number of keys in the keys array */
       unsigned short      sz_keys;   /* size of the keys array */
-      int                 vertical;  /* <emphasis>True</emphasis> =&gt;vertical row,
-                                        <emphasis> False</emphasis> =&gt;horizontal row */
+      int                 vertical;  /* <symbol>True</symbol> =&gt;vertical row,
+                                        <symbol>False</symbol> =&gt;horizontal row */
       XkbKeyPtr           keys;      /* array of keys in the row*/
       XkbBoundsRec        bounds;    /* bounding box for the row */
 } <emphasis>XkbRowRec</emphasis>, *XkbRowPtr;
@@ -1119,14 +1119,14 @@ To load a keyboard geometry if you already have the keyboard description, use
 <para>
 <function>XkbGetGeometry</function>
  can return
-<emphasis>BadValue</emphasis>,
-<emphasis>BadImplementation</emphasis>,
-<emphasis>BadName</emphasis>,
-<emphasis>BadAlloc</emphasis>,
+<errorname>BadValue</errorname>,
+<errorname>BadImplementation</errorname>,
+<errorname>BadName</errorname>,
+<errorname>BadAlloc</errorname>,
  or
-<emphasis>BadLength</emphasis>
+<errorname>BadLength</errorname>
  errors or
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if it succeeds.
 </para>
 
@@ -1188,7 +1188,7 @@ description from this database by name, use
 <para>
 <function>XkbGetNamedGeometry</function>
  can return
-<emphasis>BadName</emphasis>
+<errorname>BadName</errorname>
  if the
 <emphasis>name</emphasis>
  cannot be found.
@@ -1284,13 +1284,13 @@ the top surface is defined as the last outline in the
 ’s array of outlines.
 <function>XkbComputeShapeTop</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if
 <emphasis>shape</emphasis>
  is
 <emphasis>NULL</emphasis>
  or if there are no outlines for the shape; otherwise, it returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
@@ -1341,13 +1341,13 @@ shape, use <function>XkbComputeShapeBounds</function>.
 those outlines.
 <function>XkbComputeShapeBounds</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if
 <emphasis>shape</emphasis>
  is
 <emphasis>NULL</emphasis>
  or if there are no outlines for the shape; otherwise, it returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 <para>
@@ -1411,11 +1411,11 @@ To update the bounding box of a row, use <function>XkbComputeRowBounds</function
 and updates the bounding box of the row if necessary.
 <function>XkbComputeRowBounds</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if any of the arguments is
 <emphasis>NULL</emphasis>
 ; otherwise, it returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 <para>
@@ -1468,11 +1468,11 @@ that section. To update the bounding box of a section, use
  and updates the bounding box of that section so that it contains all rows.
 <function>XkbComputeSectionBounds</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if any of the arguments is
 <emphasis>NULL</emphasis>
 ; otherwise, it returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 <para>
@@ -2453,11 +2453,11 @@ functions increase
 <emphasis>num_</emphasis>
 <emphasis>*</emphasis>
  to zero). These functions return
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if they succeed,
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  if they are not able to allocate space, or
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  if a parameter is not as expected.
 </para>
 
@@ -2573,7 +2573,7 @@ To free geometry outlines, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all outlines are freed
+        <symbol>True</symbol> =&gt; all outlines are freed
       </para>
     </listitem>
   </varlistentry>
@@ -2581,7 +2581,7 @@ To free geometry outlines, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all outlines are freed regardless of the value of first or count. Otherwise,
 count outlines are freed beginning with the one specified by first.
 </para>
@@ -2696,7 +2696,7 @@ To free geometry keys, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all keys are freed
+        <symbol>True</symbol> =&gt; all keys are freed
       </para>
     </listitem>
   </varlistentry>
@@ -2704,7 +2704,7 @@ To free geometry keys, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all keys are freed regardless of the value of first or count. Otherwise,
 count keys are freed beginning with the one specified by first.
 </para>
@@ -2825,7 +2825,7 @@ To free geometry properties, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all properties are freed
+        <symbol>True</symbol> =&gt; all properties are freed
       </para>
     </listitem>
   </varlistentry>
@@ -2833,7 +2833,7 @@ To free geometry properties, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all properties are freed regardless of the value of first or count.
 Otherwise, count properties are freed beginning with the one specified by first.
 </para>
@@ -2951,7 +2951,7 @@ To free geometry key aliases, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all key aliases are freed
+        <symbol>True</symbol> =&gt; all key aliases are freed
       </para>
     </listitem>
   </varlistentry>
@@ -2959,7 +2959,7 @@ To free geometry key aliases, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all aliases in the top level of the specified geometry
 <emphasis>geom</emphasis>
  are freed regardless of the value of first or count. Otherwise, count aliases
@@ -3081,7 +3081,7 @@ To free geometry colors, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all colors are freed
+        <symbol>True</symbol> =&gt; all colors are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3089,7 +3089,7 @@ To free geometry colors, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all colors are freed regardless of the value of first or count. Otherwise,
 count colors are freed beginning with the one specified by first.
 </para>
@@ -3207,7 +3207,7 @@ To free points in a outline, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all points are freed
+        <symbol>True</symbol> =&gt; all points are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3215,7 +3215,7 @@ To free points in a outline, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all points are freed regardless of the value of first and count. Otherwise,
 the number of points specified by count are freed, beginning with the point
 specified by first in the specified outline.
@@ -3334,7 +3334,7 @@ To free geometry shapes, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all shapes are freed
+        <symbol>True</symbol> =&gt; all shapes are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3342,7 +3342,7 @@ To free geometry shapes, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all shapes in the geometry are freed regardless of the values of first and
 count. Otherwise, count shapes are freed, beginning with the shape specified by
 first.
@@ -3458,7 +3458,7 @@ To free geometry sections, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all sections are freed
+        <symbol>True</symbol> =&gt; all sections are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3466,7 +3466,7 @@ To free geometry sections, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all sections are freed regardless of the value of first and count. Otherwise,
 the number of sections specified by count are freed, beginning with the section
 specified by first in the specified geometry.
@@ -3582,7 +3582,7 @@ To free rows in a section, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all rows are freed
+        <symbol>True</symbol> =&gt; all rows are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3590,7 +3590,7 @@ To free rows in a section, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all rows are freed regardless of the value of first and count. Otherwise, the
 number of rows specified by count are freed, beginning with the row specified
 by first in the specified section.
@@ -3706,7 +3706,7 @@ To free rows in an section, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all overlays are freed
+        <symbol>True</symbol> =&gt; all overlays are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3714,7 +3714,7 @@ To free rows in an section, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all overlays are freed regardless of the value of first and count. Otherwise,
 the number of overlays specified by count are freed, beginning with the overlay
 specified by first in the specified section.
@@ -3830,7 +3830,7 @@ To free rows in an overlay, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all rows are freed
+        <symbol>True</symbol> =&gt; all rows are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3838,7 +3838,7 @@ To free rows in an overlay, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all rows are freed regardless of the value of first and count. Otherwise, the
 number of rows specified by count are freed, beginning with the row specified
 by first in the specified overlay.
@@ -3954,7 +3954,7 @@ To free keys in an overlay row, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all keys are freed
+        <symbol>True</symbol> =&gt; all keys are freed
       </para>
     </listitem>
   </varlistentry>
@@ -3962,7 +3962,7 @@ To free keys in an overlay row, use
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all keys are freed regardless of the value of first and count. Otherwise, the
 number of keys specified by count are freed, beginning with the key specified
 by first in the specified row.
@@ -4117,7 +4117,7 @@ To free geometry doodads, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; all doodads are freed
+        <symbol>True</symbol> =&gt; all doodads are freed
       </para>
     </listitem>
   </varlistentry>
@@ -4127,7 +4127,7 @@ To free geometry doodads, use
 If
 <emphasis>free_all</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 all doodads in the array are freed, regardless of the value of count.
 Otherwise, count doodads are freed.
 </para>
@@ -4234,7 +4234,7 @@ To free an entire geometry, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; the entire geometry is freed.
+        <symbol>True</symbol> =&gt; the entire geometry is freed.
       </para>
     </listitem>
   </varlistentry>
@@ -4256,7 +4256,7 @@ is freed. The valid values for which are:
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the entire geometry is freed regardless of the value of which. Otherwise, the
 portions of the geometry specified by which are freed.
 </para>
diff --git a/specs/XKB/ch14.xml b/specs/XKB/ch14.xml
index 2e769a4d..bdb912d5 100644
--- a/specs/XKB/ch14.xml
+++ b/specs/XKB/ch14.xml
@@ -79,7 +79,7 @@ starting at one.
 
 <note><para>Shift level is derived from the modifier state, but not necessarily
 in the same way for all keys. For example, the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier selects shift level 2 on most keys, but for keypad keys the modifier
 bound to
 <emphasis>Num_Lock</emphasis>
@@ -123,16 +123,16 @@ and the symbol for shift level two is
 The standard interpretation rules for the core X keymap only allow clients to
 access keys such as the one shown in Figure 14.1. That is, clients using the
 standard interpretation rules can only access one of four keysyms for any given
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event — two different symbols in two different groups.
 </para>
 
 
 <para>
 In general, the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier, the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier, and the modifier bound to the
 <emphasis>Num_Lock</emphasis>
  key are used to change between shift level 1 and shift level 2. To switch
@@ -190,7 +190,7 @@ type and specifies the modifier combinations necessary to access each level.
 
 <para>
 For example, Xkb allows key types where the
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  modifier can be used to access the shift level two of a key. Key types are in
 the client map component and are described in detail in section 15.2. <!-- xref -->
 </para>
@@ -327,16 +327,16 @@ XkbGetMap</emphasis>
  returns
 <emphasis>NULL</emphasis>.
 When unsuccessful, one of the following protocol errors is also generated:
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  (unable to allocate the
 <emphasis>XkbDescRec</emphasis>
  structure),
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  (some mask bits in
 <emphasis>which</emphasis>
  are undefined),
 or
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  (a compatible version of the Xkb extension is not available in the server). To
 free the returned data, use
 <function>XkbFreeClientMap</function>.
@@ -562,19 +562,19 @@ components of the
 reply, and then returns. If successful<emphasis>,
 XkbGetUpdatedMap</emphasis>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 If unsuccessful,
 <function>XkbGetUpdatedMap</function>
  returns one of the following:
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  (unable to allocate a component in the
 <emphasis>XkbDescRec</emphasis>
  structure),
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  (some mask bits in
 <emphasis>which</emphasis>
  are undefined),
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  (a compatible version of the Xkb extension is not available in the server or
 the reply from the server was invalid).
 </para>
@@ -671,15 +671,15 @@ If any components specified by
  parameter,
 <function>XkbSetMap</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise, it sends the update request to the server and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 <function>XkbSetMap</function>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadLength</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadLength</errorname>,
 and
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol errors.
 </para>
 
@@ -940,19 +940,19 @@ If any components specified by
  parameter,
 <function>XkbChangeMap</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise, it sends a request to the server and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
 <para>
 <function>XkbChangeMap</function>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadLength</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadLength</errorname>,
 and
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol errors.
 </para>
 
@@ -1013,7 +1013,7 @@ The structure for
 typedef struct {
       int            type;         /* Xkb extension base event code */
       unsigned long  serial;       /* X server serial number for event */
-      Bool           send_event;   /* <emphasis>True</emphasis> =&gt; synthetically generated */
+      Bool           send_event;   /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *      display;      /* server connection where event generated */
       Time           time;         /* server time when event generated */
       int            xkb_type;     /* <emphasis> XkbMapNotify</emphasis> */
@@ -1186,7 +1186,7 @@ field specifies the number of entries to preallocate for the
 field is less than
 <emphasis>XkbNumRequiredTypes</emphasis>
  (see section 15.2.1), returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 </entry>
   </row>
   <row>
@@ -1248,7 +1248,7 @@ of entries necessary for
  parameter. If they are not valid,
 <function>XkbAllocClientMap</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 </para></note>
 
 <para>
@@ -1277,12 +1277,12 @@ request. The only exception is the
 If
 <function>XkbAllocClientMap</function>
  is successful, it returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 Otherwise, it can return either
-<emphasis>BadMatch</emphasis>,
-<emphasis>BadAlloc</emphasis>,
+<errorname>BadMatch</errorname>,
+<errorname>BadAlloc</errorname>,
 or
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  errors.
 </para>
 
@@ -1338,7 +1338,7 @@ To free memory used by the client map member of an
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis>
+        <symbol>True</symbol>
          =&gt; free all client components and map itself
       </para>
     </listitem>
@@ -1365,7 +1365,7 @@ The
 If
 <emphasis>free_all</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 <emphasis>which</emphasis>
  is ignored;
 <function>XkbFreeClientMap</function>
@@ -1537,7 +1537,7 @@ field of the server map.
  parameter must be legal values. If they are not valid,
 <function>XkbAllocServerMap</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 </para></note>
 
 <para>
@@ -1565,11 +1565,11 @@ field accordingly.
 If
 <function>XkbAllocServerMap</function>
  is successful, it returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 Otherwise, it can return either
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  or
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  errors.
 </para>
 
@@ -1625,7 +1625,7 @@ To free memory used by the server member of an
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis>
+        <symbol>True</symbol>
          =&gt; free all server map components and server itself
       </para>
     </listitem>
@@ -1647,7 +1647,7 @@ The
 inclusive OR of the masks listed in Table 14.4. If
 <emphasis>free_all</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 <emphasis>which</emphasis>
  is ignored and
 <function>XkbFreeServerMap</function>
diff --git a/specs/XKB/ch15.xml b/specs/XKB/ch15.xml
index 9a1245d9..5f93bade 100644
--- a/specs/XKB/ch15.xml
+++ b/specs/XKB/ch15.xml
@@ -93,7 +93,7 @@ typedef struct {                       /* Key Type */
 
 <para><programlisting>
 typedef struct {                   /* Modifiers for a key type */
-      Bool            active;      /* <emphasis> True</emphasis> =&gt; entry
+      Bool            active;      /* <symbol>True</symbol> =&gt; entry
                                       active when determining shift level */
       unsigned char   level;       /* shift level if modifiers match <emphasis> mods</emphasis> */
       XkbModsRec      mods;        /* mods needed for this level to be
@@ -161,13 +161,13 @@ Each map entry contains an
  field should be considered when determining shift level. If
 <emphasis>active</emphasis>
  is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 this
 <emphasis>map</emphasis>
  entry is ignored. If
 <emphasis>active</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the
 <emphasis>level</emphasis>
  field of the
@@ -319,8 +319,8 @@ The
 <emphasis>name</emphasis>
  of the example key type is "ALPHATHREE," and the modifiers it pays attention
 to are
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
 and the virtual modifier
 <emphasis>LevelThree</emphasis>.
 There are three shift levels. The name of shift level one is "Base," the name
@@ -337,14 +337,14 @@ Given the combination of the
 <emphasis>map</emphasis>
  entries. The first map entry specifies that shift level one is to be used if
 no modifiers are set. The second entry specifies the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier alone also yields shift level one. The third entry specifies the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier alone yields shift level two. The fourth and fifth entries specify
 that the virtual
 <emphasis>LevelThree</emphasis>
  modifier alone, or in combination with the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier, yields shift level three.
 </para>
 
@@ -358,7 +358,7 @@ that the virtual
 
 <para>
 Because the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier is to be preserved for further event processing, the
 <emphasis>preserve</emphasis>
  list is not
@@ -370,20 +370,20 @@ Because the
  entries, except for the one corresponding to the
 <emphasis>map</emphasis>
  entry that specifies the
-<emphasis>Lock </emphasis>
+<symbol>Lock</symbol>
 modifier, do not list any modifiers. For the
 <emphasis>map</emphasis>
  entry that specifies the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier, the corresponding
 <emphasis>preserve</emphasis>
  list entry lists the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier, meaning do not consume the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier. In this particular case, the preserved modifier is passed to Xlib
 translation functions and causes them to notice that the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier is set; consequently, the Xlib functions apply the appropriate
 capitalization rules to the symbol. Because this preserve entry is set only for
 a modifier that yields shift level one, the capitalization occurs only for
@@ -451,9 +451,9 @@ The description of the ONE_LEVEL key type is stored in the
 The TWO_LEVEL key type describes groups that consist of two symbols but are
 neither alphabetic nor numeric keypad keys. The default TWO_LEVEL type uses
 only the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier. It returns shift level two if
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  is set, and level one if it is not. A symbolic representation of this key type
 could look like the following:
 </para>
@@ -485,9 +485,9 @@ The ALPHABETIC key type describes groups consisting of two symbols: the
 lowercase form of a symbol followed by the uppercase form of the same symbol.
 The default ALPHABETIC type implements locale-sensitive "Shift cancels
 CapsLock" behavior using both the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifiers as follows:
 </para>
 
@@ -495,25 +495,25 @@ CapsLock" behavior using both the
 <listitem>
   <para>
 If
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  are both set, the default ALPHABETIC type yields level one.
   </para>
 </listitem>
 <listitem>
   <para>
 If
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  alone is set, it yields level two.
   </para>
 </listitem>
 <listitem>
   <para>
 If
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  alone is set, it yields level one, but preserves the
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  modifier so Xlib notices and applies the appropriate capitalization rules. The
 Xlib functions are locale-sensitive and apply different capitalization rules
 for different locales.
@@ -522,9 +522,9 @@ for different locales.
 <listitem>
   <para>
 If neither
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  nor
-<emphasis>Lock</emphasis>
+<symbol>Lock</symbol>
  is set, it yields level one.
   </para>
 </listitem>
@@ -571,7 +571,7 @@ virtual modifier named "NumLock," known as the
 <listitem>
   <para>
 If
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  and
 <emphasis>NumLock</emphasis>
  are both set, the default KEYPAD type yields level one.
@@ -580,7 +580,7 @@ If
 <listitem>
   <para>
 If
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  alone is set, it yields level two.
   </para>
 </listitem>
@@ -594,7 +594,7 @@ If
 <listitem>
   <para>
 If neither
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  nor
 <emphasis>NumLock</emphasis>
  is set, it yields level one.
@@ -725,9 +725,9 @@ initializing the KEYPAD key type. If the
 <para>
 <function>XkbInitCanonicalKeyTypes</function>
  normally returns Success. It returns
-<emphasis>BadAccess</emphasis>
+<errorname>BadAccess</errorname>
  if the Xkb extension has not been properly initialized, and
-<emphasis>BadAccess</emphasis>
+<errorname>BadAccess</errorname>
  if the
 <emphasis>xkb</emphasis>
  parameter is not valid.
@@ -825,9 +825,9 @@ If successful, it returns Success.
 <para>
 <function>XkbGetKeyTypes</function>
  returns
-<emphasis>BadAccess</emphasis>
+<errorname>BadAccess</errorname>
  if the Xkb extension has not been properly initialized and
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  if the combination of
 <emphasis>first</emphasis>
  and
@@ -901,7 +901,7 @@ To change the number of levels in a key type, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis>
+        <symbol>True</symbol>
          =&gt; list of preserved modifiers is necessary
       </para>
     </listitem>
@@ -965,7 +965,7 @@ The
  list for the key should be created. If
 <emphasis>want_preserve</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the
 <emphasis>preserve</emphasis>
  list with
@@ -973,7 +973,7 @@ the
  entries is allocated or reallocated if it already exists. Otherwise, if
 <emphasis>want_preserve</emphasis>
  is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the
 <emphasis>preserve</emphasis>
  field is freed if necessary and set to
@@ -1000,13 +1000,13 @@ If
  is less than zero,
 <function>XkbResizeKeyType</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If
 <function>XkbResizeKeyType</function>
  encounters any problems with allocation, it returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 Otherwise, it returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -1087,7 +1087,7 @@ and
 <emphasis>into</emphasis>,
 <function>XkbCopyKeyType</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 Otherwise,
 <function>XkbCopyKeyType</function>
  copies
@@ -1095,7 +1095,7 @@ Otherwise,
  to
 <emphasis>into</emphasis>
  and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -1176,7 +1176,7 @@ If any allocation errors occur while copying
 <emphasis>into</emphasis>,
 <function>XkbCopyKeyTypes</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 Otherwise,
 <function>XkbCopyKeyTypes</function>
  copies
@@ -1184,7 +1184,7 @@ Otherwise,
  to
 <emphasis>into</emphasis>
  and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -1425,7 +1425,7 @@ The
 key as well as the specification of the treatment of out-of-range groups. It is
 legal for a key to have zero groups, in which case it also has zero symbols and
 all events from that key yield
-<emphasis>NoSymbol</emphasis>.
+<symbol>NoSymbol</symbol>.
 To obtain the number of groups of symbols bound to the key, use
 <function>XkbKeyNumGroups</function>.
 To change the number of groups bound to a key, use
@@ -2097,7 +2097,7 @@ It waits for a reply and returns the keysyms in the
 If successful,
 <function>XkbGetKeySyms</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 The
 <emphasis>xkb</emphasis>
  parameter must be a pointer to a valid Xkb keyboard description.
@@ -2120,18 +2120,18 @@ If a compatible version of Xkb is not available in the server or the Xkb
 extension has not been properly initialized,
 <function>XkbGetKeySyms</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If
 <emphasis>num</emphasis>
  is less than 1 or greater than
 <emphasis>XkbMaxKeyCount</emphasis>,
 <function>XkbGetKeySyms</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If any allocation errors occur,
 <function>XkbGetKeySyms</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -2233,7 +2233,7 @@ To change the number of groups and the types bound to a key, use
 <function>XkbChangeTypesOfKey</function>
  reallocates the symbols and actions bound to the key, if necessary, and
 initializes any new symbols or actions to
-<emphasis>NoSymbol</emphasis>
+<symbol>NoSymbol</symbol>
  or
 <emphasis>NoAction</emphasis>,
 as appropriate. If the
@@ -2260,7 +2260,7 @@ as appropriate. If the
  structure. If successful,
 <function>XkbChangeTypesOfKey</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -2353,7 +2353,7 @@ groups:
 If the Xkb extension has not been properly initialized,
 <function>XkbChangeTypesOfKey</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If the
 <emphasis>xkb</emphasis>
  parameter it not valid (that is, it is
@@ -2373,12 +2373,12 @@ or the
  mask does not contain any of the valid group mask bits,
 <function>XkbChangeTypesOfKey</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If it is necessary to resize the key symbols or key actions arrays and any
 allocation errors occur,
 <function>XkbChangeTypesOfKey</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -2471,7 +2471,7 @@ If
  is greater than the current number of keysyms for the key,
 <function>XkbResizeKeySyms</function>
  initializes all new keysyms in the array to
-<emphasis>NoSymbol</emphasis>.
+<symbol>NoSymbol</symbol>.
 </para>
 
 
@@ -2518,15 +2518,15 @@ The
  entry of the client map is an array, indexed by keycode, specifying the real
 modifiers bound to a key. Each entry is a mask composed of a bitwise inclusive
 OR of the legal real modifiers:
-<emphasis>ShiftMask</emphasis>,
-<emphasis>LockMask</emphasis>,
-<emphasis>ControlMask</emphasis>,
-<emphasis>Mod1Mask</emphasis>,
-<emphasis>Mod2Mask</emphasis>,
-<emphasis>Mod3Mask</emphasis>,
-<emphasis>Mod4Mask</emphasis>,
+<symbol>ShiftMask</symbol>,
+<symbol>LockMask</symbol>,
+<symbol>ControlMask</symbol>,
+<symbol>Mod1Mask</symbol>,
+<symbol>Mod2Mask</symbol>,
+<symbol>Mod3Mask</symbol>,
+<symbol>Mod4Mask</symbol>,
 and
-<emphasis>Mod5Mask</emphasis>.
+<symbol>Mod5Mask</symbol>.
 If a bit is set in a
 <emphasis>modmap</emphasis>
  entry, the corresponding key is bound to that modifier.
@@ -2621,7 +2621,7 @@ It waits for a reply and places the results in the
 -&gt;map-&gt;modmap array. If successful,
 <emphasis>XkbGetKeyModifier</emphasis>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -2639,11 +2639,11 @@ If a compatible version of Xkb is not available in the server or the Xkb
 extension has not been properly initialized,
 <function>XkbGetKeySyms</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If any allocation errors occur while obtaining the modifier map,
 <function>XkbGetKeyModifierMap</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 </sect2>
 </sect1>
diff --git a/specs/XKB/ch16.xml b/specs/XKB/ch16.xml
index 8209368f..c70eb7c7 100644
--- a/specs/XKB/ch16.xml
+++ b/specs/XKB/ch16.xml
@@ -76,9 +76,9 @@ and are defined in section 16.4.
 A key action defines the effect key presses and releases have on the internal
 state of the server. For example, the expected key action associated with
 pressing the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  key is to set the
-<emphasis>Shift</emphasis>
+<symbol>Shift</symbol>
  modifier. There is zero or one key action associated with each keysym bound to
 each key.
 </para>
@@ -195,11 +195,11 @@ to key actions:
 <para>
 <function>XkbKeyHasActions</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the key corresponding to
 <emphasis>keycode</emphasis>
  has any actions associated with it; otherwise, it returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -1307,9 +1307,9 @@ typedef struct _XkbPtrAction {
 If the
 <emphasis>MouseKeys</emphasis>
  control is not enabled (see section 10.5.1),
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events are treated as though the action is
 <emphasis>XkbSA_NoAction</emphasis>.
 </para>
@@ -1320,11 +1320,11 @@ If the
  control is enabled, a server action of type
 <emphasis>XkbSA_MovePtr</emphasis>
  instructs the server to generate core pointer
-<emphasis>MotionNotify</emphasis>
+<symbol>MotionNotify</symbol>
  events rather than the usual
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event, and the corresponding
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event disables any mouse keys timers that were created as a result of handling
 the
 <emphasis>XkbSA_MovePtr</emphasis>
@@ -1367,7 +1367,7 @@ The
 If not set, and the
 <emphasis>MouseKeysAccel</emphasis>
  control is enabled (see section 10.5.2), the
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  initiates a mouse keys timer for this key; every time the timer expires, the
 cursor moves.
     </entry>
@@ -1598,9 +1598,9 @@ typedef struct _XkbPtrBtnAction {
 If the
 <emphasis>MouseKeys</emphasis>
  (see section 10.5.1) control is not enabled,
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events are treated as though the action is
 <emphasis>XkbSA_NoAction</emphasis>.
 </para>
@@ -1650,13 +1650,13 @@ specified by the
 If the mouse button specified for this action is logically down, the key press
 and corresponding key release are ignored and have no effect. Otherwise, a key
 press causes one or more core pointer button events instead of the usual
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event. If
 <emphasis>count</emphasis>
  is
 <emphasis>zero</emphasis>,
 a key press generates a single
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  event; if
 <emphasis>count</emphasis>
  is greater than
@@ -1664,9 +1664,9 @@ a key press generates a single
 a key press generates
 <emphasis>count</emphasis>
  pairs of
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  and
-<emphasis>ButtonRelease</emphasis>
+<symbol>ButtonRelease</symbol>
  events.
     </para>
   </listitem>
@@ -1677,15 +1677,15 @@ If
  is
 <emphasis>zero</emphasis>,
 a key release generates a core pointer
-<emphasis>ButtonRelease</emphasis>
+<symbol>ButtonRelease</symbol>
  that matches the event generated by the corresponding
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
 ; if
 <emphasis>count</emphasis>
  is nonzero, a key release does not cause a
-<emphasis>ButtonRelease</emphasis>
+<symbol>ButtonRelease</symbol>
  event. A key release never generates a key
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event.
     </para>
   </listitem>
@@ -1704,9 +1704,9 @@ If the button specified by the
 or
 <emphasis>button</emphasis>
  is not locked, a key press causes a
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  event instead of a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event and locks the button. If the button is already locked or if
 <emphasis>XkbSA_LockNoUnlock</emphasis>
  is set in the
@@ -1721,9 +1721,9 @@ If the corresponding key press was ignored, and if
  is not set in the
 <emphasis>flags</emphasis>
  field, a key release generates a
-<emphasis>ButtonRelease</emphasis>
+<symbol>ButtonRelease</symbol>
  event instead of a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event and unlocks the specified button. If the corresponding key press locked
 a button, the key release is ignored and has no effect.
     </para>
@@ -1818,9 +1818,9 @@ typedef struct _XkbPtrDfltAction {
 If the
 <emphasis>MouseKeys</emphasis>
  control is not enabled,
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events are treated as though the action is
 <emphasis>XkbSA_NoAction</emphasis>.
 Otherwise, this action changes the
@@ -2008,7 +2008,7 @@ press and release
 release
 <emphasis>ISO_Lock</emphasis>
  ends up locking the
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  modifier.
 </para>
 
@@ -2933,9 +2933,9 @@ If set, key release events generate an
     <entry><emphasis>XkbSA_MessageGenKeyEvent</emphasis></entry>
     <entry>
 If set, key press and key release events generate
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events, regardless of whether they generate
 <emphasis>XkbActionMessage</emphasis>
  events.
@@ -3011,15 +3011,15 @@ The structure for the
 typedef struct _XkbActionMessage {
       int            type;            /* Xkb extension base event code */
       unsigned long  serial;          /* X server serial number for event */
-      Bool           send_event;      /* <emphasis>True</emphasis> =&gt; synthetically generated */
+      Bool           send_event;      /* <symbol>True</symbol> =&gt; synthetically generated */
       Display *      display;         /* server connection where event generated */
       Time           time;            /* server time when event generated */
       int            xkb_type;        /* <emphasis>XkbActionMessage</emphasis> */
       int            device;          /* Xkb device ID, will not be <emphasis> XkbUseCoreKbd</emphasis> */
       KeyCode        keycode;         /* keycode of key triggering event */
-      Bool           press;           /* <emphasis>True</emphasis> =&gt; key press,
-                                         <emphasis>False</emphasis> =&gt; release */
-      Bool           key_event_follows; /* <emphasis>True</emphasis> =&gt; KeyPress/KeyRelease follows */
+      Bool           press;           /* <symbol>True</symbol> =&gt; key press,
+                                         <symbol>False</symbol> =&gt; release */
+      Bool           key_event_follows; /* <symbol>True</symbol> =&gt; KeyPress/KeyRelease follows */
       char           message[XkbActionMessageLength+1];                       /* message text */
 } <emphasis>XkbActionMessageEvent</emphasis>;
 </programlisting></para>
@@ -3038,34 +3038,34 @@ release.
 The
 <emphasis>key_event_follows</emphasis>
  specifies whether a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  (if
 <emphasis>press</emphasis>
  is
-<emphasis>True</emphasis>
+<symbol>True</symbol>
 ) or
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  (if
 <emphasis>press</emphasis>
  is
-<emphasis>False</emphasis>
+<symbol>False</symbol>
 ) event is also sent to the client. As with all other Xkb events,
 <emphasis>XkbActionMessageEvent</emphasis>
 s are delivered to all clients requesting them, regardless of the current
 keyboard focus. However, the
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  or
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event that conditionally follows an
 <emphasis>XkbActionMessageEvent</emphasis>
  is sent only to the client selected by the current keyboard focus.
 <emphasis>key_event_follows</emphasis>
  is
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  only for the client that is actually sent the following
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  or
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event.
 </para>
 
@@ -3094,9 +3094,9 @@ The
 Actions associated with the
 <emphasis>XkbRedirectKeyAction</emphasis>
  structure generate
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events containing a keycode different from the key that was pressed or
 released:
 </para>
@@ -3126,7 +3126,7 @@ The
 
 <para>
 Key presses cause a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event for the key specified by the
 <emphasis>new_key</emphasis>
  field instead of the actual key. The state reported in this event reports the
@@ -3150,7 +3150,7 @@ values for a single modifier, the real modifier definition has priority.
 
 <para>
 Key releases cause a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event for the key specified by the
 <emphasis>new_key</emphasis>
  field instead of the actual key. The state for this event consists of the
@@ -3360,9 +3360,9 @@ Actions associated with
  and
 <emphasis>DeviceButtonRelease</emphasis>
  events instead of normal
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  and
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events:
 </para>
 
@@ -3434,7 +3434,7 @@ If
  is nonzero, a key release does not cause a
 <emphasis>DeviceButtonRelease</emphasis>
  event. Key releases never cause
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events.
     </para>
   </listitem>
@@ -3460,7 +3460,7 @@ Otherwise, if the specified button is not locked and the
  field, a key press generates an input extension
 <emphasis>DeviceButtonPress</emphasis>
  event instead of a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event and locks the button. If the button is already locked or if
 <emphasis>XkbSA_LockNoLock</emphasis>
  bit is set in the
@@ -3477,7 +3477,7 @@ If the corresponding key press was ignored, and if the
  field, a key release generates an input extension
 <emphasis>DeviceButtonRelease</emphasis>
  event instead of a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event and unlocks the button. If the corresponding key press locked a button,
 the key release is ignored and has no effect.
     </para>
@@ -3766,7 +3766,7 @@ It waits for a reply and returns the actions in the
 If successful,
 <function>XkbGetKeyActions</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 The
 <emphasis>xkb</emphasis>
  parameter must be a pointer to a valid Xkb keyboard description.
@@ -3789,18 +3789,18 @@ If the server does not have a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbGetKeyActions</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If
 <emphasis>num</emphasis>
  is less than 1 or greater than
 <emphasis>XkbMaxKeyCount</emphasis>,
 <function>XkbGetKeyActions</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If any allocation errors occur,
 <function>XkbGetKeyActions</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -4212,7 +4212,7 @@ It waits for a reply and returns the behaviors in the
 If successful,
 <function>XkbGetKeyBehaviors</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -4232,18 +4232,18 @@ If the server does not have a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbGetKeyBehaviors</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If
 <emphasis>num</emphasis>
  is less than 1 or greater than
 <emphasis>XkbMaxKeyCount</emphasis>,
 <function>XkbGetKeyBehaviors</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If any allocation errors occur,
 <function>XkbGetKeyBehaviors</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -4447,7 +4447,7 @@ It waits for a reply and returns the explicit components in the
 If successful,
 <function>XkbGetKeyExplicitComponents</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 The
 <emphasis>xkb</emphasis>
  parameter must be a pointer to a valid Xkb keyboard description.
@@ -4470,18 +4470,18 @@ If the server does not have a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbGetKeyExplicitComponents</function>
  returns
-<emphasis>BadMatch</emphasis>.
+<errorname>BadMatch</errorname>.
 If
 <emphasis>num</emphasis>
  is less than 1 or greater than
 <emphasis>XkbMaxKeyCount</emphasis>,
 <function>XkbGetKeyExplicitComponents</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If any allocation errors occur,
 <function>XkbGetKeyExplicitComponents</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -4502,14 +4502,14 @@ of the virtual modifier to the real modifier bits. Each entry in the
 </para>
 
 <literallayout>
-     <emphasis>ShiftMask</emphasis>
-     <emphasis>LockMask</emphasis>
-     <emphasis>ControlMask</emphasis>
-     <emphasis>Mod1Mask</emphasis>
-     <emphasis>Mod2Mask</emphasis>
-     <emphasis>Mod3Mask</emphasis>
-     <emphasis>Mod4Mask</emphasis>
-     <emphasis>Mod5Mask</emphasis>
+     <symbol>ShiftMask</symbol>
+     <symbol>LockMask</symbol>
+     <symbol>ControlMask</symbol>
+     <symbol>Mod1Mask</symbol>
+     <symbol>Mod2Mask</symbol>
+     <symbol>Mod3Mask</symbol>
+     <symbol>Mod4Mask</symbol>
+     <symbol>Mod5Mask</symbol>
 </literallayout>
 
 <para>
@@ -4658,7 +4658,7 @@ The
 successful,
 <function>XkbGetVirtualMods</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -4678,11 +4678,11 @@ If the server does not have a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbGetVirtualMods</function>
  returns
-<emphasis>BadMatch</emphasis>.
+<errorname>BadMatch</errorname>.
 Any errors in allocation cause
 <function>XkbGetVirtualMods</function>
 to return
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 
@@ -4773,7 +4773,7 @@ It waits for a reply and returns the virtual modifier mappings in the
 If successful,
 <function>XkbGetKeyVirtualModMap</function>
  returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 The
 <emphasis>xkb</emphasis>
  parameter must be a pointer to a valid Xkb keyboard description
@@ -4796,18 +4796,18 @@ If the server does not have a compatible version of Xkb, or the Xkb extension
 has not been properly initialized,
 <function>XkbGetKeyVirtualModMap</function>
  returns
-<emphasis>BadMatch</emphasis>.
+<errorname>BadMatch</errorname>.
 If
 <emphasis>num</emphasis>
  is less than 1 or greater than
 <emphasis>XkbMaxKeyCount</emphasis>,
 <function>XkbGetKeyVirtualModMap</function>
  returns
-<emphasis>BadValue</emphasis>.
+<errorname>BadValue</errorname>.
 If any allocation errors occur,
 <function>XkbGetKeyVirtualModMap</function>
  returns
-<emphasis>BadAlloc</emphasis>.
+<errorname>BadAlloc</errorname>.
 </para>
 
 </sect2>
diff --git a/specs/XKB/ch17.xml b/specs/XKB/ch17.xml
index 0ae49bf0..69f7418c 100644
--- a/specs/XKB/ch17.xml
+++ b/specs/XKB/ch17.xml
@@ -198,9 +198,9 @@ undefined.
 Normally, the Xkb-aware server reports keyboard state in the
 <emphasis>state</emphasis>
  member of events such as a
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  event and
-<emphasis>ButtonPress</emphasis>
+<symbol>ButtonPress</symbol>
  event, encoded as follows:
 </para>
 
@@ -309,7 +309,7 @@ For each changed key, assign the symbols in the core map to the appropriate
 group on the key. If the total number of symbols required by the Xkb map for a
 particular key needs more symbols than the core protocol map contains, the
 additional symbols are taken to be
-<emphasis>NoSymbol</emphasis>
+<symbol>NoSymbol</symbol>
  keysyms appended to the end of the core set. If the core map contains more
 symbols than are needed by the Xkb map, trailing symbols in the core map are
 discarded. In the absence of an explicit override for group one or two, symbols
@@ -871,12 +871,12 @@ Unless you have specifically modified this field, it is the default keyboard
 device.
 <function>XkbGetCompatMap</function>
  returns
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if successful,
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  if it is unable to obtain necessary storage for either the return values or
 work space,
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  if the
 <emphasis>dpy</emphasis>
  field of the
@@ -886,7 +886,7 @@ work space,
  and does not match the
 <emphasis>display</emphasis>
  argument, and
-<emphasis>BadLength</emphasis>
+<errorname>BadLength</errorname>
  under certain conditions caused by server or Xkb implementation errors.
 </para>
 
@@ -900,7 +900,7 @@ Xkb provides several functions that make it easier to apply the compatibility
 map to configure a client-side Xkb keyboard mapping, given a core protocol
 representation of part or all of a keyboard mapping. Obtain a core protocol
 representation of a keyboard mapping from an actual server (by using
-<emphasis>XGetKeyboardMapping</emphasis>,
+<function>XGetKeyboardMapping</function>,
 for example), a data file, or some other source.
 </para>
 
@@ -1009,14 +1009,14 @@ keys with keycodes in the range
  - 1. If
 <function>XkbUpdateMapFromCore</function>
  is being called in response to a
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
 
 event<emphasis>,
 first_key</emphasis>
  and
 <emphasis>num_keys</emphasis>
  are reported in the
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  event.
 <emphasis>core_keysyms</emphasis>
  contains the keysyms corresponding to the keycode range being updated, in core
@@ -1346,7 +1346,7 @@ the vector of
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; apply to server’s keyboard map
+        <symbol>True</symbol> =&gt; apply to server’s keyboard map
       </para>
     </listitem>
   </varlistentry>
@@ -1374,13 +1374,13 @@ of the bits shown in Table 17.2.
 After updating its compatibility map for the specified device, if
 <emphasis>update_actions</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
  the server applies the new compatibility map to its entire keyboard for the
 device to generate a new set of key semantics, compatibility state, and a new
 core keyboard map. If
 <emphasis>update_actions</emphasis>
  is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the new compatibility map is not used to generate any modifications to the
 current device semantics, state, or core keyboard map. One reason for not
 applying the compatibility map immediately would be if one server was being
@@ -1392,16 +1392,16 @@ until everything is updated. To force an update at a later time, use
  as zero and
 <emphasis>update_actions</emphasis>
  as
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
 <para>
 <function>XkbSetCompatMap</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if unsuccessful. The server may report problems it encounters when processing
 the request subsequently via protocol errors.
 </para>
@@ -1456,7 +1456,7 @@ use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis>=&gt;apply compatibility map to keys
+        <symbol>True</symbol>=&gt;apply compatibility map to keys
       </para>
     </listitem>
   </varlistentry>
@@ -1481,7 +1481,7 @@ use
 If
 <emphasis>updateMap</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 it (re)applies the compatibility map to all of the keys on the keyboard. If
 <emphasis>changes</emphasis>
  is non-
@@ -1489,7 +1489,7 @@ it (re)applies the compatibility map to all of the keys on the keyboard. If
 it reports the parts of the keyboard that were affected (unless
 <emphasis>updateMap</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 not much changes).
 <function>XkbAddSymInterpret</function>
  returns a pointer to the actual new symbol interpretation in the list or
@@ -1504,18 +1504,18 @@ not much changes).
 
 <para>
 The server automatically generates
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events when the keyboard mapping changes. If you wish to be notified of
 changes to the compatibility map, you should select for
 <emphasis>XkbCompatMapNotify</emphasis>
  events. If you select for
 <emphasis>XkbMapNotify</emphasis>
  events, you no longer receive the automatically generated
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events. If you subsequently deselect
 <emphasis>XkbMapNotifyEvent</emphasis>
  delivery, you again receive
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events.
 </para>
 
@@ -1567,7 +1567,7 @@ The structure for the
 typedef struct {
       int            type;          /* Xkb extension base event code */
       unsigned long  serial;        /* X server serial number for event */
-      Bool           send_event;    /* <emphasis>True</emphasis> =&gt;
+      Bool           send_event;    /* <symbol>True</symbol> =&gt;
                                        synthetically generated */
       Display *      display;       /* server connection where event generated */
       Time           time;          /* server time when event generated */
@@ -1726,15 +1726,15 @@ added, use
 <para>
 <function>XkbAllocCompatMap</function>
  returns
-<emphasis>Success</emphasis>
+<symbol>Success</symbol>
  if successful,
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  if
 <emphasis>xkb</emphasis>
  is
 <emphasis>NULL</emphasis>,
 or
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  if errors are encountered when attempting to allocate storage.
 </para>
 
@@ -1785,7 +1785,7 @@ To free an entire compatibility map or selected portions of one, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; free <emphasis>XkbCompatMap</emphasis>
+        <symbol>True</symbol> =&gt; free <emphasis>XkbCompatMap</emphasis>
          structure itself
       </para>
     </listitem>
@@ -1809,7 +1809,7 @@ in section 17.2).
  structure itself should be freed. If
 <emphasis>free_map</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 <emphasis>which</emphasis>
  is ignored, all non-
 <emphasis>NULL</emphasis>
diff --git a/specs/XKB/ch18.xml b/specs/XKB/ch18.xml
index 6ffd1b52..2b3078c6 100644
--- a/specs/XKB/ch18.xml
+++ b/specs/XKB/ch18.xml
@@ -8,10 +8,10 @@ application that presents the keyboard to a user in an easy-to-understand way.
 Such applications have to examine the vendor string and keycodes to determine
 the type of keyboard connected to the server and then examine keysyms and
 modifier mappings to determine the effects of most modifiers (the
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>
  and
-<emphasis>Control</emphasis>
+<symbol>Control</symbol>
  modifiers are defined by the core protocol but no semantics are implied for
 any other modifiers).
 </para>
@@ -471,13 +471,13 @@ If the
 <para>
 <function>XkbGetNames</function>
  can return
-<emphasis>Success</emphasis>,
+<symbol>Success</symbol>,
 or
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadLength</emphasis>,
-<emphasis>BadMatch</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadLength</errorname>,
+<errorname>BadMatch</errorname>,
 and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors.
 </para>
 
@@ -506,12 +506,12 @@ structure and call
  and
 <function>XkbChangeNames</function>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadAtom</emphasis>,
-<emphasis>BadLength</emphasis>,
-<emphasis>BadMatch</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadAtom</errorname>,
+<errorname>BadLength</errorname>,
+<errorname>BadMatch</errorname>,
  and
-<emphasis>BadImplementation</emphasis>
+<errorname>BadImplementation</errorname>
  errors.
 </para>
 
@@ -612,7 +612,7 @@ changed. If either or both of these mask bits are set but the specified types
 are illegal,
 <function>XkbSetNames</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  and does not update any of the names specified in
 <emphasis>which</emphasis>.
 The specified types are illegal if
@@ -818,7 +818,7 @@ to the X server specified by
 <emphasis>dpy</emphasis>.
 <function>XkbChangeNames</function>
  aborts and returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  if any illegal type names or type shift level names are specified by
 <emphasis>changes</emphasis>.
 </para>
@@ -871,7 +871,7 @@ typedef struct {
       int      type;                  /* Xkb extension base event code */
       unsigned long      serial;      /* X server serial number for
                                          event */
-      Bool      send_event;           /* <emphasis>True</emphasis>
+      Bool      send_event;           /* <symbol>True</symbol>
                                          =&gt; synthetically generated */
       Display *      display;         /* server connection where event
                                          generated */
@@ -1051,10 +1051,10 @@ results into the
 <para>
 <emphasis>XkbGetNamesChanges</emphasis>
  can generate
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadImplementation</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadImplementation</errorname>,
  and
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  errors.
 </para>
 
@@ -1134,10 +1134,10 @@ from the X server. Instead use
 <para>
 <function>XkbAllocNames</function>
  can return
-<emphasis>BadAlloc</emphasis>,
-<emphasis>BadMatch</emphasis>,
+<errorname>BadAlloc</errorname>,
+<errorname>BadMatch</errorname>,
  and
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  errors.
 The
 <emphasis>which</emphasis>
@@ -1150,7 +1150,7 @@ Table 18.1.
 Do not free symbolic names structures directly using
 <emphasis>free</emphasis>
  or
-<emphasis>XFree</emphasis>.
+<function>XFree</function>.
 Use
 <function>XkbFreeNames</function>
  instead.
@@ -1196,7 +1196,7 @@ Use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis>
+        <symbol>True</symbol>
          =&gt; XkbNamesRec structure itself should be freed
       </para>
     </listitem>
diff --git a/specs/XKB/ch19.xml b/specs/XKB/ch19.xml
index 1b7c0bbe..37ed405a 100644
--- a/specs/XKB/ch19.xml
+++ b/specs/XKB/ch19.xml
@@ -117,7 +117,7 @@ In addition to filtering out-of-range key events, Xkb:
 <listitem>
   <para>
 Adjusts core protocol
-<emphasis>MappingNotify</emphasis>
+<symbol>MappingNotify</symbol>
  events to refer only to keys that match the stored legal range.
   </para>
 </listitem>
@@ -167,7 +167,7 @@ The structure for the
 typedef struct _XkbNewKeyboardNotify {
       int            type;         /* Xkb extension base event code */
       unsigned long  serial;       /* X server serial number for event*/
-      Bool           send_event;   /* <emphasis>True</emphasis>
+      Bool           send_event;   /* <symbol>True</symbol>
                                       =&gt; synthetically generated */
       Display *      display;      /* server connection where event generated */
       Time           time;         /* server time when event generated */
diff --git a/specs/XKB/ch20.xml b/specs/XKB/ch20.xml
index 3dbc8b8e..d4a3e39a 100644
--- a/specs/XKB/ch20.xml
+++ b/specs/XKB/ch20.xml
@@ -623,7 +623,7 @@ one, use
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; load into <parameter>device_spec</parameter>
+        <symbol>True</symbol> =&gt; load into <parameter>device_spec</parameter>
       </para>
     </listitem>
   </varlistentry>
@@ -811,7 +811,7 @@ If a required component has not been specified in the
 In addition, if
 <emphasis>load</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the server modifies
 <emphasis>names</emphasis>
  if necessary (again using a "
@@ -927,11 +927,11 @@ these components,
 If
 <emphasis>load</emphasis>
  is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the server updates its keyboard description for
 <emphasis>device_spec</emphasis>
  to match the result of the keyboard description just built. If load is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the server’s description for device
 <emphasis>device_spec</emphasis>
  is not updated. In all cases, the parts specified by
@@ -1088,7 +1088,7 @@ is synchronous; it sends the request to the server to build a new keyboard
 description and waits for the reply. If successful, the return value is
 non-<emphasis>NULL</emphasis>.
 <function>XkbGetKeyboardByName</function>
-generates a <emphasis>BadMatch</emphasis>
+generates a <errorname>BadMatch</errorname>
 protocol error if errors are encountered when building the keyboard
 description.
 </para>
@@ -1167,7 +1167,7 @@ keyboard device. It calls
 <emphasis>NULL</emphasis>,
 <emphasis>which</emphasis>,
 <emphasis>which</emphasis>,
-<emphasis>False</emphasis>
+<symbol>False</symbol>
 ).
 </para>
 
diff --git a/specs/XKB/ch21.xml b/specs/XKB/ch21.xml
index 9904da07..302ab21b 100644
--- a/specs/XKB/ch21.xml
+++ b/specs/XKB/ch21.xml
@@ -167,7 +167,7 @@ typedef struct {
       char *          name;          /* name for device */
       Atom            type;          /* name for class of devices */
       unsigned short  device_spec;   /* device of interest */
-      Bool            has_own_state; /* <emphasis> True</emphasis> =&gt;this
+      Bool            has_own_state; /* <symbol>True</symbol> =&gt;this
                                         device has its own state */
       unsigned short  supported;     /* bits indicating supported capabilities */
       unsigned short  unsupported;   /* bits indicating unsupported capabilities */
@@ -206,11 +206,11 @@ The
 ), it has its own state, and
 <emphasis>has_own_state</emphasis>
  is
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 If
 <emphasis>has_own_state</emphasis>
  is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the state of the core keyboard is used. The
 <emphasis>supported</emphasis>
  and
@@ -654,7 +654,7 @@ XkbGetDeviceButtonActions.
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; get information for all buttons
+        <symbol>True</symbol> =&gt; get information for all buttons
       </para>
     </listitem>
   </varlistentry>
@@ -700,7 +700,7 @@ by the
 and
 <emphasis>unsupported</emphasis>
  fields, and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 </para>
 
 
@@ -712,11 +712,11 @@ and
  specify the device buttons for which actions should be returned. Setting
 <emphasis>all_buttons</emphasis>
  to
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  requests actions for all device buttons; if
 <emphasis>all_buttons</emphasis>
  is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 <emphasis>first_button</emphasis>
  and
 <emphasis>num_buttons</emphasis>
@@ -727,9 +727,9 @@ and
 <para>
 If a compatible version of Xkb is not available in the server or the Xkb
 extension has not been properly initialized, XkbGetDeviceButtonActions returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If allocation errors occur, a
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  status is returned. If the specified device (
 <emphasis>device_info</emphasis>
 -&gt;
@@ -839,7 +839,7 @@ by
  as determined by
 <emphasis>which</emphasis>
  with the results and returns
-<emphasis>Success</emphasis>.
+<symbol>Success</symbol>.
 Valid values for
 <emphasis>which</emphasis>
  are the inclusive OR of any of
@@ -928,7 +928,7 @@ If a compatible version of Xkb is not available in the server or the Xkb
 extension has not been properly initialized,
 <function>XkbGetDeviceLedInfo</function>
  returns
-<emphasis>BadAccess</emphasis>.
+<errorname>BadAccess</errorname>.
 If allocation errors occur, a BadAlloc status is returned. If the device has
 no indicators, a BadMatch error is returned. If
 <emphasis>ledClass</emphasis>
@@ -1241,7 +1241,7 @@ To allocate additional space for button actions in an
 <emphasis>NULL</emphasis>.
 If device_info is invalid or new_total is greater than 255, BadValue is
 returned. If a memory allocation failure occurs, a
-<emphasis>BadAlloc</emphasis>
+<errorname>BadAlloc</errorname>
  is returned.
 </para>
 
@@ -1291,7 +1291,7 @@ To free an
     </term>
     <listitem>
       <para>
-        <emphasis>True</emphasis> =&gt; free everything, including device_info
+        <symbol>True</symbol> =&gt; free everything, including device_info
       </para>
     </listitem>
   </varlistentry>
@@ -1299,7 +1299,7 @@ To free an
 
 <para>
 If free_all is
-<emphasis>True</emphasis>,
+<symbol>True</symbol>,
 the
 <function>XkbFreeDeviceInfo</function>
  frees all components of
@@ -1309,7 +1309,7 @@ the
  structure pointed to by
 <emphasis>device_info</emphasis>
  itself. If free_all is
-<emphasis>False</emphasis>,
+<symbol>False</symbol>,
 the value of which determines which subcomponents are freed.
 <emphasis>which </emphasis>
 is an inclusive OR of one or more of the values from Table 21.1. If which
@@ -1477,11 +1477,11 @@ set in
  (see Table 21.1).
 <function>XkbSetDeviceInfo</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if the request was successfully sent to the server. If the X server
 implementation does not allow interaction between the X input extension and the
 Xkb Extension, the function does nothing and returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 </para>
 
 
@@ -1508,7 +1508,7 @@ If the device specified in
  does not contain buttons and a request affecting buttons is made, or the
 device does not contain indicators and a request affecting indicators is made,
 a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  protocol error results.
 </para>
 
@@ -1531,9 +1531,9 @@ s specified in
 If the number of buttons requested to be updated is not valid for the device,
 <function>XkbSetDeviceInfo</function>
  returns
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  and a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error results.
 </para>
 
@@ -1579,14 +1579,14 @@ the indicator maps and / or names for all
 <emphasis>led_id</emphasis>
  specify the input extension class and device ID for each indicator device to
 modify; if they have invalid values, a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error results and
 <function>XkbSetDeviceInfo</function>
  returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 If they have legal values but do not specify a keyboard or indicator class
 feedback for the device in question, a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  error results. If any of the values in
 <emphasis>device_info</emphasis>
 -&gt;
@@ -1594,9 +1594,9 @@ feedback for the device in question, a
 <emphasis>-&gt;</emphasis>
 <emphasis>names</emphasis>
  are not a valid Atom or
-<emphasis>None</emphasis>,
+<symbol>None</symbol>,
 a
-<emphasis>BadAtom</emphasis>
+<errorname>BadAtom</errorname>
  protocol error results.
 </para>
 
@@ -1694,7 +1694,7 @@ If the server does not support assignment of Xkb actions to extension device
 buttons,
 <function>XkbSetDeviceButtonActions</function>
  has no effect and returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 If the device has no buttons or if
 <emphasis>first_button</emphasis>
  or
@@ -1704,18 +1704,18 @@ If the device has no buttons or if
 -&gt;
 <emphasis>num_btns</emphasis>,
 the function has no effect and returns
-<emphasis>False</emphasis>.
+<symbol>False</symbol>.
 Otherwise,
 <function>XkbSetDeviceButtonActions</function>
  sends a request to the server to change the actions for the specified buttons
 and returns
-<emphasis>True</emphasis>.
+<symbol>True</symbol>.
 </para>
 
 
 <para>
 If the actual request sent to the server involved illegal button numbers, a
-<emphasis>BadValue</emphasis>
+<errorname>BadValue</errorname>
  protocol error is generated. If an invalid device identifier is specified in
 device_info-&gt;
 <emphasis>device_spec</emphasis>,
@@ -1724,7 +1724,7 @@ a BadKeyboard protocol error results. If the actual device specified in
 -&gt;
 <emphasis>device_spec</emphasis>
  does not contain buttons and a request affecting buttons is made, a
-<emphasis>BadMatch</emphasis>
+<errorname>BadMatch</errorname>
  protocol error is generated.
 </para>
 
@@ -1799,7 +1799,7 @@ The structure for
 typedef struct {
       int      type;           /* Xkb extension base event code */
       unsigned long  serial;   /* X server serial number for event */
-      Bool     send_event;     /* <emphasis>True</emphasis>
+      Bool     send_event;     /* <symbol>True</symbol>
                                   =&gt; synthetically generated*/
       Display *      display;  /* server connection where event generated */
       Time     time;           /* server time when event generated */
diff --git a/specs/XKB/ch22.xml b/specs/XKB/ch22.xml
index 6b77a5c4..15c4822f 100644
--- a/specs/XKB/ch22.xml
+++ b/specs/XKB/ch22.xml
@@ -209,11 +209,11 @@ Xkb modifies its behavior according to each controls bit.
 <para>
 <function>XkbSetDebuggingFlags</function>
  returns
-<emphasis>True</emphasis>
+<symbol>True</symbol>
  if successful and
-<emphasis>False</emphasis>
+<symbol>False</symbol>
  otherwise. The only protocol error it may generate is
-<emphasis>BadAlloc</emphasis>,
+<errorname>BadAlloc</errorname>,
 if for some reason it is unable to allocate storage.
 </para>
 
diff --git a/specs/XKB/glossary.xml b/specs/XKB/glossary.xml
index 85c4e8fb..d8f0ec0a 100644
--- a/specs/XKB/glossary.xml
+++ b/specs/XKB/glossary.xml
@@ -209,14 +209,14 @@ An event created from the core X server.
     <para>
 Detectable auto-repeat allows a client to detect an auto-repeating key. If a
 client requests and the server supports detectable auto-repeat, Xkb generates
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events only when the key is physically released. Thus the client receives a
 number of
-<emphasis>KeyPress</emphasis>
+<symbol>KeyPress</symbol>
  events for that key without intervening
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  events until the key is finally released, when a
-<emphasis>KeyRelease</emphasis>
+<symbol>KeyRelease</symbol>
  event is received.
     </para>
   </glossdef>
@@ -740,13 +740,13 @@ to a keysym.
 A modifier is a logical condition that is either set or unset. The modifiers
 control the Shift Level selected when a key event occurs. Xkb supports the core
 protocol eight modifiers (
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
-<emphasis>Control</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
+<symbol>Control</symbol>,
 and
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
  through
-<emphasis>Mod5</emphasis>
+<symbol>Mod5</symbol>
 ), called the
 <emphasis>real</emphasis>
  modifiers. In addition, Xkb extends modifier flexibility by providing a set of
@@ -862,13 +862,13 @@ be logically depressed at one time.
   <glossdef>
     <para>
 Xkb supports the eight core protocol modifiers (
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
-<emphasis>Control</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
+<symbol>Control</symbol>,
 and
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
  through
-<emphasis>Mod5</emphasis>
+<symbol>Mod5</symbol>
 ); these are called the
 <emphasis>real</emphasis>
  modifiers, as opposed to the set of sixteen named virtual modifiers that can
@@ -957,13 +957,13 @@ slider, or a dial.
 Xkb provides a set of sixteen named virtual modifiers that can be bound to any
 set of the eight real modifiers. Each virtual modifier can be bound to any set
 of the real modifiers (
-<emphasis>Shift</emphasis>,
-<emphasis>Lock</emphasis>,
-<emphasis>Control</emphasis>,
+<symbol>Shift</symbol>,
+<symbol>Lock</symbol>,
+<symbol>Control</symbol>,
  and
-<emphasis>Mod1</emphasis>
+<symbol>Mod1</symbol>
 -
-<emphasis>Mod5</emphasis>
+<symbol>Mod5</symbol>
 ).
     </para>
   </glossdef>