svn merge ^/branches/released .

5 files changed, 35 insertions, 32 deletions

diff --git a/libXext/specs/dbelib.xml b/libXext/specs/dbelib.xml
index 34bcc711b..c786cae81 100644
--- a/libXext/specs/dbelib.xml
+++ b/libXext/specs/dbelib.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

-                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">

+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

 

 <!-- lifted from troff+ms+XMan by doclifter -->

diff --git a/libXext/specs/dpmslib.xml b/libXext/specs/dpmslib.xml
index fead7a8c3..809f3b77b 100644
--- a/libXext/specs/dpmslib.xml
+++ b/libXext/specs/dpmslib.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

-                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">

+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

 <!-- lifted from troff+ms+XMan by doclifter -->

 <book id="dpmslib">

diff --git a/libXext/specs/shapelib.xml b/libXext/specs/shapelib.xml
index a059cf2a6..1d89cf1e1 100644
--- a/libXext/specs/shapelib.xml
+++ b/libXext/specs/shapelib.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

-                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">

+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

 <!-- lifted from troff+ms+XMan by doclifter -->

 <book id="shapelib">

@@ -504,8 +504,6 @@ region specified by kind.
 

 <glossary id='glossary'>

 

-<glossdiv>

-<title>Glossary</title>

 <glossentry id='bounding_region'>

   <glossterm>bounding region</glossterm>

   <glossdef><para>The area of the parent window that this window will occupy.

@@ -575,7 +573,5 @@ clip region (if any) and the client bounding region (if any).  Otherwise,
 the effective clip region is the same as the default clip region.</para>

   </glossdef>

 </glossentry>

-

-</glossdiv>

 </glossary>

 </book>

diff --git a/libXext/specs/synclib.xml b/libXext/specs/synclib.xml
index 938261fdd..3edeaaaa7 100644
--- a/libXext/specs/synclib.xml
+++ b/libXext/specs/synclib.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

-                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">

+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

 

 <!-- lifted from troff+ms+XMan by doclifter -->

-<book id="recordlib">

+<book id="synclib">

 

 <bookinfo>

    <title>X Synchronization Extension Library</title>

@@ -15,30 +15,32 @@
         <firstname>Tim</firstname><surname>Glauert</surname>

         <affiliation><orgname>Olivetti Research/MultiWorks</orgname></affiliation>

       </author>

-      <othercredit>

+      <author>

           <firstname>Dave</firstname>

           <surname>Carver</surname>

-          <affiliation><orgname>Digital EquipmentCorporation, MIT/Project Athena</orgname></affiliation>

-      </othercredit>

-      <othercredit>

+          <affiliation><orgname>Digital Equipment Corporation, MIT/Project Athena</orgname></affiliation>

+      </author>

+      <author>

         <firstname>Jim</firstname>

         <surname>Gettys</surname>

-        <affiliation><orgname>Digital EquipmentCorporation, Cambridge Research Laboratory</orgname></affiliation>

-      </othercredit>

-      <othercredit>

+        <affiliation><orgname>Digital Equipment Corporation, Cambridge Research Laboratory</orgname></affiliation>

+      </author>

+      <author>

         <firstname>David</firstname>

         <surname>Wiggins</surname>

         <affiliation><orgname>X Consortium, Inc.</orgname></affiliation>

-      </othercredit>

+      </author>

    </authorgroup>

-   <copyright><year>1991</year><holder>Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts</holder></copyright>

-   <copyright><year>1991</year><holder>X Consortium</holder></copyright>

    <releaseinfo>Version 3.0</releaseinfo>

    <affiliation><orgname>X Consortium</orgname></affiliation>

    <productnumber>X Version 11, Release 6.4</productnumber>

 <legalnotice>

 

 <para>

+Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts

+</para>

+

+<para>

 Permission to use, copy, modify, and distribute this documentation for any

 purpose and without fee is hereby granted, provided that the above

 copyright notice appear in all copies. Olivetti, Digital, MIT, and the

@@ -46,6 +48,13 @@ X Consortium make no representations about the suitability for any purpose
 of the information in this document. This documentation is provided as

 is without express or implied warranty.

 </para>

+</legalnotice>

+

+<legalnotice>

+

+<para>

+Copyright &copy; 1991 X Consortium, Inc.

+</para>

 

 <para>

 Permission is hereby granted, free of charge, to any person obtaining

diff --git a/libXext/specs/xtest1.xml b/libXext/specs/xtest1.xml
index 4652de72a..72496210f 100644
--- a/libXext/specs/xtest1.xml
+++ b/libXext/specs/xtest1.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

                    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

 

-<book id="xtest1">

+<article id="xtest1">

 

-<bookinfo>

+<articleinfo>

    <title>X11 INPUT SYNTHESIS EXTENSION PROPOSAL</title>

    <subtitle>X Consortium Standard</subtitle>

    <releaseinfo>Version 1.0</releaseinfo>

    <authorgroup>

       <author>

          <firstname>Larry</firstname><surname>Woestman</surname>

-         <affiliation><orgname>Hewlett Packard, Member of Technical Staff</orgname></affiliation>

+         <affiliation><jobtitle>Member of Technical Staff</jobtitle>

+	   <orgname>Hewlett Packard</orgname></affiliation>

       </author>

    </authorgroup>

    <corpname>X Consortium Standard</corpname>

@@ -26,10 +27,8 @@ This is a proposal for an extension to the X11 server and Xlib.
 </para>

 </abstract>

 

-</bookinfo>

+</articleinfo>

 

-<chapter>

-<title>TITLE</title>

 <sect1 id="introduction">

 <title>Introduction</title>

 <para>

@@ -950,5 +949,4 @@ function will return -1 if there is an error, and 0 otherwise.
 <!-- .H 1 'xtestext1.h'~File~Listing -->

 <!-- .so xtestext1.h -->

 <!-- .TC 1 1 4 -->

-</chapter>

-</book>

+</article>