# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1155578280 0
# Node ID 0a847d3b0d211d8d6ceca0f92e8564c5e029d78e
# Parent  02e62250d524194eee1fd64a23dd0c49cd37dd19
* solaris-versions: Add SunOS 5.10, SunOS 1.x, SunOS 4.0, SunOS
4.0.x, SunOS 4.1.1.1, SunOS 4.1.1_U1, SunOS 4.1.3B.  SunOS 4.1.3
was Solaris 1.1A.  Remove space before B in Solaris 1.1.1B.
Mention SunOS 5.11.  Mention that everything before SunOS 5.7
is now obsolete, and give a pointer to the Sun list.
Add copyright notice.

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* solaris-versions: Add SunOS 5.10, SunOS 1.x, SunOS 4.0, SunOS
+	4.0.x, SunOS 4.1.1.1, SunOS 4.1.1_U1, SunOS 4.1.3B.  SunOS 4.1.3
+	was Solaris 1.1A.  Remove space before B in Solaris 1.1.1B.
+	Mention SunOS 5.11.  Mention that everything before SunOS 5.7
+	is now obsolete, and give a pointer to the Sun list.
+	Add copyright notice.
+
 2006-08-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile (standards.info standards.html standards.dvi):
diff --git a/doc/solaris-versions b/doc/solaris-versions
--- a/doc/solaris-versions
+++ b/doc/solaris-versions
@@ -3,17 +3,23 @@
 Here is a mapping table that maps the `uname -sr` values to Sun's marketing
 names.
 
+       SunOS 1.x       == SunOS 1.x
        SunOS 2.x       == SunOS 2.x
        SunOS 3.x       == SunOS 3.x
+       SunOS 4.0       == SunOS 4.0
+       SunOS 4.0.x     == SunOS 4.0.x
 
 Starting with 4.1.1B of SunOS we have the 'Solaris 1.0' release.
 
        SunOS 4.1.1B    == Solaris 1.0
+       SunOS 4.1.1.1   ==    "     "
+       SunOS 4.1.1_U1  ==    "     "
        SunOS 4.1.2     == Solaris 1.0.1
-       SunOS 4.1.3     == Solaris 1.1
+       SunOS 4.1.3     == Solaris 1.1A
+       SunOS 4.1.3B    == Solaris 1.1B
        SunOS 4.1.3C    == Solaris 1.1C
        SunOS 4.1.3_U1  == Solaris 1.1.1
-       SunOS 4.1.3_U1B == Solaris 1.1.1 B
+       SunOS 4.1.3_U1B == Solaris 1.1.1B
        SunOS 4.1.4     == Solaris 1.1.2
 
 The SunOS 5.x uname output maps to the Solaris 2.x numbers thru 2.6
@@ -27,11 +33,31 @@
        SunOS 5.5.1     == Solaris 2.5.1
        SunOS 5.6       == Solaris 2.6
 
-After SunOS 5.6, they started number based on the second digit
+After SunOS 5.6, they started numbering based on the second digit
 
        SunOS 5.7       == Solaris 7
        SunOS 5.8       == Solaris 8
        SunOS 5.9       == Solaris 9
+       SunOS 5.10      == Solaris 10
+
+The next version will be SunOS 5.11, but as of 2006-08-14 it is not
+known whether it will also be called "Solaris 11".
 
 The common terminology is to use the name "SunOS ..." to designate SunOS 2.x,
 3.x, 4.x, and "Solaris ..." to designate SunOS 5.x.
+
+Most of these operating systems are obsolete.  As of 2006-07-24 only
+SunOS 5.7 and later are maintained by Sun and are therefore of
+practical porting concern for GNU applications.  For the current list, see
+<http://www.sun.com/service/eosl/solaris/solaris_vintage_eol_5.2005.xml>.
+
+-----
+
+Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the ``GNU Free
+Documentation License'' file as part of this distribution.