specs/libX11: Convert \- to − and \^ to either   or removed

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

8 files changed, 29 insertions, 31 deletions

diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index 7f5ea0a2..7d03389b 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -530,7 +530,7 @@ is used for generic resource IDs.
   <listitem>
     <para>
 <indexterm significance="preferred"><primary>XPointer</primary></indexterm>
-The type <type>XPointer</type> is defined to be <type>char\^*</type>
+The type <type>XPointer</type> is defined to be <type>char&hairsp;*</type>
 and is used as a generic opaque pointer to data.
     </para>
   </listitem>
@@ -820,11 +820,11 @@ see section 11.8.2. <!-- xref -->
 To eliminate any ambiguity between those arguments that you pass and those that
 a function returns to you,
 the explanations for all arguments that you pass start with the word
-<emphasis remap='I'>specifies</emphasis> or, in the case of multiple arguments, the word <emphasis remap='I'>specify\^</emphasis>.
+<emphasis remap='I'>specifies</emphasis> or, in the case of multiple arguments, the word <emphasis remap='I'>specify</emphasis>.
 The explanations for all arguments that are returned to you start with the
-word <emphasis remap='I'>returns</emphasis> or, in the case of multiple arguments, the word <emphasis remap='I'>return\^</emphasis>.
+word <emphasis remap='I'>returns</emphasis> or, in the case of multiple arguments, the word <emphasis remap='I'>return</emphasis>.
 The explanations for all arguments that you can pass and are returned start
-with the words <emphasis remap='I'>specifies and returns\^</emphasis>.
+with the words <emphasis remap='I'>specifies and returns</emphasis>.
 	  </para>
 	</listitem>
 	<listitem>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index 8cc1969c..a5df384a 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -179,7 +179,7 @@ use
 <funcsynopsis>
 <funcprototype>
   <funcdef>VisualID <function>XVisualIDFromVisual</function></funcdef>
-  <paramdef>Visual<parameter> *\^visual</parameter></paramdef>
+  <paramdef>Visual *<parameter>visual</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -822,9 +822,9 @@ A bit-gravity of
 indicates that the contents or origin should not move relative to the 
 origin of the root window.
 If the change in size of the window is coupled with a change in position (x, y),
-then for bit-gravity the change in position of each pixel is (\-x, \-y), and for
+then for bit-gravity the change in position of each pixel is (&minus;x, &minus;y), and for
 win-gravity the change in position of a child when its parent is so resized is
-(\-x, \-y).
+(&minus;x, &minus;y).
 Note that
 <symbol>StaticGravity</symbol>
 still only takes effect when the width or height of the window is changed, 
@@ -3389,7 +3389,6 @@ To restack a set of windows from top to bottom, use
 <funcsynopsis>
 <funcprototype>
   <funcdef><function>XRestackWindows</function></funcdef>
-  <paramdef>XRestackWindows\^(\^display,windows,<parameter> \^nwindows)</parameter></paramdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> windows[]</parameter></paramdef>
   <paramdef>int<parameter> nwindows</parameter></paramdef>
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index 156c1b61..8a3e8c53 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -1412,7 +1412,7 @@ To obtain the type, format, and value of a property of a given window, use
 <funcsynopsis>
 <funcprototype>
   <funcdef>int <function>XGetWindowProperty</function></funcdef>
-  <paramdef><parameter> \^display</parameter></paramdef>
+  <paramdef><parameter> display</parameter></paramdef>
   <paramdef><parameter> w</parameter></paramdef>
   <paramdef><parameter> property</parameter></paramdef>
   <paramdef><parameter> long_offset</parameter></paramdef>
@@ -1968,7 +1968,7 @@ To rotate a window's property list, use
   <funcdef><function>XRotateWindowProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
-  <paramdef>Atom<parameter> properties[]\^</parameter></paramdef>
+  <paramdef>Atom<parameter> properties[]</parameter></paramdef>
   <paramdef>int<parameter> num_prop</parameter></paramdef>
   <paramdef>int<parameter> npositions</parameter></paramdef>
 </funcprototype>
@@ -2039,7 +2039,7 @@ events.
 If the property names in the properties array are viewed as being numbered 
 starting from zero and if there are num_prop property names in the list,
 then the value associated with property name I becomes the value associated 
-with property name (I + npositions) mod N for all I from zero to N \- 1.
+with property name (I + npositions) mod N for all I from zero to N &minus; 1.
 The effect is to rotate the states by npositions places around the virtual ring
 of property names (right for positive npositions, 
 left for negative npositions).
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index 48278d20..201680db 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -968,10 +968,10 @@ depth of drawable, use
 <funcsynopsis>
 <funcprototype>
   <funcdef>GC <function>XCreateGC</function></funcdef>
-  <paramdef>Display<parameter> *display</parameter></paramdef>
+  <paramdef>Display <parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
-  <paramdef>XGCValues<parameter> *\^values</parameter></paramdef>
+  <paramdef>XGCValues *<parameter>values</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -1145,7 +1145,7 @@ To change the components in a given GC, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
-  <paramdef>XGCValues<parameter> *\^values</parameter></paramdef>
+  <paramdef>XGCValues<parameter> *values</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -1982,7 +1982,7 @@ To set the dash-offset and dash-list for dashed line styles of a given GC, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> dash_offset</parameter></paramdef>
-  <paramdef>char<parameter> dash_list[]\^</parameter></paramdef>
+  <paramdef>char<parameter> dash_list[]</parameter></paramdef>
   <paramdef>int<parameter> n</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2080,7 +2080,7 @@ are only required to match this ideal for horizontal and vertical lines.
 Failing the ideal semantics, it is suggested that the length be measured along the
 major axis of the line.
 The major axis is defined as the x axis for lines drawn at an angle of between
-\-45 and +45 degrees or between 135 and 225 degrees from the x axis.
+&minus;45 and +45 degrees or between 135 and 225 degrees from the x axis.
 For all other lines, the major axis is the y axis.
 </para>
 <para>
@@ -3043,7 +3043,7 @@ To set the clip-mask of a given GC to the specified list of rectangles, use
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intclip_x_origin,<parameter> clip_y_origin</parameter></paramdef>
-  <paramdef>XRectangle<parameter> rectangles[]\^</parameter></paramdef>
+  <paramdef>XRectangle<parameter> rectangles[]</parameter></paramdef>
   <paramdef>int<parameter> n</parameter></paramdef>
   <paramdef>int<parameter> ordering</parameter></paramdef>
 </funcprototype>
diff --git a/specs/libX11/CH09.xml b/specs/libX11/CH09.xml
index c4990a47..66d1bc33 100644
--- a/specs/libX11/CH09.xml
+++ b/specs/libX11/CH09.xml
@@ -1105,7 +1105,7 @@ or
 Timeout and interval are specified in seconds. 
 A timeout of 0 disables the screen saver 
 (but an activated screen saver is not deactivated),
-and a timeout of \-1 restores the default.
+and a timeout of &minus;1 restores the default.
 Other negative values generate a
 <errorname>BadValue</errorname>
 error.
diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml
index 29a3a24f..d36ac19f 100644
--- a/specs/libX11/CH10.xml
+++ b/specs/libX11/CH10.xml
@@ -1064,8 +1064,7 @@ masks bits in the event-mask attribute of the window.
 <itemizedlist>
   <listitem>
     <para>
-<function>Button1MotionMask \ \-</function>
-<symbol>Button5MotionMask</symbol>
+<symbol>Button1MotionMask</symbol> - <symbol>Button5MotionMask</symbol>
     </para>
   </listitem>
   <listitem>
diff --git a/specs/libX11/CH11.xml b/specs/libX11/CH11.xml
index 3566cd30..ddbc095d 100644
--- a/specs/libX11/CH11.xml
+++ b/specs/libX11/CH11.xml
@@ -2439,7 +2439,7 @@ the major request protocol number is used for the message argument.
 For an extension request,
 the extension name (as given by
 <function>InitExtension</function>)
-followed by a period (\.) and the minor request protocol number 
+followed by a period (.) and the minor request protocol number 
 is used for the message argument.
 If no string is found in the error database,
 the default_string is returned to the buffer argument.
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index 507bfd8e..8d6ccc3d 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -798,7 +798,7 @@ use
   <funcdef><function>XRebindKeysym</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
-  <paramdef>KeySym<parameter> list[\^]\^</parameter></paramdef>
+  <paramdef>KeySym<parameter> list[&hairsp;]</parameter></paramdef>
   <paramdef>int<parameter> mod_count</parameter></paramdef>
   <paramdef>unsignedchar<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_bytes</parameter></paramdef>
@@ -1017,8 +1017,8 @@ Specifically, this function lets you parse strings of the form:
 <para>
 <!-- .LP -->
 The fields map into the arguments associated with this function.
-(Items enclosed in &lt;\^&gt; are integers, items in [\^] are optional, and
-items enclosed in {\^} indicate ``choose one of.''
+(Items enclosed in &lt;&hairsp;&gt; are integers, items in [&hairsp;] are optional, and
+items enclosed in {&hairsp;} indicate ``choose one of.''
 Note that the brackets should not appear in the actual string.)
 If the string is not in the Host Portable Character Encoding,
 the result is implementation-dependent.
@@ -1030,7 +1030,7 @@ The
 function returns a bitmask that indicates which of the four values (width,
 height, xoffset, and yoffset) were actually found in the string 
 and whether the x and y values are negative. 
-By convention, \-0 is not equal to +0, because the user needs to
+By convention, &minus;0 is not equal to +0, because the user needs to
 be able to say ``position the window relative to the right or bottom edge.''
 For each value found, the corresponding argument is updated.
 For each value not found, the argument is left unchanged.
@@ -2156,7 +2156,7 @@ To store data in cut buffer 0, use
   <funcdef><function>XStoreBytes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *bytes</parameter></paramdef>
-  <paramdef>int<parameter> \^nbytes</parameter></paramdef>
+  <paramdef>int<parameter> nbytes</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN  -->
@@ -2221,7 +2221,7 @@ To store data in a specified cut buffer, use
   <funcdef><function>XStoreBuffer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *bytes</parameter></paramdef>
-  <paramdef>int<parameter> \^nbytes</parameter></paramdef>
+  <paramdef>int<parameter> nbytes</parameter></paramdef>
   <paramdef>int<parameter> buffer</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3201,7 +3201,7 @@ use
 <funcsynopsis>
 <funcprototype>
   <funcdef><function>XDestroyImage</function></funcdef>
-  <paramdef>XImage<parameter> *\^ximage</parameter></paramdef>
+  <paramdef>XImage *<parameter>ximage</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
@@ -3421,7 +3421,7 @@ when finished.
 If <emphasis remap='I'>name</emphasis>_x_hot and <emphasis remap='I'>name</emphasis>_y_hot exist,
 <function>XReadBitmapFile</function>
 returns them to x_hot_return and y_hot_return;
-otherwise, it returns \-1,\-1.
+otherwise, it returns &minus;1,&minus;1.
 </para>
 <para>
 <!-- .LP -->
@@ -3618,7 +3618,7 @@ Specify the width and height.
     </term>
     <listitem>
       <para>
-Specify where to place the hotspot coordinates (or \-1,\-1 if none are present)
+Specify where to place the hotspot coordinates (or &minus;1,&minus;1 if none are present)
 in the file.
     </para>
   </listitem>
@@ -3644,7 +3644,7 @@ returns
 otherwise, on no error,
 it returns
 <returnvalue>BitmapSuccess</returnvalue>.
-If x_hot and y_hot are not \-1, \-1, 
+If x_hot and y_hot are not &minus;1, &minus;1,
 <function>XWriteBitmapFile</function>
 writes them out as the hotspot coordinates for the bitmap.
 </para>