Backport from HEAD:

	* cygwin-api.in.sgml: Remove authorgroup and revhistory.
	* cygwin-ug.in.sgml: Add Joshua Daniel Franklin to authorgroup.
	Remove revhistory.
	* legal.sgml: Update dates.

4 files changed, 99 insertions, 26 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index c7265e33369..05a03727a98 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-29  Brian Dessent  <brian@dessent.net>
+
+	Backport from HEAD:
+	* cygwin-api.in.sgml: Remove authorgroup and revhistory.
+	* cygwin-ug.in.sgml: Add Joshua Daniel Franklin to authorgroup.
+	Remove revhistory.
+	* legal.sgml: Update dates.
+
 2007-06-28  Brian Dessent  <brian@dessent.net>
 
         Backport documentation changes from HEAD.
diff --git a/winsup/doc/cygwin-api.in.sgml b/winsup/doc/cygwin-api.in.sgml
index d28fd5b6447..c674b87af27 100644
--- a/winsup/doc/cygwin-api.in.sgml
+++ b/winsup/doc/cygwin-api.in.sgml
@@ -7,35 +7,9 @@
   <bookinfo>
     <date>1998-08-31</date>
     <title>Cygwin API Reference</title>
-    <authorgroup>
-      <author>
-        <firstname>DJ</firstname>
-        <surname>Delorie</surname>
-      </author>
-      <author>
-        <firstname>Geoffrey</firstname>
-        <surname>Noer</surname>
-      </author>
-    </authorgroup>
 
     DOCTOOL-INSERT-legal
 
-    <revhistory>
-      <revision>
-	<revnumber>0.0</revnumber>
-	<date>1998-08-31</date>
-	<authorinitials>dj</authorinitials>
-	<revremark>Initial revision</revremark>
-      </revision>
-      <revision>
-	<revnumber>0.5.0</revnumber>
-	<date>1998-12-17</date>
-	<authorinitials>noer</authorinitials>
-	<revremark>Add pthread, sem calls.  Change revnumber to
-	three-part number: Cygwin API major, Cygwin API minor, Doc rev
-	number.  Starts out at 0.5.0.</revremark>
-      </revision>
-    </revhistory>
   </bookinfo>
 
   <toc></toc>
diff --git a/winsup/doc/cygwin-ug.in.sgml b/winsup/doc/cygwin-ug.in.sgml
new file mode 100644
index 00000000000..598a53a49e7
--- /dev/null
+++ b/winsup/doc/cygwin-ug.in.sgml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"[
+  <!ENTITY cygnus-copyright "<year>1999,2000,2001</year>
+  <holder>Red Hat, Inc.</holder>">
+  <!ENTITY cygnus-code-copyright "
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
+
+This is copyrighted software that may only
+be reproduced, modified, or distributed
+under license from Red Hat, Inc.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+">
+ ]>
+
+<book id="cygwin-ug">
+
+  <bookinfo>
+    <date>2001-22-03</date>
+    <title>Cygwin User's Guide</title>
+    <authorgroup>
+        <firstname>Joshua Daniel</firstname>
+        <surname>Franklin</surname>
+      </author>
+      <author>
+        <firstname>Corinna</firstname>
+        <surname>Vinschen</surname>
+      </author>
+      <author>
+        <firstname>Christopher</firstname>
+        <surname>Faylor</surname>
+      </author>
+      <author>
+        <firstname>DJ</firstname>
+        <surname>Delorie</surname>
+      </author>
+      <author>
+        <firstname>Pierre</firstname>
+	<surname>Humblet</surname>
+      </author>
+      <author>
+        <firstname>Geoffrey</firstname>
+        <surname>Noer</surname>
+      </author>
+    </authorgroup>
+
+DOCTOOL-INSERT-legal
+
+  </bookinfo>
+
+  <toc></toc>
+
+DOCTOOL-INSERT-overview
+
+DOCTOOL-INSERT-setup
+
+DOCTOOL-INSERT-using
+
+DOCTOOL-INSERT-programming
+
+</book>
diff --git a/winsup/doc/legal.sgml b/winsup/doc/legal.sgml
new file mode 100644
index 00000000000..aad3edf7cbd
--- /dev/null
+++ b/winsup/doc/legal.sgml
@@ -0,0 +1,30 @@
+<legalnotice id="legal">
+
+<para>Copyright &copy; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.</para>
+
+<!--
+
+<para>GNUPro&trade;, the GNUPro&trade; logo, and the Red Hat
+logo are trademarks of Red Hat, Inc.  All other brand and product
+names are trademarks of their respective owners.</para>
+
+<para>Permission is granted to make and distribute verbatim copies of
+this documentation provided the copyright notice and this permission
+notice are preserved on all copies.</para>
+
+<para>Permission is granted to copy and distribute modified versions
+of this documentation under the conditions for verbatim copying,
+provided that the entire resulting derived work is distributed under
+the terms of a permission notice identical to this one.</para>
+
+<para>Permission is granted to copy and distribute translations of
+this documentation into another language, under the above conditions
+for modified versions, except that this permission notice may be
+stated in a translation approved by the Free Software
+Foundation.</para>
+
+<para>This documentation has been prepared by Red Hat, Inc.
+Technical Publications.</para>
+-->
+
+</legalnotice>