libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013

libxcb/xcb-proto commit e5f7c750815cb5170db363a2e5b09639b7354733
xkeyboard-config commit 30d804538462213ed01e8efc0b44a8e5a0aff990
libX11           commit 9dfb0f3c0a761590bcdc1f3396b1e064da4e18e8
pixman           commit 279bdcda7ec3af8ac06312f4514b1b082a279544
mkfontscale      commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c
libXmu           commit e46ecb4e02b7f919b11efa79448d4db71d1deb69
mesa             commit eb2021507556633cd6ba64cda26653e3c43e80df

17 files changed, 239 insertions, 384 deletions

diff --git a/libX11/man/XGetXCBConnection.man b/libX11/man/XGetXCBConnection.man
index 3b4ad11f7..7488b6ee7 100644
--- a/libX11/man/XGetXCBConnection.man
+++ b/libX11/man/XGetXCBConnection.man
@@ -30,7 +30,6 @@ xcb_connection_t *XGetXCBConnection(Display *\fIdpy\fP);
 .SH ARGUMENTS
 .IP \fIdpy\fP 1i
 Specifies the connection to the X server.
-.IN "Environment" "DISPLAY"
 .SH DESCRIPTION
 The \fIXGetXCBConnection\fP function returns the XCB connection associated with
 an Xlib Display.  Clients can use this XCB connection with functions from the
diff --git a/libX11/man/XSetEventQueueOwner.man b/libX11/man/XSetEventQueueOwner.man
index d9740d4c6..f49ac7149 100644
--- a/libX11/man/XSetEventQueueOwner.man
+++ b/libX11/man/XSetEventQueueOwner.man
@@ -42,7 +42,6 @@ call the XCB event-handling functions.
 XCB owns the event queue.  Use the XCB event-handling functions.  Do not call
 the Xlib event-handling functions.
 .RE
-.IN "Environment" "DISPLAY"
 .SH DESCRIPTION
 While a client using Xlib/XCB can issue requests and handle their replies or
 errors with either Xlib or XCB, only one can own and handle the event queue.
diff --git a/libX11/specs/libX11/CH02.xml b/libX11/specs/libX11/CH02.xml
index 12df68ee4..656dce8b1 100644
--- a/libX11/specs/libX11/CH02.xml
+++ b/libX11/specs/libX11/CH02.xml
@@ -608,7 +608,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the appropriate screen number on the host server.
-<!-- .ds Cn depths -->
       </para>
     </listitem>
   </varlistentry>
@@ -618,7 +617,7 @@ Specifies the appropriate screen number on the host server.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of depths.
     </para>
   </listitem>
   </varlistentry>
@@ -1511,12 +1510,9 @@ To obtain the pixmap format information for a given display, use
 <indexterm significance="preferred"><primary>XListPixmapFormats</primary></indexterm>
 <!-- .sM -->
 </para>
-<para>
-ImageByteOrder(<emphasis remap='I'>display</emphasis>)
-</para>
-<funcsynopsis id='XImageByteOrder'>
+<funcsynopsis id='XListPixmapFormats'>
 <funcprototype>
-  <funcdef>int <function>XImageByteOrder</function></funcdef>
+  <funcdef>XPixmapFormatValues *<function>XListPixmapFormats</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *count_return</parameter></paramdef>
 </funcprototype>
@@ -1530,7 +1526,6 @@ ImageByteOrder(<emphasis remap='I'>display</emphasis>)
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Cn pixmap formats that are supported by the display -->
       </para>
     </listitem>
   </varlistentry>
@@ -1540,7 +1535,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of pixmap formats that are supported by the display.
     </para>
   </listitem>
   </varlistentry>
@@ -1577,7 +1572,7 @@ These are often used by toolkits as well as by simple applications.
 <para>
 ImageByteOrder(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='XImageByteOrder'>
 <funcprototype>
   <funcdef>int <function>XImageByteOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3466,7 +3461,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Returns the file descriptors.
-<!-- .ds Cn file descriptors -->
       </para>
     </listitem>
   </varlistentry>
@@ -3476,7 +3470,7 @@ Returns the file descriptors.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of file descriptors.
     </para>
   </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml
index 7d2b20e52..4e599da3b 100644
--- a/libX11/specs/libX11/CH03.xml
+++ b/libX11/specs/libX11/CH03.xml
@@ -1285,8 +1285,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the parent window.
-<!-- .ds Xy , which are the top-left outside corner of the created window's \ -->
-borders and are relative to the inside of the parent window's borders
       </para>
     </listitem>
   </varlistentry>
@@ -1307,9 +1305,9 @@ borders and are relative to the inside of the parent window's borders
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the created window's inside dimensions \ -->
-and do not include the created window's borders
+Specify the x and y coordinates, which are the top-left outside corner of
+the created window's borders and are relative to the inside of the parent
+window's borders.
       </para>
     </listitem>
   </varlistentry>
@@ -1330,7 +1328,8 @@ and do not include the created window's borders
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the created window's inside
+dimensions and do not include the created window's borders.
 The dimensions must be nonzero,
 or a
 <errorname>BadValue</errorname>
@@ -1547,8 +1546,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the parent window.
-<!-- .ds Xy , which are the top-left outside corner of the new window's borders \ -->
-and are relative to the inside of the parent window's borders
       </para>
     </listitem>
   </varlistentry>
@@ -1569,9 +1566,9 @@ and are relative to the inside of the parent window's borders
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the created window's inside dimensions \ -->
-and do not include the created window's borders
+Specify the x and y coordinates, which are the top-left outside corner of
+the new window's borders and are relative to the inside of the parent
+window's borders.
       </para>
     </listitem>
   </varlistentry>
@@ -1592,7 +1589,8 @@ and do not include the created window's borders
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the created window's inside
+dimensions and do not include the created window's borders.
 The dimensions must be nonzero,
 or a
 <errorname>BadValue</errorname>
@@ -2550,7 +2548,6 @@ To configure a window's size, location, stacking, or border, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi to be reconfigured -->
       </para>
     </listitem>
   </varlistentry>
@@ -2560,7 +2557,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window to be reconfigured.
       </para>
     </listitem>
   </varlistentry>
@@ -2655,7 +2652,6 @@ To move a window without changing its size, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi to be moved -->
       </para>
     </listitem>
   </varlistentry>
@@ -2665,9 +2661,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
-<!-- .ds Xy , which define the new location of the top-left pixel \ -->
-of the window's border or the window itself if it has no border
+Specifies the window to be moved.
       </para>
     </listitem>
   </varlistentry>
@@ -2688,7 +2682,9 @@ of the window's border or the window itself if it has no border
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which define the new location of the
+top-left pixel of the window's border or the window itself if it has no
+border.
     </para>
   </listitem>
   </varlistentry>
@@ -2767,8 +2763,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the window.
-<!-- .ds Wh , which are the interior dimensions of the window \ -->
-after the call completes
       </para>
     </listitem>
   </varlistentry>
@@ -2789,7 +2783,8 @@ after the call completes
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the interior dimensions of the
+window after the call completes.
     </para>
   </listitem>
   </varlistentry>
@@ -2861,7 +2856,6 @@ To change the size and location of a window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi to be reconfigured -->
       </para>
     </listitem>
   </varlistentry>
@@ -2871,8 +2865,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
-<!-- .ds Xy , which define the new position of the window relative to its parent -->
+Specifies the window to be reconfigured.
       </para>
     </listitem>
   </varlistentry>
@@ -2893,8 +2886,8 @@ Specifies the window (Wi.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which define the interior size of the window -->
+Specify the x and y coordinates, which define the new position of the
+window relative to its parent.
       </para>
     </listitem>
   </varlistentry>
@@ -2915,7 +2908,7 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which define the interior size of the window.
     </para>
   </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml
index 388a6801c..b8e73a469 100644
--- a/libX11/specs/libX11/CH04.xml
+++ b/libX11/specs/libX11/CH04.xml
@@ -61,8 +61,6 @@ a given window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose list of children, root, parent, and number of children \ -->
-you want to obtain
       </para>
     </listitem>
   </varlistentry>
@@ -72,7 +70,8 @@ you want to obtain
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose list of children, root, parent, and number of
+children you want to obtain.
       </para>
     </listitem>
   </varlistentry>
@@ -165,7 +164,6 @@ To obtain the current attributes of a given window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose current attributes you want to obtain -->
       </para>
     </listitem>
   </varlistentry>
@@ -175,7 +173,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose current attributes you want to obtain.
       </para>
     </listitem>
   </varlistentry>
@@ -394,7 +392,6 @@ To obtain the current geometry of a given drawable, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Dr , which can be a window or a pixmap -->
       </para>
     </listitem>
   </varlistentry>
@@ -404,7 +401,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the drawable(Dr. 
+Specifies the drawable, which can be a window or a pixmap.
       </para>
     </listitem>
   </varlistentry>
@@ -698,7 +695,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the window.
-<!-- .ds Ro that the pointer is in -->
       </para>
     </listitem>
   </varlistentry>
@@ -708,7 +704,7 @@ Specifies the window.
     </term>
     <listitem>
       <para>
-Returns the root window (Ro.
+Returns the root window that the pointer is in.
       </para>
     </listitem>
   </varlistentry>
@@ -1162,7 +1158,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the array of atom names.
-<!-- .ds Cn atom names in the array -->
       </para>
     </listitem>
   </varlistentry>
@@ -1172,7 +1167,7 @@ Specifies the array of atom names.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of atom names in the array.
       </para>
     </listitem>
   </varlistentry>
@@ -1321,7 +1316,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the array of atoms.
-<!-- .ds Cn atoms in the array -->
       </para>
     </listitem>
   </varlistentry>
@@ -1331,7 +1325,7 @@ Specifies the array of atoms.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of atoms in the array.
       </para>
     </listitem>
   </varlistentry>
@@ -1436,7 +1430,6 @@ To obtain the type, format, and value of a property of a given window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose property you want to obtain -->
       </para>
     </listitem>
   </varlistentry>
@@ -1446,7 +1439,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose property you want to obtain.
       </para>
     </listitem>
   </varlistentry>
@@ -1707,7 +1700,6 @@ To obtain a given window's property list, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose property list you want to obtain -->
       </para>
     </listitem>
   </varlistentry>
@@ -1717,7 +1709,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose property list you want to obtain.
       </para>
     </listitem>
   </varlistentry>
@@ -1784,7 +1776,6 @@ To change a property of a given window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose property you want to change -->
       </para>
     </listitem>
   </varlistentry>
@@ -1794,7 +1785,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose property you want to change.
       </para>
     </listitem>
   </varlistentry>
@@ -2093,7 +2084,6 @@ To delete a property on a given window, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose property you want to delete -->
       </para>
     </listitem>
   </varlistentry>
@@ -2103,7 +2093,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose property you want to delete.
       </para>
     </listitem>
   </varlistentry>
@@ -2338,7 +2328,6 @@ To return the selection owner, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Se whose owner you want returned -->
       </para>
     </listitem>
   </varlistentry>
@@ -2348,7 +2337,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the selection atom (Se.
+Specifies the selection atom whose owner you want returned.
     </para>
   </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH05.xml b/libX11/specs/libX11/CH05.xml
index 501ead0d9..c37eaddb8 100644
--- a/libX11/specs/libX11/CH05.xml
+++ b/libX11/specs/libX11/CH05.xml
@@ -53,7 +53,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies which screen the pixmap is created on. 
-<!-- .ds Wh , which define the dimensions of the pixmap -->
       </para>
     </listitem>
   </varlistentry>
@@ -74,7 +73,7 @@ Specifies which screen the pixmap is created on.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which define the dimensions of the pixmap.
       </para>
     </listitem>
   </varlistentry>
@@ -497,7 +496,6 @@ Specifies the <acronym>RGB</acronym> values for the foreground of the source.
     <listitem>
       <para>
 Specifies the <acronym>RGB</acronym> values for the background of the source.
-<!-- .ds Xy , which indicate the hotspot relative to the source's origin -->
       </para>
     </listitem>
   </varlistentry>
@@ -518,7 +516,8 @@ Specifies the <acronym>RGB</acronym> values for the background of the source.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which indicate the hotspot relative to the
+source's origin.
     </para>
   </listitem>
   </varlistentry>
@@ -600,7 +599,6 @@ To determine useful cursor sizes, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Dr , which indicates the screen -->
       </para>
     </listitem>
   </varlistentry>
@@ -610,8 +608,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the drawable(Dr. 
-<!-- .ds Wh \ of the cursor that you want the size information for -->
+Specifies the drawable, which indicates the screen.
       </para>
     </listitem>
   </varlistentry>
@@ -632,7 +629,8 @@ Specifies the drawable(Dr.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height of the cursor that you want the size
+information for.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml
index b84ce95cc..a82a5e231 100644
--- a/libX11/specs/libX11/CH06.xml
+++ b/libX11/specs/libX11/CH06.xml
@@ -832,7 +832,6 @@ To create a colormap for a screen, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi on whose screen you want to create a colormap -->
       </para>
     </listitem>
   </varlistentry>
@@ -842,7 +841,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window on whose screen you want to create a colormap.
       </para>
     </listitem>
   </varlistentry>
@@ -1056,7 +1055,6 @@ To destroy a colormap, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Cm that you want to destroy -->
       </para>
     </listitem>
   </varlistentry>
@@ -1066,7 +1064,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the colormap (Cm.
+Specifies the colormap that you want to destroy.
     </para>
   </listitem>
   </varlistentry>
@@ -1792,7 +1790,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the colormap.
-<!-- .ds St \ whose color definition structure is to be returned -->
       </para>
     </listitem>
   </varlistentry>
@@ -1802,7 +1799,8 @@ Specifies the colormap.
     </term>
     <listitem>
       <para>
-Specifies the color string(St.
+Specifies the color string whose color definition structure is to be
+returned.
       </para>
     </listitem>
   </varlistentry>
@@ -2296,7 +2294,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the colormap.
-<!-- .ds Pi that map to the cells in the specified colormap -->
       </para>
     </listitem>
   </varlistentry>
@@ -2306,7 +2303,8 @@ Specifies the colormap.
     </term>
     <listitem>
       <para>
-Specifies an array of pixel values (Pi. 
+Specifies an array of pixel values that map to the cells in the specified
+colormap.
       </para>
     </listitem>
   </varlistentry>
@@ -3811,7 +3809,6 @@ To set the Client White Point in the CCC, use
     <listitem>
       <para>
 Specifies the CCC.
-<!-- .ds Co new Client White Point -->
       </para>
     </listitem>
   </varlistentry>
@@ -3899,7 +3896,6 @@ a color specification to a device-dependent format and encounters a color
 that lies outside the screen's color gamut, 
 that function will return
 <symbol>XcmsFailure</symbol>.
-<!-- .ds Cd the gamut compression procedure -->
       </para>
     </listitem>
   </varlistentry>
@@ -3962,7 +3958,6 @@ Specifies the CCC.
     <listitem>
       <para>
 Specifies the white point adjustment procedure.
-<!-- .ds Cd the white point adjustment procedure -->
       </para>
     </listitem>
   </varlistentry>
@@ -5049,7 +5044,6 @@ are ignored.
     <listitem>
       <para>
 Specifies the target color specification format.
-<!-- .ds Cs zero-intensity red, green, and blue -->
       </para>
     </listitem>
   </varlistentry>
@@ -5060,7 +5054,7 @@ Specifies the target color specification format.
     <listitem>
       <para>
 Returns the color specification in the specified target format
-for (Cs.
+for zero-intensity red, green, and blue.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5115,7 +5109,6 @@ are ignored.
     <listitem>
       <para>
 Specifies the target color specification format.
-<!-- .ds Cs full-intensity blue while red and green are zero -->
       </para>
     </listitem>
   </varlistentry>
@@ -5126,7 +5119,7 @@ Specifies the target color specification format.
     <listitem>
       <para>
 Returns the color specification in the specified target format
-for (Cs.
+for full-intensity blue while red and green are zero.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5181,7 +5174,6 @@ are ignored.
     <listitem>
       <para>
 Specifies the target color specification format.
-<!-- .ds Cs full-intensity green while red and blue are zero -->
       </para>
     </listitem>
   </varlistentry>
@@ -5192,7 +5184,7 @@ Specifies the target color specification format.
     <listitem>
       <para>
 Returns the color specification in the specified target format
-for (Cs.
+for full-intensity green while red and blue are zero.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5247,7 +5239,6 @@ are ignored.
     <listitem>
       <para>
 Specifies the target color specification format.
-<!-- .ds Cs full-intensity red while green and blue are zero -->
       </para>
     </listitem>
   </varlistentry>
@@ -5258,7 +5249,7 @@ Specifies the target color specification format.
     <listitem>
       <para>
 Returns the color specification in the specified target format
-for (Cs.
+for full-intensity red while green and blue are zero.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5313,7 +5304,6 @@ are ignored.
     <listitem>
       <para>
 Specifies the target color specification format.
-<!-- .ds Cs full-intensity red, green, and blue -->
       </para>
     </listitem>
   </varlistentry>
@@ -5324,7 +5314,7 @@ Specifies the target color specification format.
     <listitem>
       <para>
 Returns the color specification in the specified target format
-for (Cs.
+for full-intensity red, green, and blue.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5392,7 +5382,6 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness (
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -5402,8 +5391,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ls maximum chroma -->
+Specifies the hue angle (in degrees) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5413,9 +5401,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the lightness (L*) at which to find (Ls.
-<!-- .ds Lc maximum chroma -->
-<!-- .ds lC hue angle and lightness -->
+Specifies the lightness (L*) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5425,8 +5411,8 @@ Specifies the lightness (L*) at which to find (Ls.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum chroma
+displayable by the screen for the given hue angle and lightness.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5476,7 +5462,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum lightness -->
       </para>
     </listitem>
   </varlistentry>
@@ -5486,8 +5471,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ch maximum lightness -->
+Specifies the hue angle (in degrees) at which to find maximum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5497,9 +5481,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the chroma at which to find (Ch.
-<!-- .ds Lc maximum lightness -->
-<!-- .ds lC hue angle and chroma -->
+Specifies the chroma at which to find maximum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5509,8 +5491,8 @@ Specifies the chroma at which to find (Ch.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum lightness
+displayable by the screen for the given hue angle and chroma.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5566,7 +5548,6 @@ for a given Psychometric Hue Angle, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -5576,9 +5557,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Lc maximum chroma -->
-<!-- .ds lC hue angle -->
+Specifies the hue angle (in degrees) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5588,8 +5567,8 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum chroma
+displayable by the screen for the given hue angle.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5639,7 +5618,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha minimum lightness -->
       </para>
     </listitem>
   </varlistentry>
@@ -5649,8 +5627,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ch minimum lightness -->
+Specifies the hue angle (in degrees) at which to find minimum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5660,9 +5637,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the chroma at which to find (Ch.
-<!-- .ds Lc minimum lightness -->
-<!-- .ds lC hue angle and chroma -->
+Specifies the chroma at which to find minimum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5672,8 +5647,8 @@ Specifies the chroma at which to find (Ch.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*a*b* coordinates of minimum lightness
+displayable by the screen for the given hue angle and chroma.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5749,7 +5724,6 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness (
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -5759,8 +5733,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ls maximum chroma -->
+Specifies the hue angle (in degrees) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5770,9 +5743,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the lightness (L*) at which to find (Ls.
-<!-- .ds Lc maximum chroma -->
-<!-- .ds lC hue angle and lightness -->
+Specifies the lightness (L*) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5782,8 +5753,8 @@ Specifies the lightness (L*) at which to find (Ls.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum chroma
+displayable by the screen for the given hue angle and lightness.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5833,7 +5804,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum lightness -->
       </para>
     </listitem>
   </varlistentry>
@@ -5843,8 +5813,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ls maximum lightness -->
+Specifies the hue angle (in degrees) at which to find maximum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5854,9 +5823,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the lightness (L*) at which to find (Ls.
-<!-- .ds Lc maximum lightness -->
-<!-- .ds lC hue angle and chroma -->
+Specifies the lightness (L*) at which to find maximum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -5866,8 +5833,8 @@ Specifies the lightness (L*) at which to find (Ls.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum lightness
+displayable by the screen for the given hue angle and chroma.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5923,7 +5890,6 @@ for a given Psychometric Hue Angle, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha maximum chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -5933,9 +5899,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Lc maximum chroma -->
-<!-- .ds lC hue angle -->
+Specifies the hue angle (in degrees) at which to find maximum chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -5945,8 +5909,8 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum chroma
+displayable by the screen for the given hue angle.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -5996,7 +5960,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Ha minimum lightness -->
       </para>
     </listitem>
   </varlistentry>
@@ -6006,8 +5969,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the hue angle (in degrees) at which to find (Ha.
-<!-- .ds Ch minimum lightness -->
+Specifies the hue angle (in degrees) at which to find minimum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -6017,9 +5979,7 @@ Specifies the hue angle (in degrees) at which to find (Ha.
     </term>
     <listitem>
       <para>
-Specifies the chroma at which to find (Ch.
-<!-- .ds Lc minimum lightness -->
-<!-- .ds lC hue angle and chroma -->
+Specifies the chroma at which to find minimum lightness.
       </para>
     </listitem>
   </varlistentry>
@@ -6029,8 +5989,8 @@ Specifies the chroma at which to find (Ch.
     </term>
     <listitem>
       <para>
-Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc
-displayable by the screen for the given (lC.
+Returns the <acronym>CIE</acronym> L*u*v* coordinates of minimum lightness
+displayable by the screen for the given hue angle and chroma.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -6087,7 +6047,6 @@ To obtain the maximum Chroma for a given Hue and Value, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Hu in which to find the maximum Chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -6097,8 +6056,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the Hue (Hu.
-<!-- .ds Va maximum Chroma -->
+Specifies the Hue in which to find the maximum Chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -6108,9 +6066,7 @@ Specifies the Hue (Hu.
     </term>
     <listitem>
       <para>
-Specifies the Value in which to find the (Va.
-<!-- .ds Lc maximum Chroma along with the actual Hue and Value  -->
-<!-- .ds lC maximum Chroma -->
+Specifies the Value in which to find the maximum Chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -6120,7 +6076,8 @@ Specifies the Value in which to find the (Va.
     </term>
     <listitem>
       <para>
-Returns the (Lc at which the (lC was found.
+Returns the maximum Chroma along with the actual Hue and Value	at which
+the maximum Chroma was found.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -6170,7 +6127,6 @@ To obtain the maximum Value for a given Hue and Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Hu in which to find the maximum Value -->
       </para>
     </listitem>
   </varlistentry>
@@ -6180,8 +6136,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the Hue (Hu.
-<!-- .ds Ch maximum Value -->
+Specifies the Hue in which to find the maximum Value.
       </para>
     </listitem>
   </varlistentry>
@@ -6191,9 +6146,7 @@ Specifies the Hue (Hu.
     </term>
     <listitem>
       <para>
-Specifies the chroma at which to find (Ch.
-<!-- .ds Lc maximum Value along with the Hue and Chroma -->
-<!-- .ds lC maximum Value -->
+Specifies the chroma at which to find maximum Value.
       </para>
     </listitem>
   </varlistentry>
@@ -6203,7 +6156,9 @@ Specifies the chroma at which to find (Ch.
     </term>
     <listitem>
       <para>
-Returns the (Lc at which the (lC was found.
+Returns the maximum Value along with the Hue and Chroma at which the
+maximum Value
+was found.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -6256,7 +6211,6 @@ for a specified Hue, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Hu in which to find the maximum Chroma -->
       </para>
     </listitem>
   </varlistentry>
@@ -6266,11 +6220,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the Hue (Hu.
-<!-- .ds Lc color specification in \ -->
-XcmsTekHVC for the maximum Chroma, the Value at which \
-that maximum Chroma is reached, and the actual Hue
-<!-- .ds lC maximum Chroma -->
+Specifies the Hue in which to find the maximum Chroma.
       </para>
     </listitem>
   </varlistentry>
@@ -6280,7 +6230,9 @@ that maximum Chroma is reached, and the actual Hue
     </term>
     <listitem>
       <para>
-Returns the (Lc at which the (lC was found.
+Returns the color specification in XcmsTekHVC for the maximum Chroma, the
+Value at which that maximum Chroma is reached, and the actual Hue at which
+the maximum Chroma was found.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
@@ -6335,7 +6287,6 @@ Chroma at which the maximum Values are reached, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Hu for maximum Chroma/Value samples -->
       </para>
     </listitem>
   </varlistentry>
@@ -6345,7 +6296,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the Hue (Hu.
+Specifies the Hue for maximum Chroma/Value samples.
       </para>
     </listitem>
   </varlistentry>
@@ -6416,7 +6367,6 @@ To obtain the minimum Value for a given Hue and Chroma, use
 Specifies the CCC.
 The CCC's Client White Point and white point adjustment procedures
 are ignored.
-<!-- .ds Hu in which to find the minimum Value -->
       </para>
     </listitem>
   </varlistentry>
@@ -6426,8 +6376,7 @@ are ignored.
     </term>
     <listitem>
       <para>
-Specifies the Hue (Hu.
-<!-- .ds Va minimum Value -->
+Specifies the Hue in which to find the minimum Value.
       </para>
     </listitem>
   </varlistentry>
@@ -6437,9 +6386,7 @@ Specifies the Hue (Hu.
     </term>
     <listitem>
       <para>
-Specifies the Value in which to find the (Va.
-<!-- .ds Lc minimum Value and the actual Hue and Chroma -->
-<!-- .ds lC minimum Value -->
+Specifies the Value in which to find the minimum Value.
       </para>
     </listitem>
   </varlistentry>
@@ -6449,7 +6396,9 @@ Specifies the Value in which to find the (Va.
     </term>
     <listitem>
       <para>
-Returns the (Lc at which the (lC was found.
+Returns the minimum Value and the actual Hue and Chroma at which the
+minimum Value
+was found.
 The white point associated with the returned
 color specification is the Screen White Point.
 The value returned in the pixel member is undefined.
diff --git a/libX11/specs/libX11/CH07.xml b/libX11/specs/libX11/CH07.xml
index b50dc8363..fc3f44d18 100644
--- a/libX11/specs/libX11/CH07.xml
+++ b/libX11/specs/libX11/CH07.xml
@@ -994,7 +994,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the drawable. 
-<!-- .ds Vm set using the information in the specified values structure -->
       </para>
     </listitem>
   </varlistentry>
@@ -1004,7 +1003,8 @@ Specifies the drawable.
     </term>
     <listitem>
       <para>
-Specifies which components in the GC are to be (Vm. 
+Specifies which components in the GC are to be set using the information in
+the specified values structure.
 This argument is the bitwise inclusive OR of zero or more of the valid
 GC component mask bits.
       </para>
@@ -1081,7 +1081,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the components of the source GC.
-<!-- .ds Vm copied to the destination GC -->
       </para>
     </listitem>
   </varlistentry>
@@ -1091,7 +1090,8 @@ Specifies the components of the source GC.
     </term>
     <listitem>
       <para>
-Specifies which components in the GC are to be (Vm. 
+Specifies which components in the GC are to be copied to the destination
+GC.
 This argument is the bitwise inclusive OR of zero or more of the valid
 GC component mask bits.
       </para>
@@ -1168,7 +1168,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Vm changed using information in the specified values structure -->
       </para>
     </listitem>
   </varlistentry>
@@ -1178,7 +1177,8 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specifies which components in the GC are to be (Vm. 
+Specifies which components in the GC are to be changed using information in
+the specified values structure.
 This argument is the bitwise inclusive OR of zero or more of the valid
 GC component mask bits.
       </para>
@@ -1264,7 +1264,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Vm returned in the values_return argument -->
       </para>
     </listitem>
   </varlistentry>
@@ -1274,7 +1273,8 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specifies which components in the GC are to be (Vm. 
+Specifies which components in the GC are to be returned in the
+values_return argument.
 This argument is the bitwise inclusive OR of zero or more of the valid
 GC component mask bits.
       </para>
@@ -1409,7 +1409,6 @@ resource ID for a given GC, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Gc for which you want the resource ID -->
 <variablelist>
   <varlistentry>
     <term>
@@ -1417,7 +1416,7 @@ resource ID for a given GC, use
     </term>
     <listitem>
       <para>
-Specifies the GC (Gc.
+Specifies the GC for which you want the resource ID.
     </para>
   </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH08.xml b/libX11/specs/libX11/CH08.xml
index e4afa37fa..fb76c84d8 100644
--- a/libX11/specs/libX11/CH08.xml
+++ b/libX11/specs/libX11/CH08.xml
@@ -73,8 +73,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the window.
-<!-- .ds Xy , which are relative to the origin of the window \ -->
-and specify the upper-left corner of the rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -95,8 +93,8 @@ and specify the upper-left corner of the rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the dimensions of the rectangle -->
+Specify the x and y coordinates, which are relative to the origin of the
+window and specify the upper-left corner of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -117,7 +115,7 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the dimensions of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -344,8 +342,6 @@ Specifies the GC.
 Specify the x and y coordinates, 
 which are relative to the origin of the source rectangle
 and specify its upper-left corner.
-<!-- .ds Wh , which are the dimensions of both the source \ -->
-and destination rectangles
       </para>
     </listitem>
   </varlistentry>
@@ -366,9 +362,8 @@ and destination rectangles
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
-<!-- .ds Dx , which are relative to the origin of the destination rectangle \ -->
-and specify its upper-left corner
+Specify the width and height, which are the dimensions of both the source
+and destination rectangles.
       </para>
     </listitem>
   </varlistentry>
@@ -389,7 +384,8 @@ and specify its upper-left corner
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Dx. 
+Specify the x and y coordinates, which are relative to the origin of the
+destination rectangle and specify its upper-left corner.
     </para>
   </listitem>
   </varlistentry>
@@ -540,7 +536,6 @@ Specifies the GC.
 Specify the x and y coordinates, 
 which are relative to the origin of the source rectangle
 and specify its upper-left corner.
-<!-- .ds Wh , which are the dimensions of both the source and destination rectangles -->
       </para>
     </listitem>
   </varlistentry>
@@ -561,9 +556,8 @@ and specify its upper-left corner.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
-<!-- .ds Dx , which are relative to the origin of the destination rectangle \ -->
-and specify its upper-left corner
+Specify the width and height, which are the dimensions of both the source
+and destination rectangles.
       </para>
     </listitem>
   </varlistentry>
@@ -584,7 +578,8 @@ and specify its upper-left corner
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Dx. 
+Specify the x and y coordinates, which are relative to the origin of the
+destination rectangle and specify its upper-left corner.
       </para>
     </listitem>
   </varlistentry>
@@ -1373,7 +1368,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which specify the upper-left corner of the rectangle -->
       </para>
     </listitem>
   </varlistentry>
@@ -1394,8 +1388,8 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which specify the dimensions of the rectangle -->
+Specify the x and y coordinates, which specify the upper-left corner of the
+rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -1416,7 +1410,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which specify the dimensions of the
+rectangle.
     </para>
   </listitem>
   </varlistentry>
@@ -1605,8 +1600,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the drawable \ -->
-and specify the upper-left corner of the bounding rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -1627,8 +1620,8 @@ and specify the upper-left corner of the bounding rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the major and minor axes of the arc -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and specify the upper-left corner of the bounding rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -1649,7 +1642,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the major and minor axes of the
+arc.
       </para>
     </listitem>
   </varlistentry>
@@ -1962,8 +1956,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the drawable \ -->
-and specify the upper-left corner of the rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -1984,8 +1976,8 @@ and specify the upper-left corner of the rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the dimensions of the rectangle to be filled -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and specify the upper-left corner of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -2006,7 +1998,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the dimensions of the rectangle to
+be filled.
     </para>
   </listitem>
   </varlistentry>
@@ -2394,8 +2387,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the drawable \ -->
-and specify the upper-left corner of the bounding rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -2416,8 +2407,8 @@ and specify the upper-left corner of the bounding rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which are the major and minor axes of the arc -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and specify the upper-left corner of the bounding rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -2438,7 +2429,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which are the major and minor axes of the
+arc.
       </para>
     </listitem>
   </varlistentry>
@@ -4523,8 +4515,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -4545,7 +4535,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -4619,8 +4610,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -4641,7 +4630,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -4780,8 +4770,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -4802,7 +4790,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -4876,8 +4865,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -4898,7 +4885,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -5020,8 +5008,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -5042,7 +5028,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -5116,8 +5103,6 @@ Specifies the drawable.
     <listitem>
       <para>
 Specifies the GC.
-<!-- .ds Xy , which are relative to the origin of the specified drawable \ -->
-and define the origin of the first character
       </para>
     </listitem>
   </varlistentry>
@@ -5138,7 +5123,8 @@ and define the origin of the first character
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which are relative to the origin of the
+specified drawable and define the origin of the first character.
       </para>
     </listitem>
   </varlistentry>
@@ -5456,8 +5442,6 @@ Specifies the offset in Y from the top edge of the image defined
 by the 
 <structname>XImage</structname>
 structure.
-<!-- .ds Dx , which are relative to the origin of the drawable \ -->
-and are the coordinates of the subimage
       </para>
     </listitem>
   </varlistentry>
@@ -5478,8 +5462,8 @@ and are the coordinates of the subimage
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Dx. 
-<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and are the coordinates of the subimage.
       </para>
     </listitem>
   </varlistentry>
@@ -5500,7 +5484,8 @@ Specify the x and y coordinates(Dx.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height of the subimage, which define the dimensions
+of the rectangle.
     </para>
   </listitem>
   </varlistentry>
@@ -5598,8 +5583,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the drawable. 
-<!-- .ds Xy , which are relative to the origin of the drawable \ -->
-and define the upper-left corner of the rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -5620,8 +5603,8 @@ and define the upper-left corner of the rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and define the upper-left corner of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -5642,7 +5625,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height of the subimage, which define the dimensions
+of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -5787,8 +5771,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Specifies the drawable. 
-<!-- .ds Xy , which are relative to the origin of the drawable \ -->
-and define the upper-left corner of the rectangle
       </para>
     </listitem>
   </varlistentry>
@@ -5809,8 +5791,8 @@ and define the upper-left corner of the rectangle
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle -->
+Specify the x and y coordinates, which are relative to the origin of the
+drawable and define the upper-left corner of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -5831,7 +5813,8 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height of the subimage, which define the dimensions
+of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -5867,9 +5850,6 @@ or
     <listitem>
       <para>
 Specifies the destination image.
-<!-- .ds Dx , which are relative to the origin of the destination rectangle, \ -->
-specify its upper-left corner, and determine where the subimage \
-is placed in the destination image
       </para>
     </listitem>
   </varlistentry>
@@ -5890,7 +5870,9 @@ is placed in the destination image
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Dx. 
+Specify the x and y coordinates, which are relative to the origin of the
+destination rectangle, specify its upper-left corner, and determine where
+the subimage is placed in the destination image.
     </para>
   </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH09.xml b/libX11/specs/libX11/CH09.xml
index 5636df149..d5d93d0a0 100644
--- a/libX11/specs/libX11/CH09.xml
+++ b/libX11/specs/libX11/CH09.xml
@@ -74,7 +74,6 @@ Specifies the window.
     <listitem>
       <para>
 Specifies the parent window.
-<!-- .ds Xy \ of the position in the new parent window -->
       </para>
     </listitem>
   </varlistentry>
@@ -95,7 +94,7 @@ Specifies the parent window.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates of the position in the new parent window.
     </para>
   </listitem>
   </varlistentry>
@@ -237,7 +236,6 @@ To add or remove a window from the client's save-set, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi that you want to add to or delete from the client's save-set -->
       </para>
     </listitem>
   </varlistentry>
@@ -247,7 +245,8 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window that you want to add to or delete from the client's
+save-set.
       </para>
     </listitem>
   </varlistentry>
@@ -311,7 +310,6 @@ To add a window to the client's save-set, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi that you want to add to the client's save-set -->
       </para>
     </listitem>
   </varlistentry>
@@ -321,7 +319,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window that you want to add to the client's save-set.
     </para>
   </listitem>
   </varlistentry>
@@ -370,7 +368,6 @@ To remove a window from the client's save-set, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi that you want to delete from the client's save-set -->
       </para>
     </listitem>
   </varlistentry>
@@ -380,7 +377,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window that you want to delete from the client's save-set.
     </para>
   </listitem>
   </varlistentry>
@@ -612,7 +609,6 @@ To obtain a list of the currently installed colormaps for a given screen, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi that determines the screen -->
       </para>
     </listitem>
   </varlistentry>
@@ -622,7 +618,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window that determines the screen.
       </para>
     </listitem>
   </varlistentry>
@@ -1549,7 +1545,6 @@ To add a single host, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Ho added -->
       </para>
     </listitem>
   </varlistentry>
@@ -1559,7 +1554,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the host that is to be (Ho.
+Specifies the host that is to be added.
     </para>
   </listitem>
   </varlistentry>
@@ -1608,7 +1603,6 @@ To add multiple hosts at one time, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Ho added -->
       </para>
     </listitem>
   </varlistentry>
@@ -1618,7 +1612,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies each host that is to be (Ho.
+Specifies each host that is to be added.
       </para>
     </listitem>
   </varlistentry>
@@ -1740,7 +1734,6 @@ To remove a single host, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Ho removed -->
       </para>
     </listitem>
   </varlistentry>
@@ -1750,7 +1743,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the host that is to be (Ho.
+Specifies the host that is to be removed.
     </para>
   </listitem>
   </varlistentry>
@@ -1803,7 +1796,6 @@ To remove multiple hosts at one time, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Ho removed -->
       </para>
     </listitem>
   </varlistentry>
@@ -1813,7 +1805,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies each host that is to be (Ho.
+Specifies each host that is to be removed.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH11.xml b/libX11/specs/libX11/CH11.xml
index 001e05d8f..2d0fa0fe6 100644
--- a/libX11/specs/libX11/CH11.xml
+++ b/libX11/specs/libX11/CH11.xml
@@ -63,7 +63,6 @@ Another way is to use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose events you are interested in -->
       </para>
     </listitem>
   </varlistentry>
@@ -73,7 +72,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose events you are interested in.
       </para>
     </listitem>
   </varlistentry>
@@ -926,7 +925,6 @@ To remove the next event that matches both a window and an event mask, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose events you are interested in -->
       </para>
     </listitem>
   </varlistentry>
@@ -936,7 +934,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose events you are interested in.
       </para>
     </listitem>
   </varlistentry>
@@ -1011,7 +1009,6 @@ indicating if the event was returned.
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Wi whose events you are interested in -->
       </para>
     </listitem>
   </varlistentry>
@@ -1021,7 +1018,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window whose events you are interested in.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml
index cc14fe649..43953e16b 100644
--- a/libX11/specs/libX11/CH12.xml
+++ b/libX11/specs/libX11/CH12.xml
@@ -605,7 +605,6 @@ To grab a pointer button, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Bu grabbed -->
       </para>
     </listitem>
   </varlistentry>
@@ -615,7 +614,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the pointer button that is to be (Bu or
+Specifies the pointer button that is to be grabbed or
 <symbol>AnyButton</symbol>.
       </para>
     </listitem>
@@ -844,7 +843,6 @@ To ungrab a pointer button, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Bu released -->
       </para>
     </listitem>
   </varlistentry>
@@ -854,7 +852,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the pointer button that is to be (Bu or
+Specifies the pointer button that is to be released or
 <symbol>AnyButton</symbol>.
       </para>
     </listitem>
@@ -3303,7 +3301,6 @@ To obtain the symbols for the specified KeyCodes, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Kc returned -->
       </para>
     </listitem>
   </varlistentry>
@@ -3313,7 +3310,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the first KeyCode that is to be (Kc.
+Specifies the first KeyCode that is to be returned.
       </para>
     </listitem>
   </varlistentry>
@@ -3429,7 +3426,6 @@ To change the keyboard mapping, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Kc changed -->
       </para>
     </listitem>
   </varlistentry>
@@ -3439,7 +3435,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the first KeyCode that is to be (Kc.
+Specifies the first KeyCode that is to be changed.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH13.xml b/libX11/specs/libX11/CH13.xml
index e710414c8..096d86097 100644
--- a/libX11/specs/libX11/CH13.xml
+++ b/libX11/specs/libX11/CH13.xml
@@ -862,7 +862,6 @@ To set output method attributes, use
     <listitem>
       <para>
 Specifies the output method.
-<!-- .ds Al \ to set <acronym>XOM</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -872,7 +871,8 @@ Specifies the output method.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to set <acronym>XOM</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -915,7 +915,6 @@ To query an output method, use
     <listitem>
       <para>
 Specifies the output method.
-<!-- .ds Al \ to get XOM values -->
       </para>
     </listitem>
   </varlistentry>
@@ -925,7 +924,7 @@ Specifies the output method.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to get XOM values.
     </para>
   </listitem>
   </varlistentry>
@@ -1337,7 +1336,6 @@ To create an output context, use
     <listitem>
       <para>
 Specifies the output method.
-<!-- .ds Al \ to set <acronym>XOC</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -1347,7 +1345,8 @@ Specifies the output method.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to set <acronym>XOC</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -1504,7 +1503,6 @@ To set <acronym>XOC</acronym> values, use
     <listitem>
       <para>
 Specifies the output context.
-<!-- .ds Al \ to set <acronym>XOC</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -1514,7 +1512,8 @@ Specifies the output context.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to set <acronym>XOC</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -1581,7 +1580,6 @@ To obtain <acronym>XOC</acronym> values, use
     <listitem>
       <para>
 Specifies the output context.
-<!-- .ds Al \ to get XOC values -->
       </para>
     </listitem>
   </varlistentry>
@@ -1591,7 +1589,7 @@ Specifies the output context.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to get XOC values.
     </para>
   </listitem>
   </varlistentry>
@@ -3170,7 +3168,6 @@ Specifies the number of bytes in the string argument.
     <listitem>
       <para>
 Specifies the number of characters in the string argument.
-<!-- .ds Ov dimensions -->
       </para>
     </listitem>
   </varlistentry>
@@ -3379,7 +3376,6 @@ The caller must pass in arrays of this size.
     <listitem>
       <para>
 Returns the number of characters in the string argument.
-<!-- .ds Ov extents of the entire string -->
       </para>
     </listitem>
   </varlistentry>
@@ -3626,7 +3622,7 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates of the position in the new parent window.
       </para>
     </listitem>
   </varlistentry>
@@ -3789,7 +3785,7 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates of the position in the new parent window.
       </para>
     </listitem>
   </varlistentry>
@@ -3935,7 +3931,7 @@ Specifies the GC.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates of the position in the new parent window.
       </para>
     </listitem>
   </varlistentry>
@@ -5328,7 +5324,6 @@ To set input method attributes, use
     <listitem>
       <para>
 Specifies the input method.
-<!-- .ds Al \ to set <acronym>XIM</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -5338,7 +5333,8 @@ Specifies the input method.
     </term>
     <listitem>
       <para>
-Specifies the variable-length argument list(Al.
+Specifies the variable-length argument list to set <acronym>XIM</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -5381,7 +5377,6 @@ To query an input method, use
     <listitem>
       <para>
 Specifies the input method.
-<!-- .ds Al \ to get XIM values -->
       </para>
     </listitem>
   </varlistentry>
@@ -5391,7 +5386,7 @@ Specifies the input method.
     </term>
     <listitem>
       <para>
-Specifies the variable length argument list(Al.
+Specifies the variable length argument list to get XIM values.
     </para>
   </listitem>
   </varlistentry>
@@ -6339,7 +6334,6 @@ To create an input context, use
     <listitem>
       <para>
 Specifies the input method.
-<!-- .ds Al \ to set <acronym>XIC</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -6349,7 +6343,8 @@ Specifies the input method.
     </term>
     <listitem>
       <para>
-Specifies the variable length argument list(Al.
+Specifies the variable length argument list to set <acronym>XIC</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -6675,7 +6670,6 @@ To set <acronym>XIC</acronym> values, use
     <listitem>
       <para>
 Specifies the input context.
-<!-- .ds Al \ to set <acronym>XIC</acronym> values -->
       </para>
     </listitem>
   </varlistentry>
@@ -6685,7 +6679,8 @@ Specifies the input context.
     </term>
     <listitem>
       <para>
-Specifies the variable length argument list(Al.
+Specifies the variable length argument list to set <acronym>XIC</acronym>
+values.
     </para>
   </listitem>
   </varlistentry>
@@ -6758,7 +6753,6 @@ To obtain <acronym>XIC</acronym> values, use
     <listitem>
       <para>
 Specifies the input context.
-<!-- .ds Al \ to get XIC values -->
       </para>
     </listitem>
   </varlistentry>
@@ -6768,7 +6762,7 @@ Specifies the input context.
     </term>
     <listitem>
       <para>
-Specifies the variable length argument list(Al.
+Specifies the variable length argument list to get XIC values.
     </para>
   </listitem>
   </varlistentry>
@@ -9881,7 +9875,6 @@ To filter an event, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Ev event to filter -->
 <variablelist>
   <varlistentry>
     <term>
@@ -9889,8 +9882,7 @@ To filter an event, use
     </term>
     <listitem>
       <para>
-Specifies the (Ev.
-<!-- .ds Wi for which the filter is to be applied -->
+Specifies the event to filter.
       </para>
     </listitem>
   </varlistentry>
@@ -9900,7 +9892,7 @@ Specifies the (Ev.
     </term>
     <listitem>
       <para>
-Specifies the window (Wi.
+Specifies the window for which the filter is to be applied.
     </para>
   </listitem>
   </varlistentry>
@@ -9989,7 +9981,6 @@ or
     <listitem>
       <para>
 Specifies the input context.
-<!-- .ds Ev key event to be used -->
       </para>
     </listitem>
   </varlistentry>
@@ -9999,7 +9990,7 @@ Specifies the input context.
     </term>
     <listitem>
       <para>
-Specifies the (Ev.
+Specifies the key event to be used.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml
index 6dc947a9c..d7bbf5e67 100644
--- a/libX11/specs/libX11/CH14.xml
+++ b/libX11/specs/libX11/CH14.xml
@@ -799,7 +799,6 @@ structure to be used.
     <listitem>
       <para>
 Returns a list of null-terminated character strings.
-<!-- .ds Cn strings -->
       </para>
     </listitem>
   </varlistentry>
@@ -809,7 +808,7 @@ Returns a list of null-terminated character strings.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of strings.
     </para>
   </listitem>
   </varlistentry>
@@ -1008,7 +1007,6 @@ structure, use
     <listitem>
       <para>
 Specifies a list of null-terminated character strings.
-<!-- .ds Cn strings -->
       </para>
     </listitem>
   </varlistentry>
@@ -1018,7 +1016,7 @@ Specifies a list of null-terminated character strings.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of strings.
       </para>
     </listitem>
   </varlistentry>
@@ -1095,7 +1093,6 @@ structure to be used.
     <listitem>
       <para>
 Returns a list of null-terminated character strings.
-<!-- .ds Cn strings -->
       </para>
     </listitem>
   </varlistentry>
@@ -1105,7 +1102,7 @@ Returns a list of null-terminated character strings.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of strings.
     </para>
   </listitem>
   </varlistentry>
@@ -3221,7 +3218,6 @@ Specifies the window.
     <listitem>
       <para>
 Specifies the list of protocols.
-<!-- .ds Cn protocols in the list -->
       </para>
     </listitem>
   </varlistentry>
@@ -3231,7 +3227,7 @@ Specifies the list of protocols.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of protocols in the list.
     </para>
   </listitem>
   </varlistentry>
@@ -3308,7 +3304,6 @@ Specifies the window.
     <listitem>
       <para>
 Returns the list of protocols.
-<!-- .ds Cn protocols in the list -->
       </para>
     </listitem>
   </varlistentry>
@@ -3318,7 +3313,7 @@ Returns the list of protocols.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of protocols in the list.
     </para>
   </listitem>
   </varlistentry>
@@ -3407,7 +3402,6 @@ Specifies the window.
     <listitem>
       <para>
 Specifies the list of windows.
-<!-- .ds Cn windows in the list -->
       </para>
     </listitem>
   </varlistentry>
@@ -3417,7 +3411,7 @@ Specifies the list of windows.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of windows in the list.
     </para>
   </listitem>
   </varlistentry>
@@ -3494,7 +3488,6 @@ Specifies the window.
     <listitem>
       <para>
 Returns the list of windows.
-<!-- .ds Cn windows in the list -->
       </para>
     </listitem>
   </varlistentry>
@@ -3504,7 +3497,7 @@ Returns the list of windows.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of windows in the list.
     </para>
   </listitem>
   </varlistentry>
@@ -4980,7 +4973,6 @@ Specifies the window.
 Specifies the
 <structname>XStandardColormap</structname>
 structure to be used.
-<!-- .ds Cn colormaps -->
       </para>
     </listitem>
   </varlistentry>
@@ -4990,7 +4982,7 @@ structure to be used.
     </term>
     <listitem>
       <para>
-Specifies the number of (Cn.
+Specifies the number of colormaps.
       </para>
     </listitem>
   </varlistentry>
@@ -5160,7 +5152,6 @@ Specifies the window.
 Returns the
 <structname>XStandardColormap</structname>
 structure.
-<!-- .ds Cn colormaps -->
       </para>
     </listitem>
   </varlistentry>
@@ -5170,7 +5161,7 @@ structure.
     </term>
     <listitem>
       <para>
-Returns the number of (Cn.
+Returns the number of colormaps.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH15.xml b/libX11/specs/libX11/CH15.xml
index f6c76a481..2180c6d6c 100644
--- a/libX11/specs/libX11/CH15.xml
+++ b/libX11/specs/libX11/CH15.xml
@@ -532,7 +532,6 @@ To convert a string with one or more components to a quark list, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Ql \ list -->
 <variablelist>
   <varlistentry>
     <term>
@@ -540,7 +539,7 @@ To convert a string with one or more components to a quark list, use
     </term>
     <listitem>
       <para>
-Specifies the string for which a quark(Ql is to be allocated.
+Specifies the string for which a quark list is to be allocated.
       </para>
     </listitem>
   </varlistentry>
@@ -608,7 +607,6 @@ and a quark list, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Ql \ list -->
 <variablelist>
   <varlistentry>
     <term>
@@ -616,7 +614,7 @@ and a quark list, use
     </term>
     <listitem>
       <para>
-Specifies the string for which a quark(Ql is to be allocated.
+Specifies the string for which a quark list is to be allocated.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/specs/libX11/CH16.xml b/libX11/specs/libX11/CH16.xml
index e70b79939..790cb0118 100644
--- a/libX11/specs/libX11/CH16.xml
+++ b/libX11/specs/libX11/CH16.xml
@@ -320,7 +320,6 @@ To obtain the uppercase and lowercase forms of a KeySym, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Fn converted -->
 <variablelist>
   <varlistentry>
     <term>
@@ -328,7 +327,7 @@ To obtain the uppercase and lowercase forms of a KeySym, use
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be converted.
       </para>
     </listitem>
   </varlistentry>
@@ -431,7 +430,6 @@ To convert a KeySym code to the name of the KeySym, use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<!-- .ds Fn converted -->
 <variablelist>
   <varlistentry>
     <term>
@@ -439,7 +437,7 @@ To convert a KeySym code to the name of the KeySym, use
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be converted.
     </para>
   </listitem>
   </varlistentry>
@@ -466,7 +464,6 @@ You can use KeySym macros to perform the following tests.
 </para>
 <para>IsCursorKey(<emphasis remap='I'>keysym</emphasis>)</para>
 <!-- .FN -->
-<!-- .ds Fn tested -->
 <variablelist>
   <varlistentry>
     <term>
@@ -493,7 +490,6 @@ if the specified KeySym is a cursor key.
 <!-- .sM -->
 <para>IsFunctionKey(<emphasis remap='I'>keysym</emphasis>)</para>
 <!-- .FN -->
-<!-- .ds Fn tested -->
 <variablelist>
   <varlistentry>
     <term>
@@ -520,7 +516,6 @@ if the specified KeySym is a function key.
 <!-- .sM -->
 <para>IsKeypadKey(<emphasis remap='I'>keysym</emphasis>)</para>
 <!-- .FN -->
-<!-- .ds Fn tested -->
 <variablelist>
   <varlistentry>
     <term>
@@ -528,7 +523,7 @@ if the specified KeySym is a function key.
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be tested.
     </para>
   </listitem>
   </varlistentry>
@@ -554,7 +549,7 @@ if the specified KeySym is a standard keypad key.
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be tested.
     </para>
   </listitem>
   </varlistentry>
@@ -574,7 +569,6 @@ if the specified KeySym is a vendor-private keypad key.
 <!-- .sM -->
 <para>IsMiscFunctionKey(<emphasis remap='I'>keysym</emphasis>)</para>
 <!-- .FN -->
-<!-- .ds Fn tested -->
 <variablelist>
   <varlistentry>
     <term>
@@ -582,7 +576,7 @@ if the specified KeySym is a vendor-private keypad key.
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be tested.
     </para>
   </listitem>
   </varlistentry>
@@ -815,7 +809,6 @@ use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Fn rebound -->
       </para>
     </listitem>
   </varlistentry>
@@ -825,7 +818,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the KeySym that is to be (Fn.
+Specifies the KeySym that is to be rebound.
       </para>
     </listitem>
   </varlistentry>
@@ -1480,7 +1473,6 @@ To move a region by a specified amount, use
     <listitem>
       <para>
 Specifies the region.
-<!-- .ds Dy move -->
       </para>
     </listitem>
   </varlistentry>
@@ -1502,7 +1494,7 @@ Specifies the region.
     <listitem>
       <para>
 Specify the x and y coordinates,
-which define the amount you want to (Dy the specified region.
+which define the amount you want to move the specified region.
     </para>
   </listitem>
   </varlistentry>
@@ -1532,7 +1524,6 @@ To reduce a region by a specified amount, use
     <listitem>
       <para>
 Specifies the region.
-<!-- .ds Dy shrink -->
       </para>
     </listitem>
   </varlistentry>
@@ -1554,7 +1545,7 @@ Specifies the region.
     <listitem>
       <para>
 Specify the x and y coordinates,
-which define the amount you want to (Dy the specified region.
+which define the amount you want to shrink the specified region.
     </para>
   </listitem>
   </varlistentry>
@@ -1996,7 +1987,6 @@ To determine if a specified point resides in a specified region, use
     <listitem>
       <para>
 Specifies the region.
-<!-- .ds Xy , which define the point -->
       </para>
     </listitem>
   </varlistentry>
@@ -2017,7 +2007,7 @@ Specifies the region.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
+Specify the x and y coordinates, which define the point.
     </para>
   </listitem>
   </varlistentry>
@@ -2056,7 +2046,6 @@ To determine if a specified rectangle is inside a region, use
     <listitem>
       <para>
 Specifies the region.
-<!-- .ds Xy , which define the coordinates of the upper-left corner of the rectangle -->
       </para>
     </listitem>
   </varlistentry>
@@ -2077,8 +2066,8 @@ Specifies the region.
     </term>
     <listitem>
       <para>
-Specify the x and y coordinates(Xy.
-<!-- .ds Wh , which define the rectangle -->
+Specify the x and y coordinates, which define the coordinates of the
+upper-left corner of the rectangle.
       </para>
     </listitem>
   </varlistentry>
@@ -2099,7 +2088,7 @@ Specify the x and y coordinates(Xy.
     </term>
     <listitem>
       <para>
-Specify the width and height(Wh.
+Specify the width and height, which define the rectangle.
     </para>
   </listitem>
   </varlistentry>
@@ -2255,7 +2244,6 @@ Specifies the bytes, which are not necessarily ASCII or null-terminated.
     <listitem>
       <para>
 Specifies the number of bytes to be stored.
-<!-- .ds Fn in which you want to store the bytes -->
       </para>
     </listitem>
   </varlistentry>
@@ -2265,7 +2253,7 @@ Specifies the number of bytes to be stored.
     </term>
     <listitem>
       <para>
-Specifies the buffer (Fn.
+Specifies the buffer in which you want to store the bytes.
     </para>
   </listitem>
   </varlistentry>
@@ -2371,7 +2359,6 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Returns the number of bytes in the buffer.
-<!-- .ds Fn from which you want the stored data returned -->
       </para>
     </listitem>
   </varlistentry>
@@ -2381,7 +2368,7 @@ Returns the number of bytes in the buffer.
     </term>
     <listitem>
       <para>
-Specifies the buffer (Fn.
+Specifies the buffer from which you want the stored data returned.
     </para>
   </listitem>
   </varlistentry>
@@ -3306,7 +3293,6 @@ To read a bitmap from a file and store it in a pixmap, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Dr \ that indicates the screen -->
       </para>
     </listitem>
   </varlistentry>
@@ -3316,7 +3302,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the drawable(Dr. 
+Specifies the drawable that indicates the screen.
       </para>
     </listitem>
   </varlistentry>
@@ -3685,7 +3671,6 @@ To create a pixmap and then store bitmap-format data into it, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Dr \ that indicates the screen -->
       </para>
     </listitem>
   </varlistentry>
@@ -3695,7 +3680,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the drawable(Dr. 
+Specifies the drawable that indicates the screen.
       </para>
     </listitem>
   </varlistentry>
@@ -3815,7 +3800,6 @@ in a program directly, as opposed to reading it in every time at run time, use
     <listitem>
       <para>
 Specifies the connection to the X server.
-<!-- .ds Dr \ that indicates the screen -->
       </para>
     </listitem>
   </varlistentry>
@@ -3825,7 +3809,7 @@ Specifies the connection to the X server.
     </term>
     <listitem>
       <para>
-Specifies the drawable(Dr. 
+Specifies the drawable that indicates the screen.
       </para>
     </listitem>
   </varlistentry>
diff --git a/libX11/src/xcms/cmsTrig.c b/libX11/src/xcms/cmsTrig.c
index a917b78db..fc65d9ba3 100644
--- a/libX11/src/xcms/cmsTrig.c
+++ b/libX11/src/xcms/cmsTrig.c
@@ -71,7 +71,11 @@ _XcmsModuloF(
 #define XCMS_SIXTHPI		0.523598775598298820
 #define XCMS_RADIANS(d)		((d) * XCMS_PI / 180.0)
 #define XCMS_DEGREES(r)		((r) * 180.0 / XCMS_PI)
+#ifdef __vax__
+#define XCMS_X6_UNDERFLOWS	(3.784659e-07)	/* X**6 almost underflows*/
+#else
 #define XCMS_X6_UNDERFLOWS	(4.209340e-52)	/* X**6 almost underflows */
+#endif
 #define XCMS_X16_UNDERFLOWS	(5.421010e-20)	/* X**16 almost underflows*/
 #define XCMS_CHAR_BIT		8
 #define XCMS_LONG_MAX		0x7FFFFFFF