Fix a number of typos and other editorial changes Add information aboutXORG-CYGWIN-LAST-MERGE

    IPv6 changes added since XFree86 4.4RC2 to RELNOTES Update Solaris
    readme to reflect current releases

4 files changed, 86 insertions, 61 deletions

diff --git a/sgml/LICENSE.sgml b/sgml/LICENSE.sgml
index 91bb711..b44491d 100644
--- a/sgml/LICENSE.sgml
+++ b/sgml/LICENSE.sgml
@@ -4,7 +4,7 @@
 
 <article>
 <title>Licenses</title>
-<author>The Xorg Foundation</author>
+<author>The X.Org Foundation</author>
 <date>March 2004</date>
 
 <ident>
diff --git a/sgml/README.sgml b/sgml/README.sgml
index f202f20..eefb6f3 100644
--- a/sgml/README.sgml
+++ b/sgml/README.sgml
@@ -12,7 +12,7 @@
 <article>
 
 <title>README for X11R&relvers;
-<author>The X.org Foundation
+<author>The X.Org Foundation
 <date>25 March 2004
 
 <ident>
@@ -26,7 +26,7 @@ many UNIX(R) and UNIX-like operating systems (such as Linux, FreeBSD,
 NetBSD, OpenBSD and Solaris x86) on Intel and other platforms.  This
 version is compatible with X11R6.6, 
 and is based on the XFree86 4.4.0RC2 code base, which,
-in turn was based on the X consortium sample implementation.
+in turn was based on the X Consortium X11R6.6 and earlier sample implementations.
 
 
 </abstract>
@@ -63,7 +63,7 @@ This snapshot is release candidate &rcnum; for version &fullrelvers;.
 Pre-release snapshots are provided for beta testing.  You should only install
 snapshots if you're comfortable dealing with possibly unstable beta-level
 software.  If you find problems with this snapshot, you are encouraged
-to report your findings to the public X.org server mailing list:
+to report your findings to the public X.Org server mailing list:
 <email>xorg@freedesktop.org</email>.
 
 <![ %relcandidate [
@@ -72,7 +72,7 @@ X11R&relvers; is a feature-complete snapshot of X11R&fullrelvers;.
 ]]> 
 
 <p>
-X11R6.7 is the current X.org Foundation release series, based on the
+X11R6.7 is the current X.Org Foundation release series, based on the
 XFree86 4.x code base.
 The first release in
 the XFree86 4.x  series was in early 2000.  
@@ -90,18 +90,19 @@ the "vesa" driver.  The <htmlurl name="Release Notes" url="RELNOTES3.html">
 has a table showing the drivers provided with X11R&relvers;, and links
 to related documentation.
 
-The X.org Foundation X releases are produced by the X.org Foundation.
-X.Org Foundation formed Delaware corporation organized to operate as a 
+The X.Org Foundation X releases are produced by the X.Org Foundation.
+The X.Org Foundation has been formed as a Delaware corporation organized to operate as a 
 scientific charity under IRS code 501(c)(3) to chartered to develop and 
 execute effective strategies which provide world-wide stewardship of the 
-X Window System technology and standards. Membership of the X.Org 
+X Window System technology and standards. Membership in the X.Org 
 Foundation is free to all participants. 
 Applications for Membership are now being accepted, 
 and active participants in the further development of the X Window 
 Technology are invited to complete a
-<htmlurl url="http://www.x.org/XOrg_Foundation_Membership.html" name="membership application">.
-X11R&relvers; codebase is based on the codebase found in XFree86&trade 4.4RC2,
-which in turn was based from the original X Window System implementation.
+<url url="http://www.x.org/XOrg_Foundation_Membership.html" name="membership application">.
+The X11R&relvers; codebase is based on the codebase found in XFree86&trade 4.4RC2,
+which in turn was based on the original X Window System sample implementation
+from the X Consortium and it's successors.
 This release is dedicated to the greater X community, developers
 and users alike.
 
@@ -110,15 +111,12 @@ XFree86&trade; is produced by The XFree86 Project, Inc through the work
 of a group of volunteer independent developers.  The XFree86 Project is
 a non-commercial organisation and XFree86 would not exist without the
 invaluable development contributions of volunteers from around the world.
-The XFree86 Project is
-a non-commercial organisation and XFree86 would not exist without the
-invaluable development contributions of volunteers from around the world.
 
 <![ %snapshot [
 <sect>Redistribution of Snapshots
 <p>
 
-While the X.org Foundation <htmlurl name="License" url="LICENSE.html"> doesn't
+While the X.Org Foundation <htmlurl name="License" url="LICENSE.html"> doesn't
 prohibit vendors and others redistributing binaries of this snapshot
 release, we don't recommend including them in production releases.
 ]]>
@@ -152,7 +150,7 @@ name="License Document" url="LICENSE.html">.  If you find any omissions
 in that document, please contact us with details at
 <email>xf_board@x.org</email>.
 While the current licenses are all open source licenses, the
-X.org Foundation is attempting, with time, to bring as much as 
+X.Org Foundation is attempting, with time, to bring as much as 
 possible of the code's licenses in the distribution into compliance with the 
 <htmlurl name="Debian Free Software Guidelines" 
 url="http://www.debian.org/social_contract#guidelines">.
@@ -160,7 +158,7 @@ url="http://www.debian.org/social_contract#guidelines">.
 <p>
 
 The documentation for this release can be found online at the <url
-name="X.org web site" url="http://wiki.x.org/">.
+name="X.Org web site" url="http://wiki.x.org/">.
 Information about binary distributions and the attendant installation
 instructions can be found in the <htmlurl name="Installation Document"
 url="Install.html">.
@@ -169,33 +167,33 @@ The X11 version numbering system (including historical information)
 can be found in the <htmlurl name="Versions Document" url="Versions.html">.
 
 Additional information may be available at the <url
-name="X.org Foundation Wiki" url="http://wiki.x.org/">.
+name="X.Org Foundation Wiki" url="http://wiki.x.org/">.
 
 <sect>The Public Mailing Lists
 <p>
-Current information about the X.org Foundation public mailing lists 
-is available on <url name="the X.org mailing list page" url="http://www.x.org/XOrg_Foundation_Join_OpenLists.html"> and related desktop technology
+Current information about the X.Org Foundation public mailing lists 
+is available on <url name="the X.Org mailing list page" url="http://www.x.org/XOrg_Foundation_Join_OpenLists.html"> and related desktop technology
 mailing lists can be found on <url name="Freedesktop.org's mailing list page"
 url="http://freedesktop.org/mailman/listinfo">.
 
-<sect>Contributing to the X.org Foundation's X efforts.
+<sect>Contributing to the X.Org Foundation's X efforts.
 <p>
 If you have any new work or enhancements/bug fixes for existing work,
-please <email>xorg@freedestop.org</email> or to our <url
+please send them to <email>xorg@freedesktop.org</email> or to our <url
 name="bug tracking system" url="http://bugzilla.freedesktop.org/"> using
-the xorg compoent.  This will
+the xorg component.  This will
 ensure that they are included in future releases.
 
 <sect>How to get X11R&relvers;
 <p>
 <![ %snapshot; [
-X11R&relvers; can be found from the <url name="X.org Foundation wiki at"
+X11R&relvers; can be found from the <url name="X.Org Foundation wiki at"
 url="http://wiki.x.org">, and at
 mirrors of this server.
 ]]>
 
 <![ %release; [
-X11R&relvers; can be found from the <url name="X.org Foundation wiki at"
+X11R&relvers; can be found from the <url name="X.Org Foundation wiki at"
 url="http://wiki.x.org">, and at
 mirrors of this server.
 Information about obtaining and installing
@@ -220,7 +218,7 @@ gzip -d &lt; &prevrelvers;-&relvers;.diff.gz | patch -p0 -E
 
 Information about getting the source for &prevrelvers can be found in the
 README file for that version, which can be found on the
-<url name="X.org foundation wiki" url="http://wiki.x.org">.
+<url name="X.Org foundation wiki" url="http://wiki.x.org">.
 ]]>
 
 <![ %fullrel [
@@ -380,7 +378,7 @@ package available from the Xorg CVS repository's "doctools" module.
 The X source code for this and all releases/snapshots as well as
 development versions can also be accessed via the Freedesktop.org 
 CVS repository.
-It's also possible to browse the freedesktop CVS repository.
+It's also possible to browse the <url name="freedesktop CVS repository"
 url="http://cvs.freedesktop.org/">.  The CVS tag for this version is
 "&reltag;".
 <![ %notsnapshot [
diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index 57ce243..ad9b495 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -5,7 +5,7 @@
 <article>
 
 <title>Release Notes for X11R&relvers;
-<author>The X.org Foundation
+<author>The X.Org Foundation
 <and>The XFree86 Project, Inc.
 <date>31 March 2004
 
@@ -16,10 +16,10 @@ $ Id: RELNOTES.sgml,v 1.1.4.4.2.2.4.3 2004/03/30 03:55:47 jg Exp $
 <abstract>
 
 These release notes contains information about features and their status in the
-X.org Foundation X11R&relvers; release.
+X.Org Foundation X11R&relvers; release.
 It is based on the XFree86 4.4RC2 RELNOTES document published by 
 The XFree86&trade; Project, Inc.
-There are significant updates and differences in the X.org release
+There are significant updates and differences in the X.Org release
 as noted below.
 </abstract>
 
@@ -35,11 +35,12 @@ stable for 15 years, with only upward compatible additions to the
 core X protocol, a record of stability envied in computing.
 Formal releases of X started with X version 9 from MIT;
 the first commercial X products were based on X version 10.
-The MIT X Consortium and its successor, the X.org Consortium before the
-founding of the X.org Foundation released versions X11R3 through X11R6.6.2.
+The MIT X Consortium and its successors, the X Consortium, the Open Group
+X Project Team, and the X.Org Group released versions X11R3 through X11R6.6,
+before the founding of the X.Org Foundation.
 <p>
-X11R&relvers; is based on the 4.4RC2 codebase, with significant updates,
-noted below.
+X11R&relvers; is based on the merger of the X11R6.6 and XFree86 4.4RC2 
+codebases, with significant updates, noted below.
 <p>
 There will be future maintenance releases in the X11R6.7.x series.
 However, efforts are well underway to split the X distribution into
@@ -54,7 +55,7 @@ Due to the new XFree86 1.1 license introduced in XFree86 4.4 (final),
 later additions to XFree86 may not be incorporated into our codebase.
 We encourage you to submit bug fixes and enhancements to bugzilla.freedesktop.org
 using the xorg product, and discussions on this server take
-place on <email>xorg@freedestkop.org</email>.
+place on <email>xorg@freedesktop.org</email>.
 
 <sect>Introduction to the XFree86 4.x Release Series
 <p>
@@ -107,7 +108,7 @@ The next section describes what is new in the latest version (&relvers;)
 compared with the previous full release (&prevfullrelvers).
 ]]>
 The other sections below describe some of the new features and changes
-between 3.3.x and 4.0.  There are lot's of new features, and we definitely
+between 3.3.x and 4.0.  There are lots of new features, and we definitely
 don't have enough space to cover them all here.
 
 </sect>
@@ -129,9 +130,20 @@ the X source tree.
 <p>
 <itemize>
 
+<item>The final version of the X11R6.7 versions of the X Window System
+       standards and specification documents are included.  Updates since
+       X11R6.6 include a small correction to the numbering of requests in
+       the Shape Extension Protocol specification; the addition of IPv6
+       support to the X11 Protocol, Xlib, XDMCP, and Session Manager
+       specifications; and the addition of the ServerInterpreted Host family
+       to the X11 Protocol and Xlib specifications.
+
+<item>IPv6 support updated to the final X11R6.7 versions of the standards, 
+       including the addition of the ServerInterpreted Host family for xhost 
+       style authentication.  See the IPv6 section below for further details.
 
 <item>Only files without the new XFree86 1.1 license are included in the
-       X11R&relvers; release. Additionally, X.org will be attempting,
+       X11R&relvers; release. Additionally, X.Org will be attempting,
        when possible, to contact copyright holders of 
        material in the distribution when those
        copyrights do not follow the Debian Free Software guidelines
@@ -141,7 +153,7 @@ the X source tree.
        the use of a trademark,
        so the documentation, error message, name of the X executable,
        configuration file name, etc., have all been changed to
-       avoid confusion of X.org's implementation with the XFree86&trade; 
+       avoid confusion of X.Org's implementation with the XFree86&trade; 
        trademarked implementation. Some of the changes made include:
        <itemize>
           <item> The name of the X server is Xorg, rather than XFree86.
@@ -159,7 +171,7 @@ the X source tree.
           <item>All messages emitted by the server in the log were
                 updated to reflect the change in name.
           <item>The module loader was modified to accept either
-                XFree86 generated modules or X.org generated modules.
+                XFree86 generated modules or X.Org generated modules.
           <item>Manual pages and other documentation was updated.
        </itemize>
 <item>Projective affine transforms and
@@ -178,7 +190,7 @@ the X source tree.
 <item>Fontconfig will no longer be installed by default since that
        has often/usually resulted in overwriting more recent versions.
        The fontconfig version 2.2.2 shipped in X11R&relvers;
-       needs to be build to allow programs in the tree to build that
+       needs to be built to allow programs in the tree to build that
        depend on it, but those programs will run fine using installed
        versions of fontconfig. If you do want to install the version
        shipped in X11R&relvers; add:
@@ -189,19 +201,19 @@ the X source tree.
 <item>Freetype was updated to version 2.1.7. 
        But installing freetype from X distributions would often or
        usually result in the replacement or use of "stale" versions 
-       of freetype. On Linux, FreeBSD, and SCO5, therefore, X11R&relvers;
+       of freetype. On Linux, FreeBSD, Solaris 10, and SCO5, therefore, X11R&relvers;
        will by default use the version of freetype2 that is installed
        on the system. If your system doesn't come with an installed
        freetype2 and you wish to use the version supplied with this
        distribution, please add:
        <tscreen><verb>  #define HasFreetype2 NO </verb></tscreen> to config/cf/host.def. Additonally, the default font
-       renderer for Truetype that is loaded by the X server was changed
+       renderer for TrueType that is loaded by the X server was changed
        to freetype.
 
 <item>During the build, the version of expat that is
        installed on the system is used by default on Microsoft
        Windows, FreeBSD, Linux and SCO5.
-       If your system doesn't come with an installed expat and you whish to 
+       If your system doesn't come with an installed expat and you wish to 
        use the version supplied with this tree please add:
        <tscreen><verb> #define HasExpat NO </verb></tscreen> to 
        config/cf/host.def. <url name="Libexpat's" 
@@ -209,7 +221,7 @@ the X source tree.
 
 <item>During build the version of zlib that is installed on the system
         is used by default on OpenBSD, FreeBSD, Mac OS (Darwin), 
-        Microsoft Windows (Cygwin), Linux, SUN Solaris, and SCO5. 
+        Microsoft Windows (Cygwin), Linux, Sun Solaris, and SCO5. 
 	If your system doesn't come with an installed zlib and you wish to 
         use the version supplied with this tree please add:
         <tscreen><verb>#define HasZlib NO </verb></tscreen> to 
@@ -238,7 +250,7 @@ the X source tree.
        Similarly, libxml2's remains were removed, as it is not used
        at all in the distribution.
 
-<item>The new fontstoft utility to convert .bdf/.pcf fonts to .ttf
+<item>The new fonttosfnt utility to convert .bdf/.pcf fonts to .ttf
        format was removed as it is not yet ready and working.
        Please turn to
        <url name="freedesktop.org's X Applications"
@@ -286,7 +298,7 @@ at http://x.cygwin.com/devel/server/changelog-full.html]
 <item>Initial version of indirect 3D acceleration by mapping GLX to Win32's
        OpenGL implementation. (Alexander Gottwald, Harold L Hunt II)
 
-<item>Allow clipboard integration to work seamlessly with Xdmcp.(Harold L Hunt II)
+<item>Allow clipboard integration to work seamlessly with Xdmcp. (Harold L Hunt II)
 
 <item>Fix clipboard integration to stop stealing ownership of the selection
        X (caused text to be unhighlighted in emacs, xterm, etc.). (Harold L
@@ -414,7 +426,7 @@ at http://x.cygwin.com/devel/server/changelog-full.html]
 <sect1>IPv6 support
 <p>
 X11R&relvers; supports IPv6, based on the code contributed by Sun
-Microsystems, Inc. to X.Org. See <url name="X.org's document"
+Microsystems, Inc. to X.Org. See <url name="X.Org's document"
 url="http://www.x.org/IPV6_Specific_Changes.html"> for a detailed list
 of what these changes are and how your system is affected by them.
 <p>
@@ -452,6 +464,19 @@ addresses but a new release of the protocol, XDM-AUTHORIZATION-2 has
 been designed; this though is yet to be  implemented.  By default 
 builds do not enable the XDM-AUTHORIZATION-1 code.
 
+<sect2>ServerInterpreted host authentication
+<p>
+The ServerInterpreted host family was added in response to comments received
+during the X11 over IPv6 standards public review period.  This family allows
+registration of new subtypes and implementation of them by modifications 
+solely to the X server, without having to modify clients such as xhost or the
+Xlib or X protocol standards.  In the initial X11R6.7.0 release, two
+subtypes are supported - "hostname" for hostnames resolved by the 
+server at connection time to better support dynamic DNS &amp; mobile 
+IP, and "ipv6" to allow IPv6 literal addresses, including in the future,
+scoped addresses.  For more information on these features, see the
+xhost manual page, X11 Protocol and Xlib standards, and the documents
+in xc/doc/specs/SIAddresses.
 
 <sect1>X Server and Extension Updates
 
@@ -869,8 +894,8 @@ running 'xset q' from within your X session.
 
 <sect>Overview of X11R6.7.x
 <p>
-X11R6.7.x has a single X server binary called <tt>Xorg</tt>.  This
-binary can either have one or more video and input drivers linked in
+On most platforms, X11R6.7.x has a single X server binary called <tt>Xorg</tt>.
+This binary can either have one or more video and input drivers linked in
 statically, or more usually, dynamically, and in that manner load the
 video drivers, input drivers, and other modules that are needed.
 
@@ -1099,7 +1124,7 @@ file is included in the <htmlurl name="Xft(3)" url="Xft.3.man"> man page.
 
 Only three applications have been modified in X11R&relvers; to work 
 with the Render extension and the Xft and FreeType libraries to provide 
-anti-aliased text.  Xterm, xditview and x11perf.  Migration of other 
+anti-aliased text: xterm, xditview and x11perf.  Migration of other 
 applications may occur in future releases.
 
 <p>
@@ -1353,13 +1378,14 @@ or the 'cvs log' information for individual source files.
   <descrip>
   <tag>Mac OS X enhancements:</tag>Torrey T. Lyons, John Harper.
   <tag>Cygwin/X enhancements:</tag>Harold L Hunt II,
+  <tag>IPv6 and ServerInterpreted enhancements:</tag>Alan Coopersmith
   <tag>Release Engineering:</tag>Egbert Eich
   <tag>Documentation updates:</tag>Jim Gettys, Keith Packard
   <tag>Updated render:</tag>Keith Packard
   <tag>Updated Xft:</tag>Keith Packard
   <tag>Updated fontconfig:</tag>Keith Packard
   </descrip>
-Note: the list celow does not contain acknowlegements to those working on the new modular X release as their work is not present in this release.
+Note: the list below does not contain acknowlegements to those working on the new modular X release as their work is not present in this release.
 Patches and other submissions (in alphabetical order):
 Paul Anderson,
 Michael Bax,
@@ -1400,7 +1426,7 @@ Nicholas Wourms.
 
 <tag>Tinderbox setup:</tag>Jim Gettys, John Dennis
 
-<tag>X.org Hosting:</tag><url name="The Open Group"
+<tag>X.Org Hosting:</tag><url name="The Open Group"
 url="http://www.tog.org/">.
 
 <tag>Freedesktop.org Hosting:</tag><url name="Portland State University"
@@ -1667,7 +1693,7 @@ Hui Yu.
 <tag>Docbook/XML conversion:</tag>John Himpel and the XFree86 documentation
 team.
 
-<tag>Webmaster:</tag>Georgina O. Economou
+<tag>XFree86 Webmaster:</tag>Georgina O. Economou
 
 <tag>XFree86 Hosting:</tag><url name="Internet Systems Consortium, Inc"
 url="http://www.isc.org/">.
diff --git a/sgml/Solaris.sgml b/sgml/Solaris.sgml
index ba85f63..f954ae6 100644
--- a/sgml/Solaris.sgml
+++ b/sgml/Solaris.sgml
@@ -6,7 +6,7 @@
 <!-- Title information -->
 <title>Information for Solaris
 <author>David Holland, modified by Marc Aurele La France
-<date>2001 October 01
+<date>2004 April 02
 
 <ident>
 $Id$.
@@ -18,7 +18,8 @@ $Id$.
 <!-- Begin the document -->
 <sect>The VT-switching sub-system in Solaris x86<p>
 The virtual terminal sub-system is a undocumented, and unsupported feature of
-Solaris x86.
+Solaris x86 releases 2.1 through 7.  It is no longer present in Solaris 8 and
+later releases.
 Therefore if you use virtual terminals, you do so at <bf>YOUR OWN RISK</bf>.<p>
 Virtual terminals are not available in Solaris SPARC, and their availability
 has been removed in Solaris8 x86.<p>
@@ -89,7 +90,7 @@ however a number of <tt>ioctl()</tt> calls are broken.<p>
 <sect>Notes for building X11R&relvers; on Solaris<p>
 <enum>
 <item>
-Both GCC, and ProWorks are supported by X11R&relvers;.
+Both GCC, and the Sun Studio compilers are supported by X11R&relvers;.
 The minimum recommended GCC release is 2.7.2.
 Some earlier GCC's are known to not work and should be avoided.<p>
 You should also make certain your version of GCC predefines `sun'.
@@ -109,7 +110,7 @@ strange hangs.
 Most notably image viewers such as xv-3.10 exhibit this problem.<p>
 It is recommended that you set ThreadedX in <tt>~xc/config/cf/host.def</tt> to
 NO, if you are using GCC.
-ProWorks does not have this problem.
+Sun's compilers do not have this problem.
 Whether this behaviour still exists with newer GCC's has not been verified.<p>
 <item>
 To build X11R&relvers; with GCC you need gcc and (optionally) c++filt from GNU
@@ -119,8 +120,8 @@ You might need to setup a /opt/SUNWspro/bin directory containing symbolic links
 named <tt/cc/, <tt/CC/, and <tt/c++filt/ pointing respectively to the actual
 <tt/gcc/, <tt/g++/ and <tt/c++filt/ commands.<p>
 <item>
-If you are using ProWorks to compile the X11R&relvers; distribution, you need to
-modify your PATH appropriately so the ProWorks tools are available.
+If you are using Sun compilers to compile the X11R&relvers; distribution, you need to
+modify your PATH appropriately so the Sun compiler tools are available.
 Normally, they should be in <tt>/opt/SUNWspro/bin</tt><p>
 <item>
 You <bf>MUST</bf> put <tt>/usr/ccs/bin</tt> at the front of your PATH.
@@ -158,12 +159,12 @@ so:<p>
 If you have made the virtual terminal devices you do not need to specify the VT
 to run the Xserver on.<p>
 <item>
-For Solaris you will probably want to set your LD_LIBRARY_PATH to
+For old releases of Solaris you will probably want to set your LD_LIBRARY_PATH to
 <tt>/usr/X11R6/lib:/usr/openwin/lib:/usr/dt/lib</tt>.
 Including <tt>/usr/X11R6/lib</tt> in your LD_LIBRARY_PATH is probably not
 necessary, however it doesn't hurt. :)<p>
 Including <tt>/usr/openwin/lib</tt> in the LD_LIBRARY_PATH is recommended
-because some Sun supplied binaries were not compiled with LD_RUN_PATH set
+on older releases because some Sun supplied binaries were not compiled with LD_RUN_PATH set
 properly at compile time.<p>
 Motif and CDE applications may require <tt>/usr/dt/lib</tt> in your
 LD_LIBRARY_PATH too.