specs/libX11: Tag WM_* as <property>

Mass substitution done by:
 perl -i -p -e 'if ($_ !~ m{^\<}) { $_ =~ s{(WM_\w+)}{<property>$1</property>}g; }' *.xml

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

4 files changed, 141 insertions, 141 deletions

diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index 576fd675..62fe628f 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -48,8 +48,8 @@ use
 This function has been superseded by
 <function>XSetWMProperties</function>
 and sets all or portions of the 
-WM_NAME, WM_ICON_NAME, WM_HINTS, WM_COMMAND, 
-and WM_NORMAL_HINTS properties.
+<property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_COMMAND</property>, 
+and <property>WM_NORMAL_HINTS</property> properties.
 <indexterm significance="preferred"><primary>XSetStandardProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -187,7 +187,7 @@ The functions discussed in this section use the flags and the
 <structname>XSizeHints</structname>
 structure, as defined in the
 &lt;<filename class="headerfile">X11/Xutil.h</filename>&gt;
-header file and use the WM_NORMAL_HINTS property.
+header file and use the <property>WM_NORMAL_HINTS</property> property.
 </para>
 <para>
 <!-- .LP -->
@@ -348,7 +348,7 @@ error.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-The next two functions set and read the WM_ZOOM_HINTS property.
+The next two functions set and read the <property>WM_ZOOM_HINTS</property> property.
 </para>
 <para>
 <!-- .LP -->
@@ -489,7 +489,7 @@ error.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set the value of any property of type WM_SIZE_HINTS, use
+To set the value of any property of type <property>WM_SIZE_HINTS</property>, use
 <function>XSetSizeHints</function>.
 This function has been superseded by
 <function>XSetWMSizeHints</function>.
@@ -560,7 +560,7 @@ This is used by
 <function>XSetNormalHints</function>
 and
 <function>XSetZoomHints</function>
-and can be used to set the value of any property of type WM_SIZE_HINTS.
+and can be used to set the value of any property of type <property>WM_SIZE_HINTS</property>.
 Thus, it may be useful if other properties of that type get defined.
 </para>
 <para>
@@ -576,7 +576,7 @@ errors.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To read the value of any property of type WM_SIZE_HINTS, use
+To read the value of any property of type <property>WM_SIZE_HINTS</property>, use
 <function>XGetSizeHints</function>.
 This function has been superseded by
 <function>XGetWMSizeHints</function>.
@@ -648,7 +648,7 @@ This is used by
 and
 <function>XGetZoomHints</function>.
 It also can be used to retrieve the value of any property of type
-WM_SIZE_HINTS.
+<property>WM_SIZE_HINTS</property>.
 Thus, it may be useful if other properties of that type get defined.
 <function>XGetSizeHints</function>
 returns a nonzero status if a size hint was defined
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index c617c551..d4f26f94 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -1001,55 +1001,55 @@ The built-in property names are:
     </row>
     <row>
       <entry>CUT_BUFFER1</entry>
-      <entry>WM_CLASS</entry>
+      <entry><property>WM_CLASS</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER2</entry>
-      <entry>WM_CLIENT_MACHINE</entry>
+      <entry><property>WM_CLIENT_MACHINE</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER3</entry>
-      <entry>WM_COLORMAP_WINDOWS</entry>
+      <entry><property>WM_COLORMAP_WINDOWS</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER4</entry>
-      <entry>WM_COMMAND</entry>
+      <entry><property>WM_COMMAND</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER5</entry>
-      <entry>WM_HINTS</entry>
+      <entry><property>WM_HINTS</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER6</entry>
-      <entry>WM_ICON_NAME</entry>
+      <entry><property>WM_ICON_NAME</property></entry>
     </row>
     <row>
       <entry>CUT_BUFFER7</entry>
-      <entry>WM_ICON_SIZE</entry>
+      <entry><property>WM_ICON_SIZE</property></entry>
     </row>
     <row>
       <entry>RGB_BEST_MAP</entry>
-      <entry>WM_NAME</entry>
+      <entry><property>WM_NAME</property></entry>
     </row>
     <row>
       <entry>RGB_BLUE_MAP</entry>
-      <entry>WM_NORMAL_HINTS</entry>
+      <entry><property>WM_NORMAL_HINTS</property></entry>
     </row>
     <row>
       <entry>RGB_DEFAULT_MAP</entry>
-      <entry>WM_PROTOCOLS</entry>
+      <entry><property>WM_PROTOCOLS</property></entry>
     </row>
     <row>
       <entry>RGB_GRAY_MAP</entry>
-      <entry>WM_STATE</entry>
+      <entry><property>WM_STATE</property></entry>
     </row>
     <row>
       <entry>RGB_GREEN_MAP</entry>
-      <entry>WM_TRANSIENT_FOR</entry>
+      <entry><property>WM_TRANSIENT_FOR</property></entry>
     </row>
     <row>
       <entry>RGB_RED_MAP</entry>
-      <entry>WM_ZOOM_HINTS</entry>
+      <entry><property>WM_ZOOM_HINTS</property></entry>
     </row>
   </tbody>
   </tgroup>
@@ -1095,11 +1095,11 @@ The built-in property types are:
     </row>
     <row>
       <entry>DRAWABLE</entry>
-      <entry>WM_HINTS</entry>
+      <entry><property>WM_HINTS</property></entry>
     </row>
     <row>
       <entry>FONT</entry>
-      <entry>WM_SIZE_HINTS</entry>
+      <entry><property>WM_SIZE_HINTS</property></entry>
     </row>
     <row>
       <entry>INTEGER</entry>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index a7d939f2..e89cbba4 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -40,7 +40,7 @@ managers are:
   </thead>
   <tbody>
     <row>
-      <entry>WM_CLASS</entry>
+      <entry><property>WM_CLASS</property></entry>
       <entry>STRING</entry>
       <entry>8</entry>
       <entry>Set by application programs to allow
@@ -50,7 +50,7 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_CLIENT_MACHINE</entry>
+      <entry><property>WM_CLIENT_MACHINE</property></entry>
       <entry>TEXT</entry>
       <entry></entry>
       <entry>The string name of the machine on
@@ -59,7 +59,7 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_COLORMAP_WINDOWS</entry>
+      <entry><property>WM_COLORMAP_WINDOWS</property></entry>
       <entry>WINDOWS</entry>
       <entry>32</entry>
       <entry>The list of window IDs that may
@@ -68,7 +68,7 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_COMMAND</entry>
+      <entry><property>WM_COMMAND</property></entry>
       <entry>TEXT</entry>
       <entry></entry>
       <entry>The command and arguments, null-
@@ -76,8 +76,8 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_HINTS</entry>
-      <entry>WM_HINTS</entry>
+      <entry><property>WM_HINTS</property></entry>
+      <entry><property>WM_HINTS</property></entry>
       <entry>32</entry>
       <entry>Additional hints set by the client for
       use by the window manager. The C
@@ -85,14 +85,14 @@ managers are:
       </entry> 
     </row>
     <row>
-      <entry>WM_ICON_NAME</entry>
+      <entry><property>WM_ICON_NAME</property></entry>
       <entry>TEXT</entry>
       <entry></entry>
       <entry>The name to be used in an icon.</entry>
     </row>
     <row>
-      <entry>WM_ICON_SIZE</entry>
-      <entry>WM_ICON_SIZE</entry>
+      <entry><property>WM_ICON_SIZE</property></entry>
+      <entry><property>WM_ICON_SIZE</property></entry>
       <entry>32</entry>
       <entry>The window manager may set this
       property on the root window to
@@ -102,14 +102,14 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_NAME</entry>
+      <entry><property>WM_NAME</property></entry>
       <entry>TEXT</entry>
       <entry></entry>
       <entry>The name of the application.</entry>
     </row>
     <row>
-      <entry>WM_NORMAL_HINTS</entry>
-      <entry>WM_NORMAL_HINTS</entry>
+      <entry><property>WM_NORMAL_HINTS</property></entry>
+      <entry><property>WM_NORMAL_HINTS</property></entry>
       <entry>32</entry>
       <entry>Size hints for a window in its
       normal state. The C type of this
@@ -117,7 +117,7 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_PROTOCOLS</entry>
+      <entry><property>WM_PROTOCOLS</property></entry>
       <entry>ATOM</entry>
       <entry>32</entry>
       <entry>List of atoms that identify the 
@@ -127,8 +127,8 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_STATE</entry>
-      <entry>WM_STATE</entry>
+      <entry><property>WM_STATE</property></entry>
+      <entry><property>WM_STATE</property></entry>
       <entry>32</entry>
       <entry>Intended for communication
       between window and session man-
@@ -136,7 +136,7 @@ managers are:
       </entry>
     </row>
     <row>
-      <entry>WM_TRANSIENT_FOR</entry>
+      <entry><property>WM_TRANSIENT_FOR</property></entry>
       <entry>WINDOW</entry>
       <entry>32</entry>
       <entry>Set by application programs to 
@@ -186,47 +186,47 @@ Set and read text properties
   </listitem>
   <listitem>
     <para>
-Set and read the WM_NAME property
+Set and read the <property>WM_NAME</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_ICON_NAME property
+Set and read the <property>WM_ICON_NAME</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_HINTS property
+Set and read the <property>WM_HINTS</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_NORMAL_HINTS property
+Set and read the <property>WM_NORMAL_HINTS</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_CLASS property
+Set and read the <property>WM_CLASS</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_TRANSIENT_FOR property
+Set and read the <property>WM_TRANSIENT_FOR</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_PROTOCOLS property
+Set and read the <property>WM_PROTOCOLS</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_COLORMAP_WINDOWS property
+Set and read the <property>WM_COLORMAP_WINDOWS</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_ICON_SIZE property
+Set and read the <property>WM_ICON_SIZE</property> property
     </para>
   </listitem>
   <listitem>
@@ -303,7 +303,7 @@ Specifies the appropriate screen number on the host server.
 <!-- .eM -->
 The 
 <function>XIconifyWindow</function>
-function sends a WM_CHANGE_STATE 
+function sends a <property>WM_CHANGE_STATE</property> 
 <symbol>ClientMessage</symbol>
 event with a format of 32 and a first data element of 
 <symbol>IconicState</symbol>
@@ -317,7 +317,7 @@ with an event mask set to
 Window managers may elect to receive this message and
 if the window is in its normal state, 
 may treat it as a request to change the window's state from normal to iconic.
-If the WM_CHANGE_STATE property cannot be interned, 
+If the <property>WM_CHANGE_STATE</property> property cannot be interned, 
 <function>XIconifyWindow</function>
 does not send a message and returns a zero status.
 It returns a nonzero status if the client message is sent successfully;
@@ -1173,7 +1173,7 @@ and the missing charset list allocated by
 Xlib provides two functions that you can use to set and read
 the text properties for a given window.
 You can use these functions to set and read those properties of type TEXT
-(WM_NAME, WM_ICON_NAME, WM_COMMAND, and WM_CLIENT_MACHINE).
+(<property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property>).
 In addition,
 Xlib provides separate convenience functions that you can use to set each 
 of these properties.
@@ -1382,12 +1382,12 @@ errors.
 <para>
 <!-- .LP -->
 Xlib provides convenience functions that you can use to set and read 
-the WM_NAME property for a given window.
+the <property>WM_NAME</property> property for a given window.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_NAME property with the supplied convenience function, use
+To set a window's <property>WM_NAME</property> property with the supplied convenience function, use
 <function>XSetWMName</function>.
 <indexterm significance="preferred"><primary>XSetWMName</primary></indexterm>
 <!-- .sM -->
@@ -1442,12 +1442,12 @@ The
 <function>XSetWMName</function>
 convenience function calls
 <function>XSetTextProperty</function>
-to set the WM_NAME property.
+to set the <property>WM_NAME</property> property.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_NAME property with the supplied convenience function, use
+To read a window's <property>WM_NAME</property> property with the supplied convenience function, use
 <function>XGetWMName</function>.
 <indexterm significance="preferred"><primary>XGetWMName</primary></indexterm>
 <!-- .sM -->
@@ -1502,7 +1502,7 @@ The
 <function>XGetWMName</function>
 convenience function calls
 <function>XGetTextProperty</function>
-to obtain the WM_NAME property.
+to obtain the <property>WM_NAME</property> property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
 </para>
@@ -1649,7 +1649,7 @@ If it succeeds,
 it returns a nonzero status; 
 otherwise, no name has been set for the window,
 and it returns zero.
-If the WM_NAME property has not been set for this window,
+If the <property>WM_NAME</property> property has not been set for this window,
 <function>XFetchName</function>
 sets window_name_return to NULL.
 If the data returned by the server is in the Latin Portable Character Encoding,
@@ -1675,12 +1675,12 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides convenience functions that you can use to set and read 
-the WM_ICON_NAME property for a given window.
+the <property>WM_ICON_NAME</property> property for a given window.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_ICON_NAME property,
+To set a window's <property>WM_ICON_NAME</property> property,
 use
 <function>XSetWMIconName</function>.
 <indexterm significance="preferred"><primary>XSetWMIconName</primary></indexterm>
@@ -1736,12 +1736,12 @@ The
 <function>XSetWMIconName</function>
 convenience function calls
 <function>XSetTextProperty</function>
-to set the WM_ICON_NAME property.
+to set the <property>WM_ICON_NAME</property> property.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_ICON_NAME property,
+To read a window's <property>WM_ICON_NAME</property> property,
 use
 <function>XGetWMIconName</function>.
 <indexterm significance="preferred"><primary>XGetWMIconName</primary></indexterm>
@@ -1797,7 +1797,7 @@ The
 <function>XGetWMIconName</function>
 convenience function calls
 <function>XGetTextProperty</function>
-to obtain the WM_ICON_NAME property.
+to obtain the <property>WM_ICON_NAME</property> property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
 </para>
@@ -1960,7 +1960,7 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read 
-the WM_HINTS property for a given window.
+the <property>WM_HINTS</property> property for a given window.
 These functions use the flags and the
 <structname>XWMHints</structname>
 structure, as defined in the
@@ -2113,7 +2113,7 @@ or the window to be withdrawn.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_HINTS property, use
+To set a window's <property>WM_HINTS</property> property, use
 <function>XSetWMHints</function>.
 <indexterm significance="preferred"><primary>XSetWMHints</primary></indexterm>
 <!-- .sM -->
@@ -2182,7 +2182,7 @@ errors.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To read a window's WM_HINTS property, use
+To read a window's <property>WM_HINTS</property> property, use
 <function>XGetWMHints</function>.
 <indexterm significance="preferred"><primary>XGetWMHints</primary></indexterm>
 <!-- .sM -->
@@ -2223,7 +2223,7 @@ Specifies the window.
 The
 <function>XGetWMHints</function>
 function reads the window manager hints and 
-returns NULL if no WM_HINTS property was set on the window 
+returns NULL if no <property>WM_HINTS</property> property was set on the window 
 or returns a pointer to an 
 <structname>XWMHints</structname>
 structure if it succeeds.
@@ -2247,7 +2247,7 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set or read 
-the WM_NORMAL_HINTS property for a given window.
+the <property>WM_NORMAL_HINTS</property> property for a given window.
 The functions use the flags and the
 <structname>XSizeHints</structname>
 structure, as defined in the
@@ -2376,7 +2376,7 @@ macro is highly discouraged.
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_NORMAL_HINTS property, use
+To set a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XSetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XSetWMNormalHints</primary></indexterm>
 <!-- .sM -->
@@ -2427,12 +2427,12 @@ Specifies the size hints for the window in its normal state.
 <!-- .eM -->
 The 
 <function>XSetWMNormalHints</function>
-function replaces the size hints for the WM_NORMAL_HINTS property 
+function replaces the size hints for the <property>WM_NORMAL_HINTS</property> property 
 on the specified window.
 If the property does not already exist,
 <function>XSetWMNormalHints</function>
-sets the size hints for the WM_NORMAL_HINTS property on the specified window.
-The property is stored with a type of WM_SIZE_HINTS and a format of 32.
+sets the size hints for the <property>WM_NORMAL_HINTS</property> property on the specified window.
+The property is stored with a type of <property>WM_SIZE_HINTS</property> and a format of 32.
 </para>
 <para>
 <!-- .LP -->
@@ -2446,7 +2446,7 @@ errors.
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_NORMAL_HINTS property, use
+To read a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XGetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XGetWMNormalHints</primary></indexterm>
 <!-- .sM -->
@@ -2508,9 +2508,9 @@ Returns the hints that were supplied by the user.
 <!-- .eM -->
 The 
 <function>XGetWMNormalHints</function>
-function returns the size hints stored in the WM_NORMAL_HINTS property 
+function returns the size hints stored in the <property>WM_NORMAL_HINTS</property> property 
 on the specified window.
-If the property is of type WM_SIZE_HINTS, is of format 32,
+If the property is of type <property>WM_SIZE_HINTS</property>, is of format 32,
 and is long enough to contain either an old (pre-<acronym>ICCCM</acronym>) 
 or new size hints structure, 
 <function>XGetWMNormalHints</function>
@@ -2557,7 +2557,7 @@ error.
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_SIZE_HINTS property, use
+To set a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XSetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XSetWMSizeHints</primary></indexterm>
 <!-- .sM -->
@@ -2627,7 +2627,7 @@ If the specified property does not already exist,
 <function>XSetWMSizeHints</function>
 sets the size hints for the specified property
 on the named window.
-The property is stored with a type of WM_SIZE_HINTS and a format of 32.
+The property is stored with a type of <property>WM_SIZE_HINTS</property> and a format of 32.
 To set a window's normal size hints, 
 you can use the 
 <function>XSetWMNormalHints</function>
@@ -2646,7 +2646,7 @@ errors.
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_SIZE_HINTS property, use
+To read a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XGetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XGetWMSizeHints</primary></indexterm>
 <!-- .sM -->
@@ -2723,7 +2723,7 @@ The
 <function>XGetWMSizeHints</function>
 function returns the size hints stored in the specified property 
 on the named window.
-If the property is of type WM_SIZE_HINTS, is of format 32, 
+If the property is of type <property>WM_SIZE_HINTS</property>, is of format 32, 
 and is long enough to contain either an old (pre-<acronym>ICCCM</acronym>) 
 or new size hints structure, 
 <function>XGetWMSizeHints</function>
@@ -2783,7 +2783,7 @@ errors.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and get 
-the WM_CLASS property for a given window.
+the <property>WM_CLASS</property> property for a given window.
 These functions use the
 <structname>XClassHint</structname>
 structure, which is defined in the
@@ -2847,19 +2847,19 @@ typedef struct {
 <!-- .eM -->
 The res_name member contains the application name, 
 and the res_class member contains the application class. 
-Note that the name set in this property may differ from the name set as WM_NAME.
-That is, WM_NAME specifies what should be displayed in the title bar and,
+Note that the name set in this property may differ from the name set as <property>WM_NAME</property>.
+That is, <property>WM_NAME</property> specifies what should be displayed in the title bar and,
 therefore, can contain temporal information (for example, the name of
 a file currently in an editor's buffer).
 On the other hand, 
-the name specified as part of WM_CLASS is the formal name of the application
+the name specified as part of <property>WM_CLASS</property> is the formal name of the application
 that should be used when retrieving the application's resources from the 
 resource database.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_CLASS property, use
+To set a window's <property>WM_CLASS</property> property, use
 <function>XSetClassHint</function>.
 <indexterm significance="preferred"><primary>XSetClassHint</primary></indexterm>
 <!-- .sM -->
@@ -2928,7 +2928,7 @@ errors.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To read a window's WM_CLASS property, use
+To read a window's <property>WM_CLASS</property> property, use
 <function>XGetClassHint</function>.
 <indexterm significance="preferred"><primary>XGetClassHint</primary></indexterm>
 <!-- .sM -->
@@ -3009,12 +3009,12 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read
-the WM_TRANSIENT_FOR property for a given window.
+the <property>WM_TRANSIENT_FOR</property> property for a given window.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_TRANSIENT_FOR property, use
+To set a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XSetTransientForHint</function>.
 <indexterm significance="preferred"><primary>XSetTransientForHint</primary></indexterm>
 <!-- .sM -->
@@ -3054,7 +3054,7 @@ Specifies the window.
     </term>
     <listitem>
       <para>
-Specifies the window that the WM_TRANSIENT_FOR property is to be set to.
+Specifies the window that the <property>WM_TRANSIENT_FOR</property> property is to be set to.
     </para>
   </listitem>
   </varlistentry>
@@ -3065,7 +3065,7 @@ Specifies the window that the WM_TRANSIENT_FOR property is to be set to.
 <!-- .eM -->
 The
 <function>XSetTransientForHint</function>
-function sets the WM_TRANSIENT_FOR property of the specified window to the 
+function sets the <property>WM_TRANSIENT_FOR</property> property of the specified window to the 
 specified prop_window.
 </para>
 <para>
@@ -3080,7 +3080,7 @@ errors.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To read a window's WM_TRANSIENT_FOR property, use
+To read a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XGetTransientForHint</function>.
 <indexterm significance="preferred"><primary>XGetTransientForHint</primary></indexterm>
 <!-- .sM -->
@@ -3120,7 +3120,7 @@ Specifies the window.
     </term>
     <listitem>
       <para>
-Returns the WM_TRANSIENT_FOR property of the specified window.
+Returns the <property>WM_TRANSIENT_FOR</property> property of the specified window.
     </para>
   </listitem>
   </varlistentry>
@@ -3131,7 +3131,7 @@ Returns the WM_TRANSIENT_FOR property of the specified window.
 <!-- .eM -->
 The
 <function>XGetTransientForHint</function>
-function returns the WM_TRANSIENT_FOR property for the specified window.
+function returns the <property>WM_TRANSIENT_FOR</property> property for the specified window.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
 </para>
@@ -3151,12 +3151,12 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read
-the WM_PROTOCOLS property for a given window.
+the <property>WM_PROTOCOLS</property> property for a given window.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_PROTOCOLS property, use
+To set a window's <property>WM_PROTOCOLS</property> property, use
 <function>XSetWMProtocols</function>.
 <indexterm significance="preferred"><primary>XSetWMProtocols</primary></indexterm>
 <!-- .sM -->
@@ -3219,14 +3219,14 @@ Specifies the number of (Cn.
 <!-- .eM -->
 The 
 <function>XSetWMProtocols</function>
-function replaces the WM_PROTOCOLS property on the specified window 
+function replaces the <property>WM_PROTOCOLS</property> property on the specified window 
 with the list of atoms specified by the protocols argument.
 If the property does not already exist,
 <function>XSetWMProtocols</function>
-sets the WM_PROTOCOLS property on the specified window
+sets the <property>WM_PROTOCOLS</property> property on the specified window
 to the list of atoms specified by the protocols argument.
 The property is stored with a type of ATOM and a format of 32.
-If it cannot intern the WM_PROTOCOLS atom, 
+If it cannot intern the <property>WM_PROTOCOLS</property> atom, 
 <function>XSetWMProtocols</function>
 returns a zero status.
 Otherwise, it returns a nonzero status.
@@ -3243,7 +3243,7 @@ errors.
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_PROTOCOLS property, use
+To read a window's <property>WM_PROTOCOLS</property> property, use
 <function>XGetWMProtocols</function>.
 <indexterm significance="preferred"><primary>XGetWMProtocols</primary></indexterm>
 <!-- .sM -->
@@ -3306,12 +3306,12 @@ Returns the number of (Cn.
 <!-- .eM -->
 The 
 <function>XGetWMProtocols</function>
-function returns the list of atoms stored in the WM_PROTOCOLS property 
+function returns the list of atoms stored in the <property>WM_PROTOCOLS</property> property 
 on the specified window.
 These atoms describe window manager protocols in which the owner 
 of this window is willing to participate.
 If the property exists, is of type ATOM, is of format 32, 
-and the atom WM_PROTOCOLS can be interned, 
+and the atom <property>WM_PROTOCOLS</property> can be interned, 
 <function>XGetWMProtocols</function>
 sets the protocols_return argument to a list of atoms, 
 sets the count_return argument to the number of elements in the list, 
@@ -3337,12 +3337,12 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read
-the WM_COLORMAP_WINDOWS property for a given window.
+the <property>WM_COLORMAP_WINDOWS</property> property for a given window.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_COLORMAP_WINDOWS property, use
+To set a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XSetWMColormapWindows</function>.
 <indexterm significance="preferred"><primary>XSetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
@@ -3405,14 +3405,14 @@ Specifies the number of (Cn.
 <!-- .eM -->
 The 
 <function>XSetWMColormapWindows</function>
-function replaces the WM_COLORMAP_WINDOWS property on the specified
+function replaces the <property>WM_COLORMAP_WINDOWS</property> property on the specified
 window with the list of windows specified by the colormap_windows argument.
 If the property does not already exist,
 <function>XSetWMColormapWindows</function>
-sets the WM_COLORMAP_WINDOWS property on the specified
+sets the <property>WM_COLORMAP_WINDOWS</property> property on the specified
 window to the list of windows specified by the colormap_windows argument.
 The property is stored with a type of WINDOW and a format of 32.
-If it cannot intern the WM_COLORMAP_WINDOWS atom,
+If it cannot intern the <property>WM_COLORMAP_WINDOWS</property> atom,
 <function>XSetWMColormapWindows</function>
 returns a zero status.
 Otherwise, it returns a nonzero status.
@@ -3429,7 +3429,7 @@ errors.
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_COLORMAP_WINDOWS property, use
+To read a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XGetWMColormapWindows</function>.
 <indexterm significance="preferred"><primary>XGetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
@@ -3493,11 +3493,11 @@ Returns the number of (Cn.
 The 
 <function>XGetWMColormapWindows</function>
 function returns the list of window identifiers stored 
-in the WM_COLORMAP_WINDOWS property on the specified window.
+in the <property>WM_COLORMAP_WINDOWS</property> property on the specified window.
 These identifiers indicate the colormaps that the window manager
 may need to install for this window.
 If the property exists, is of type WINDOW, is of format 32, 
-and the atom WM_COLORMAP_WINDOWS can be interned, 
+and the atom <property>WM_COLORMAP_WINDOWS</property> can be interned, 
 <function>XGetWMColormapWindows</function>
 sets the windows_return argument to a list of window identifiers, 
 sets the count_return argument to the number of elements in the list, 
@@ -3523,7 +3523,7 @@ error.
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read 
-the WM_ICON_SIZE property for a given window.
+the <property>WM_ICON_SIZE</property> property for a given window.
 These functions use the 
 <structname>XIconSize</structname>
 <indexterm><primary>XIconSize</primary></indexterm>
@@ -3591,7 +3591,7 @@ sizes (minimum to maximum) that represent the supported icon sizes.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To set a window's WM_ICON_SIZE property, use
+To set a window's <property>WM_ICON_SIZE</property> property, use
 <function>XSetIconSizes</function>.
 <indexterm significance="preferred"><primary>XSetIconSizes</primary></indexterm>
 <!-- .sM -->
@@ -3667,7 +3667,7 @@ errors.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-To read a window's WM_ICON_SIZE property, use
+To read a window's <property>WM_ICON_SIZE</property> property, use
 <function>XGetIconSizes</function>.
 <indexterm significance="preferred"><primary>XGetIconSizes</primary></indexterm>
 <!-- .sM -->
@@ -3764,8 +3764,8 @@ function stores the standard set of window manager properties,
 with text properties in standard encodings
 for internationalized text communication.
 The standard window manager properties for a given window are
-WM_NAME, WM_ICON_NAME, WM_HINTS, WM_NORMAL_HINTS, WM_CLASS,
-WM_COMMAND, WM_CLIENT_MACHINE, and WM_LOCALE_NAME.
+<property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_NORMAL_HINTS</property>, <property>WM_CLASS</property>,
+<property>WM_COMMAND</property>, <property>WM_CLIENT_MACHINE</property>, and <property>WM_LOCALE_NAME</property>.
 <indexterm significance="preferred"><primary>XmbSetWMProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -3896,10 +3896,10 @@ for communicating with other clients
 <!-- .LP -->
 If the window_name argument is non-NULL,
 <function>XmbSetWMProperties</function>
-sets the WM_NAME property.
+sets the <property>WM_NAME</property> property.
 If the icon_name argument is non-NULL,
 <function>XmbSetWMProperties</function>
-sets the WM_ICON_NAME property.
+sets the <property>WM_ICON_NAME</property> property.
 The window_name and icon_name arguments are null-terminated strings
 in the encoding of the current locale.
 If the arguments can be fully converted to the STRING encoding,
@@ -3913,18 +3913,18 @@ If the normal_hints argument is non-NULL,
 <function>XmbSetWMProperties</function>
 calls
 <function>XSetWMNormalHints</function>,
-which sets the WM_NORMAL_HINTS property (see section 14.1.7).
+which sets the <property>WM_NORMAL_HINTS</property> property (see section 14.1.7).
 If the wm_hints argument is non-NULL, 
 <function>XmbSetWMProperties</function>
 calls
 <function>XSetWMHints</function>,
-which sets the WM_HINTS property (see section 14.1.6).
+which sets the <property>WM_HINTS</property> property (see section 14.1.6).
 </para>
 <para>
 <!-- .LP -->
 If the argv argument is non-NULL,
 <function>XmbSetWMProperties</function>
-sets the WM_COMMAND property from argv and argc.
+sets the <property>WM_COMMAND</property> property from argv and argc.
 An argc of zero indicates a zero-length command.
 </para>
 <para>
@@ -3937,7 +3937,7 @@ The hostname of the machine is stored using
 <!-- .LP -->
 If the class_hints argument is non-NULL,
 <function>XmbSetWMProperties</function>
-sets the WM_CLASS property.
+sets the <property>WM_CLASS</property> property.
 If the res_name member in the 
 <structname>XClassHint</structname>
 structure is set to the NULL pointer and the RESOURCE_NAME
@@ -3954,7 +3954,7 @@ It is assumed that the supplied class_hints.res_name and argv,
 the RESOURCE_NAME environment variable, and the hostname of the machine
 are in the encoding of the locale announced for the LC_CTYPE category
 (on <acronym>POSIX</acronym>-compliant systems, the LC_CTYPE, else LANG environment variable).
-The corresponding WM_CLASS, WM_COMMAND, and WM_CLIENT_MACHINE properties
+The corresponding <property>WM_CLASS</property>, <property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property> properties
 are typed according to the local host locale announcer.
 No encoding conversion is performed prior to storage in the properties.
 </para>
@@ -3962,7 +3962,7 @@ No encoding conversion is performed prior to storage in the properties.
 <!-- .LP -->
 For clients that need to process the property text in a locale,
 <function>XmbSetWMProperties</function>
-sets the WM_LOCALE_NAME property to be the name of the current locale.
+sets the <property>WM_LOCALE_NAME</property> property to be the name of the current locale.
 The name is assumed to be in the Host Portable Character Encoding
 and is converted to STRING for storage in the property.
 </para>
@@ -3982,8 +3982,8 @@ To set a window's standard window manager properties
 with strings in client-specified encodings, use
 <function>XSetWMProperties</function>.
 The standard window manager properties for a given window are
-WM_NAME, WM_ICON_NAME, WM_HINTS, WM_NORMAL_HINTS, WM_CLASS,
-WM_COMMAND, and WM_CLIENT_MACHINE.
+<property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_NORMAL_HINTS</property>, <property>WM_CLASS</property>,
+<property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property>.
 <indexterm significance="preferred"><primary>XSetWMProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -4116,17 +4116,17 @@ If the window_name argument is non-NULL,
 <function>XSetWMProperties</function>
 calls
 <function>XSetWMName</function>,
-which, in turn, sets the WM_NAME property (see section 14.1.4).
+which, in turn, sets the <property>WM_NAME</property> property (see section 14.1.4).
 If the icon_name argument is non-NULL,
 <function>XSetWMProperties</function>
 calls
 <function>XSetWMIconName</function>,
-which sets the WM_ICON_NAME property (see section 14.1.5).
+which sets the <property>WM_ICON_NAME</property> property (see section 14.1.5).
 If the argv argument is non-NULL, 
 <function>XSetWMProperties</function>
 calls
 <function>XSetCommand</function>,
-which sets the WM_COMMAND property (see section 14.2.1).
+which sets the <property>WM_COMMAND</property> property (see section 14.2.1).
 Note that an argc of zero is allowed to indicate a zero-length command.
 Note also that the hostname of this machine is stored using
 <function>XSetWMClientMachine</function>
@@ -4138,12 +4138,12 @@ If the normal_hints argument is non-NULL,
 <function>XSetWMProperties</function>
 calls
 <function>XSetWMNormalHints</function>,
-which sets the WM_NORMAL_HINTS property (see section 14.1.7).
+which sets the <property>WM_NORMAL_HINTS</property> property (see section 14.1.7).
 If the wm_hints argument is non-NULL, 
 <function>XSetWMProperties</function>
 calls
 <function>XSetWMHints</function>,
-which sets the WM_HINTS property (see section 14.1.6).
+which sets the <property>WM_HINTS</property> property (see section 14.1.6).
 </para>
 <para>
 <!-- .LP -->
@@ -4151,7 +4151,7 @@ If the class_hints argument is non-NULL,
 <function>XSetWMProperties</function>
 calls
 <function>XSetClassHint</function>,
-which sets the WM_CLASS property (see section 14.1.8).
+which sets the <property>WM_CLASS</property> property (see section 14.1.8).
 If the res_name member in the
 <structname>XClassHint</structname>
 structure is set to the NULL pointer and the RESOURCE_NAME environment 
@@ -4186,12 +4186,12 @@ This section discusses how to:
 <itemizedlist>
   <listitem>
     <para>
-Set and read the WM_COMMAND property
+Set and read the <property>WM_COMMAND</property> property
     </para>
   </listitem>
   <listitem>
     <para>
-Set and read the WM_CLIENT_MACHINE property
+Set and read the <property>WM_CLIENT_MACHINE</property> property
     </para>
   </listitem>
 </itemizedlist>
@@ -4203,12 +4203,12 @@ Set and read the WM_CLIENT_MACHINE property
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read
-the WM_COMMAND property for a given window.
+the <property>WM_COMMAND</property> property for a given window.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_COMMAND property, use
+To set a window's <property>WM_COMMAND</property> property, use
 <function>XSetCommand</function>.
 <indexterm significance="preferred"><primary>XSetCommand</primary></indexterm>
 <!-- .sM -->
@@ -4288,7 +4288,7 @@ errors.
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_COMMAND property, use
+To read a window's <property>WM_COMMAND</property> property, use
 <function>XGetCommand</function>.
 <indexterm significance="preferred"><primary>XGetCommand</primary></indexterm>
 <!-- .sM -->
@@ -4350,9 +4350,9 @@ Returns the number of arguments returned.
 <!-- .eM -->
 The 
 <function>XGetCommand</function>
-function reads the WM_COMMAND property from the specified window 
+function reads the <property>WM_COMMAND</property> property from the specified window 
 and returns a string list.
-If the WM_COMMAND property exists, 
+If the <property>WM_COMMAND</property> property exists, 
 it is of type STRING and format 8.
 If sufficient memory can be allocated to contain the string list, 
 <function>XGetCommand</function>
@@ -4374,12 +4374,12 @@ To free the memory allocated to the string list, use
 <para>
 <!-- .LP -->
 Xlib provides functions that you can use to set and read 
-the WM_CLIENT_MACHINE property for a given window.
+the <property>WM_CLIENT_MACHINE</property> property for a given window.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To set a window's WM_CLIENT_MACHINE property, use
+To set a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XSetWMClientMachine</function>.
 <indexterm significance="preferred"><primary>XSetWMClientMachine</primary></indexterm>
 <!-- .sM -->
@@ -4434,12 +4434,12 @@ The
 <function>XSetWMClientMachine</function>
 convenience function calls
 <function>XSetTextProperty</function>
-to set the WM_CLIENT_MACHINE property.
+to set the <property>WM_CLIENT_MACHINE</property> property.
 <!-- .sp -->
 </para>
 <para>
 <!-- .LP -->
-To read a window's WM_CLIENT_MACHINE property, use
+To read a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XGetWMClientMachine</function>.
 <indexterm significance="preferred"><primary>XGetWMClientMachine</primary></indexterm>
 <!-- .sM -->
@@ -4494,7 +4494,7 @@ The
 <function>XGetWMClientMachine</function>
 convenience function performs an 
 <function>XGetTextProperty</function>
-on the WM_CLIENT_MACHINE property.
+on the <property>WM_CLIENT_MACHINE</property> property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
 </para>
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index 8c91f901..813e635e 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -1196,7 +1196,7 @@ The
 function combines any geometry information (given in the format used by 
 <function>XParseGeometry</function>)
 specified by the user and by the calling program with size hints 
-(usually the ones to be stored in WM_NORMAL_HINTS) and returns the position, 
+(usually the ones to be stored in <property>WM_NORMAL_HINTS</property>) and returns the position, 
 size, and gravity
 (<symbol>NorthWestGravity</symbol>,
 <symbol>NorthEastGravity</symbol>,