Merge remote-tracking branch 'origin/released'

4 files changed, 21 insertions, 13 deletions

diff --git a/libXext/specs/dbelib.xml b/libXext/specs/dbelib.xml
index 1f9068a7d..c642a511f 100644
--- a/libXext/specs/dbelib.xml
+++ b/libXext/specs/dbelib.xml
@@ -13,22 +13,22 @@
    <title>Double Buffer Extension Library</title>
    <subtitle>X Consortium Standard</subtitle>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Ian</firstname><surname>Elliot</surname>
+         <affiliation><orgname>Hewlett-Packard Company</orgname></affiliation>
       </author>
    </authorgroup>
    <othercredit>
-      <firstname>Davide</firstname><surname>Wiggins</surname>
+      <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
+      <affiliation><orgname>X Consortium, Inc</orgname></affiliation>
    </othercredit>
-   <corpname>Hewlett-Packard Company</corpname>
    <copyright><year>1989</year><holder>X Consortium, Inc and Digital Equipment Corporation</holder></copyright>
    <copyright><year>1992</year><holder>X Consortium, Inc and Intergraph Corporation</holder></copyright>
    <copyright><year>1993</year><holder>X Consortium, Inc and Silicon Graphics, Inc.</holder></copyright>
    <copyright><year>1994</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright>
    <copyright><year>1995</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
 
 <legalnotice>
 <para>
diff --git a/libXext/specs/dpmslib.xml b/libXext/specs/dpmslib.xml
index d0e24472d..93e6398c7 100644
--- a/libXext/specs/dpmslib.xml
+++ b/libXext/specs/dpmslib.xml
@@ -12,15 +12,15 @@
    <title>X Display Power Management Signaling (DPMS) Extension</title>
    <subtitle>X Consortium Standard</subtitle>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Rob</firstname><surname>Lembree</surname>
+         <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation>
+         <email>lembree@zk3.dec.com</email>
       </author>
    </authorgroup>
-   <corpname>Digital Equipment Corporation</corpname>
-   <copyright><year>1996</year><holder>X Consortium</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
+   <copyright><year>1996</year><holder>Digital Equipment Corporation</holder></copyright>
 
 <legalnotice>
 <para>
diff --git a/libXext/specs/synclib.xml b/libXext/specs/synclib.xml
index 67a7b5255..51b7cf5e3 100644
--- a/libXext/specs/synclib.xml
+++ b/libXext/specs/synclib.xml
@@ -17,20 +17,30 @@
    <authorgroup>
       <author>
         <firstname>Tim</firstname><surname>Glauert</surname>
-        <affiliation><orgname>Olivetti Research/MultiWorks</orgname></affiliation>
+        <affiliation>
+          <orgname>Olivetti Research</orgname>
+          <orgdiv>MultiWorks</orgdiv>
+        </affiliation>
       </author>
       <author>
           <firstname>Dave</firstname>
           <surname>Carver</surname>
-          <affiliation><orgname>Digital Equipment Corporation, MIT/Project Athena</orgname></affiliation>
+          <affiliation>
+            <orgname>Digital Equipment Corporation</orgname>
+            <orgdiv>MIT/Project Athena</orgdiv>
+          </affiliation>
       </author>
       <author>
         <firstname>Jim</firstname>
         <surname>Gettys</surname>
-        <affiliation><orgname>Digital Equipment Corporation, Cambridge Research Laboratory</orgname></affiliation>
+        <affiliation>
+          <orgname>Digital Equipment Corporation</orgname>
+          <orgdiv>Cambridge Research Laboratory</orgdiv>
+        </affiliation>
       </author>
       <author>
         <firstname>David</firstname>
+        <othername>P.</othername>
         <surname>Wiggins</surname>
         <affiliation><orgname>X Consortium, Inc.</orgname></affiliation>
       </author>
diff --git a/libXext/specs/xtest1.xml b/libXext/specs/xtest1.xml
index 22d046767..9229d273e 100644
--- a/libXext/specs/xtest1.xml
+++ b/libXext/specs/xtest1.xml
@@ -16,9 +16,7 @@
 	   <orgname>Hewlett Packard</orgname></affiliation>
       </author>
    </authorgroup>
-   <corpname>X Consortium Standard</corpname>
    <copyright><year>1993</year><holder>X Consortium</holder></copyright>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
 
 <abstract>
 <para>