specs/libX11: Clean up author list & acknowledgements a little

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

2 files changed, 42 insertions, 35 deletions

diff --git a/specs/libX11/credits.xml b/specs/libX11/credits.xml
index f8001cde..506bf822 100644
--- a/specs/libX11/credits.xml
+++ b/specs/libX11/credits.xml
@@ -1,4 +1,4 @@
-<chapter id="acknowledgments">
+<preface id="acknowledgments">
 <title>Acknowledgments</title>
 <para>
 The design and implementation of the first 10 versions of X
@@ -13,9 +13,10 @@ we would like to acknowledge some of the people who deserve special credit
 and recognition for their work on Xlib.
 Our apologies to anyone inadvertently overlooked.
 </para>
-<para>
+<sect1 id="release1">
+<title>
 Release 1
-</para>
+</title>
 <para>
 Our thanks does to Ron Newman (MIT Project Athena),
 who contributed substantially to the
@@ -90,9 +91,11 @@ who had much to do with W's design.
 Finally, our thanks goes to MIT,  Digital Equipment Corporation,
 and IBM for providing the environment where it could happen.
 </para>
-<para>
+</sect1>
+<sect1 id="release4">
+<title>
 Release 4
-</para>
+</title>
 <para>
 Our thanks go to Jim Fulton (MIT X Consortium) for designing and
 specifying the new Xlib functions for Inter-Client Communication
@@ -103,9 +106,11 @@ We also thank Al Mento of Digital for his continued effort in
 maintaining this document and Jim Fulton and Donna Converse (MIT X Consortium)
 for their much-appreciated efforts in reviewing the changes.
 </para>
-<para>
+</sect1>
+<sect1 id="release5">
+<title>
 Release 5
-</para>
+</title>
 <para>
 The principal authors of the Input Method facilities are
 Vania Joloboff (Open Software Foundation) and Bill McMahon (Hewlett-Packard).
@@ -161,9 +166,11 @@ and reformatting text for this manual, and for producing man pages.
 Thanks also to Clive Feather (IXI) for proof-reading and finding a
 number of small errors.
 </para>
-<para>
+</sect1>
+<sect1 id="release6">
+<title>
 Release 6
-</para>
+</title>
 <para>
 Stephen Gildea (X Consortium) authored the threads support.
 Ovais Ashraf (Sun) and Greg Olsen (Sun) contributed substantially
@@ -211,13 +218,15 @@ Shoji Sugiyama (IBM), Lining Sun (SGI), Masaki Takeuchi (Sony),
 Jinsoo Yoon (KAIST) and Akiyasu Zen (HP).
 </para>
 <para>
+<literallayout>
 Jim Gettys
 Cambridge Research Laboratory
 Digital Equipment Corporation
-</para>
-<para>
+
 Robert W. Scheifler
 Laboratory for Computer Science
 Massachusetts Institute of Technology
+</literallayout>
 </para>
-</chapter>
+</sect1>
+</preface>
diff --git a/specs/libX11/libX11.xml b/specs/libX11/libX11.xml
index 3f926c60..a7d679e9 100644
--- a/specs/libX11/libX11.xml
+++ b/specs/libX11/libX11.xml
@@ -5,18 +5,24 @@
 <book id="libX11">
 
 <bookinfo>
-   <title>Xlib Widget Set - C Language Interface</title>
+   <title>Xlib - C Language X Interface</title>
    <subtitle>X Window System Standard</subtitle>
    <releaseinfo>X Version 11, Release 7</releaseinfo>
    <authorgroup>
       <author>
          <firstname>James</firstname><surname>Gettys</surname>
-         <affiliation><orgname>Cambridge Research Laboratory</orgname></affiliation>
+         <affiliation>
+	   <orgname>Digital Equipment Corporation</orgname>
+	   <orgdiv>Cambridge Research Laboratory</orgdiv>
+	 </affiliation>
+      </author>
+      <author>
+         <firstname>Robert</firstname><othername role='mi'>W.</othername> <surname>Scheifler</surname>
+         <affiliation>
+	   <orgname>Massachusetts Institute of Technology</orgname>
+	   <orgdiv>Laboratory for Computer Science</orgdiv>
+	 </affiliation>
       </author>
-      <othercredit>
-         <firstname>Robert</firstname><surname>W. Scheifler</surname>
-         <affiliation><orgname>Laboratory for Computer Science Massachusetts Institute of Technology</orgname></affiliation>
-      </othercredit>
       <othercredit>
          <firstname>Chuck</firstname><surname>Adams</surname>
          <affiliation><orgname>Tektronix, Inc.</orgname></affiliation>
@@ -26,7 +32,7 @@
          <affiliation><orgname>Open Software Foundation</orgname></affiliation>
       </othercredit>
       <othercredit>
-         <firstname>Hideki</firstname><surname>Joloboff</surname>
+         <firstname>Hideki</firstname><surname>Hiura</surname>
          <affiliation><orgname>Sun Microsystems, Inc.</orgname></affiliation>
       </othercredit>
       <othercredit>
@@ -50,22 +56,14 @@
          <affiliation><orgname>Fujitsu OSSI</orgname></affiliation>
       </othercredit>
    </authorgroup>
-   <copyright><year>1985</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1986</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1987</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1988</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1989</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1991</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1994</year><holder>The Open Group</holder></copyright>
-   <copyright><year>1996</year><holder>The Open Group</holder></copyright>
-   <copyright><year>2002</year><holder>The Open Group</holder></copyright>
-
-   <copyright><year>1985</year><holder>Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1986</year><holder>Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1987</year><holder>Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1988</year><holder>Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1989</year><holder>Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1991</year><holder>Digital Equipment Corporation</holder></copyright>
+   <copyright><year>1985</year><year>1986</year><year>1987</year>
+     <year>1988</year><year>1989</year><year>1991</year><year>1994</year>
+     <year>1996</year><year>2002</year><holder>The Open Group</holder>
+   </copyright>
+   <copyright><year>1985</year><year>1986</year><year>1987</year>
+     <year>1988</year><year>1989</year><year>1991</year>
+     <holder>Digital Equipment Corporation</holder>
+   </copyright>
 
    <affiliation><orgname>formerly MIT X Consortium</orgname></affiliation>
    <productnumber>X Version 11, Release 7</productnumber>