xc-misc.xml: Misc. markup cleanups

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

1 files changed, 34 insertions, 40 deletions

diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml
index 65ba0d2..f3f8f62 100644
--- a/specs/xc-misc.xml
+++ b/specs/xc-misc.xml
@@ -13,16 +13,17 @@
       <author>
          <firstname>Bob</firstname><surname>Scheifler</surname>
       </author>
+      <author>
+	<firstname>David</firstname><surname>Wiggins</surname>
+      </author>
+      <corpauthor>X Consortium</corpauthor>
    </authorgroup>
-<othercredit><firstname>David</firstname><surname>Wiggins</surname></othercredit>
-   <corpname>X Consortium Standard</corpname>
    <copyright><year>1994</year><holder>X Consortium</holder></copyright>
    <releaseinfo>Version 1.1</releaseinfo>
    <affiliation><orgname>X Consortium</orgname></affiliation>
    <productnumber>X Version 11, Release 6.9/7.0</productnumber>
 
 <legalnotice>
-<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
 
 <para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
 
@@ -70,60 +71,61 @@ exhausted its current pool of resource IDs.</para>
 <chapter id='requests'>
 <title>Requests</title>
 
-<para><function>XCMiscGetVersion</function></para>
+<para>
+<function>XCMiscGetVersion</function></para>
 
 <itemizedlist>
-    <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem>
-    <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem>
+    <listitem><para><parameter>client_major_version</parameter>: CARD16</para></listitem>
+    <listitem><para><parameter>client_minor_version</parameter>: CARD16</para></listitem>
 </itemizedlist>
 <para>   =&gt;</para>
 <itemizedlist>
-    <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem>
-    <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem>
+    <listitem><para><parameter>client_major_version</parameter>: CARD16</para></listitem>
+    <listitem><para><parameter>client_minor_version</parameter>: CARD16</para></listitem>
 </itemizedlist>
 
-<para>If supplied, the <emphasis remap='I'>client_major_version</emphasis> and
-<emphasis remap='I'>client_minor_version</emphasis> indicate what version of 
-the protocol the client wants the server to implement.  The server version 
+<para>If supplied, the <parameter>client_major_version</parameter> and
+<parameter>client_minor_version</parameter> indicate what version of
+the protocol the client wants the server to implement.  The server version
 numbers returned indicate the protocol this extension actually supports.  This
 might not equal the version sent by the client.  An implementation can
 (but need not) support more than one version simultaneously.  The
-<emphasis remap='I'>server_major_version</emphasis> and the <emphasis remap='I'>server_minor_version</emphasis> are a
+<parameter>server_major_version</parameter> and the <parameter>server_minor_version</parameter> are a
 mechanism to support future revisions of the XC-MISC protocol
 which may be necessary.  In general, the major version would increment
 for incompatible changes, and the minor version would increment for
 small, upward-compatible changes.  Servers that support the protocol
-defined in this document will return a 
-<emphasis remap='I'>server_major_version</emphasis> of one (1), and a 
-<emphasis remap='I'>server_minor_version</emphasis> of one (1).</para>
+defined in this document will return a
+<parameter>server_major_version</parameter> of one (1), and a
+<parameter>server_minor_version</parameter> of one (1).</para>
 
 <para><function>XCMiscGetXIDRange</function></para>
 
 <para>   =&gt;</para>
 <itemizedlist>
-    <listitem><para><emphasis remap='I'>start_id</emphasis>: XID</para></listitem>
-    <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem>
+    <listitem><para><parameter>start_id</parameter>: XID</para></listitem>
+    <listitem><para><parameter>count</parameter>: CARD32</para></listitem>
 </itemizedlist>
 
 <para>This request returns a range of available resource IDs for the client
-issuing the request.  <emphasis remap='I'>start_id</emphasis> is the first 
-ID in the range.  <emphasis remap='I'>count</emphasis> is the number of IDs 
-in the range.  The returned range may or may not be the largest possible 
+issuing the request.  <parameter>start_id</parameter> is the first
+ID in the range.  <parameter>count</parameter> is the number of IDs
+in the range.  The returned range may or may not be the largest possible
 range.</para>
 
 <para><function>XCMiscGetXIDList</function></para>
 
 <itemizedlist>
-    <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem>
+    <listitem><para><parameter>count</parameter>: CARD32</para></listitem>
 </itemizedlist>
 <para>   =&gt;</para>
 <itemizedlist>
-    <listitem><para><emphasis remap='I'>ids</emphasis>: LISTofXID</para></listitem>
+    <listitem><para><parameter>ids</parameter>: LISTofXID</para></listitem>
 </itemizedlist>
 
-<para>This request returns the a list of individual resource IDs in 
-<emphasis remap='I'>ids</emphasis>.
-<emphasis remap='I'>count</emphasis> is the number of resource IDs requested.
+<para>This request returns the a list of individual resource IDs in
+<parameter>ids</parameter>.
+<parameter>count</parameter> is the number of resource IDs requested.
 The number returned may be smaller than the number requested.</para>
 </chapter>
 
@@ -141,16 +143,14 @@ conventions established there.</para>
 
 <para>The name of this extension is &ldquo;XC-MISC&rdquo;.</para>
 
-<literallayout remap='Ds'>
+<synopsis>
 <function>XCMiscGetVersion</function>
      1     CARD8          opcode
      1     0                      XC-MISC opcode
      2     2                      request length
      2     CARD16         client_major_version
      2     CARD16         client_minor_version
-</literallayout>
-<literallayout remap='Ds'>
-<synopsis>
+
  =&gt;
      1     1          Reply
      1                unused
@@ -160,16 +160,13 @@ conventions established there.</para>
      2     CARD16     server_minor_version
      20               unused
 </synopsis>
-</literallayout>
 
-<literallayout remap='Ds'>
+<synopsis>
 <function>XCMiscGetXIDRange</function>
      1     CARD8        opcode
      1     1                   XC-MISC opcode
      2     1                   request length
-</literallayout>
-<literallayout remap='Ds'>
-<synopsis>
+
  =&gt;
      1     1          Reply
      1                unused
@@ -179,17 +176,15 @@ conventions established there.</para>
      4     CARD32     count
      16               unused
 </synopsis>
-</literallayout> <!-- remap='De' -->
 
-<literallayout remap='Ds'>
+
+<synopsis>
 <function>XCMiscGetXIDList</function>
      1     CARD8          opcode
      1     2                      XC-MISC opcode
      2     2                      request length
      4     CARD32         count
-</literallayout>
-<literallayout remap='Ds'>
-<synopsis>
+
  =&gt;
      1     1          Reply
      1                unused
@@ -199,7 +194,6 @@ conventions established there.</para>
      20               unused
      4n    LISTofXID  ids
 </synopsis>
-</literallayout>
 </chapter>
 </book>