3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE

2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).

6 files changed, 670 insertions, 76 deletions

diff --git a/sgml/LICENSE.sgml b/sgml/LICENSE.sgml
index 954fd6f..bd494eb 100644
--- a/sgml/LICENSE.sgml
+++ b/sgml/LICENSE.sgml
@@ -5,52 +5,122 @@
 <article>
 <title>Licenses</title>
 <author>Compiled by The XFree86 Project</author>
-<date>December 2003</date>
+<date>February 2004</date>
 
 <ident>
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.19 2003/12/12 00:42:32 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.19 2003/12/12 00:42:32 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.25 2004/02/15 02:16:48 dawes Exp $
 </ident>
 
 <sect>Introduction
 <p>
-XFree86&trade; code without an explicit copyright is covered by the
-XFree86 copyright/license as shown in the next section.  Portions of
-code are covered by other licenses/copyrights, as shown in subsequent
-sections.  In all cases, see individual source files for specific details,
+XFree86&trade; code without an explicit copyright or not explicitly
+marked as being in the public domain is covered by the XFree86
+copyright/license as shown in the next section.  Portions of code are
+covered by other licenses/copyrights, as shown in subsequent sections.
+In all cases, see individual source files for specific license details,
 copyright owner information, and copyright dates.
 
-<sect>XFree86 License
+<sect>XFree86 Project Licensing Policy
 <p>
+The XFree86 Project's basic licensing philosophy has always been summed
+up as "You can do what you like with the code except claim you wrote
+it."  Expressed more formally, it means that the licenses acceptable
+for code that makes up XFree86 must meet the following conditions:
 
+<itemize>
+<item>The code must be redistributable by others in either source or
+	binary form.
+
+<item>Others must be permitted to modify the code, and to distribute
+	modified code or derived code without being required to pay a
+	licensing fee or other financial consideration to the copyright
+	holder.
+
+<item>Others must be permitted to distribute binary-only forms of the
+	code if they which to do so.
+</itemize>
+
+A range of Open Source and Free Software licenses meet these conditions.
+The licenses in this document are examples of acceptable licenses.
+Contributors to XFree86 are encouraged to choose the license type that
+best suits them.  If you have any questions about whether a specific license
+fits in with the XFree86 licensing policy, please contact us.
+
+
+<sect>XFree86 License (version 1.1)
 <p>
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+Copyright (C) 1994-2004 The XFree86 Project, Inc.<newline>
+All rights reserved.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  1.  Redistributions of source code must retain the above copyright
+      notice, this list of conditions, and the following disclaimer.
 
-Except as contained in this notice, the name of the XFree86 Project shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from the
-XFree86 Project.
+  2.  Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer
+      in the documentation and/or other materials provided with the
+      distribution, and in the same place and form as other copyright,
+      license and disclaimer information.
+
+  3.  The end-user documentation included with the redistribution,
+      if any, must include the following acknowledgment: "This product
+      includes software developed by The XFree86 Project, Inc
+      (http://www.xfree86.org/) and its contributors", in the same
+      place and form as other third-party acknowledgments.  Alternately,
+      this acknowledgment may appear in the software itself, in the
+      same form and location as other such third-party acknowledgments.
+
+  4.  Except as contained in this notice, the name of The XFree86
+      Project, Inc shall not be used in advertising or otherwise to
+      promote the sale, use or other dealings in this Software without
+      prior written authorization from The XFree86 Project, Inc.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <sect>X/MIT Licenses
 <p>
+<sect1>MIT
+<p>
+
+Copyright <it>&lt;date&gt;</it> <it>&lt;Copyright Holder&gt;</it>
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of <it>&lt;Copyright Holder&gt;</it>
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  <it>&lt;Copyright
+Holder&gt;</it> makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+<it>&lt;COPYRIGHT HOLDER&gt;</it> DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL <it>&lt;COPYRIGHT HOLDER&gt;</it>  BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 <sect1>X Consortium
 <p>
 Copyright (C) <it>&lt;date&gt;</it> X Consortium
@@ -105,12 +175,44 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 
+<sect1>XFree86 License (version 1.0)
+<p>
+XFree86 code without an explicit copyright is covered by the following
+copyright/license:
+
+<p>
+Copyright (C) 1994-2004 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
 <sect>Berkeley-style Licenses
 <p>
 The Berkeley-style licenses are similar to the X/MIT-style licenses,
-except that they include conditions requiring attributions accompany
-binary distributions and/or are included with end user documetation
-and/or advertising material.
+except that they may include conditions requiring copies of the licenses
+and copyright notices accompany binary distributions, and in some cases
+that specific attributions accompany binary distributions and/or are
+included with end user documentation and/or advertising material.
 
 <sect1>General
 <p>
@@ -331,6 +433,28 @@ by Ben Collver &lt;collver1@attbi.com&gt;
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+<sect1>Keith Packard
+<p>
+Copyright &copy; 2001 Keith Packard, member of The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
 <sect1>Theo de Raadt and Damien Miller
 <p>
 Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
@@ -483,6 +607,40 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
+<sect1>Thomas Winischhofer
+<p>
+
+Copyright (C) 2001-2004 Thomas Winischhofer
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+<enum>
+<item>Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+<item>Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+<item>All advertising materials mentioning features or use of this software
+must display the following acknowledgement: This product includes
+software developed by Thomas Winischhofer.
+<item>The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+</enum>
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
 <sect1>X-Oz Technologies
 <p>
 
@@ -1261,4 +1419,54 @@ You can also contact us individually at:
     Werner Lemberg &lt;werner.lemberg@freetype.org&gt;
 
 
+<sect>Bitstream Vera Fonts Copyright
+<p>
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream<newline>
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+
+
 </article>
diff --git a/sgml/OpenBSD.sgml b/sgml/OpenBSD.sgml
index 8df7c96..e39aa46 100644
--- a/sgml/OpenBSD.sgml
+++ b/sgml/OpenBSD.sgml
@@ -9,8 +9,7 @@ Matthieu Herrb
 <Date>Last modified on: 9 December 2003
 
 <ident>
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.32 2003/12/12 03:25:05 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.32 2003/12/12 03:25:05 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.33 2004/02/15 02:16:48 dawes Exp $
 </ident>
 
 <toc>
@@ -51,7 +50,7 @@ XFree86 also builds on other OpenBSD architectures. See section
 <sect>Bug Reports for This Document
 
 <p>
-Use the XFree86 bugzilla at <url url="http://bugs.xfree86.org"> 
+Use the XFree86 Bugzilla at <url url="http://bugs.xfree86.org"> 
 to submit comments or suggestions about this file.
 
 <sect>New OS dependent features
diff --git a/sgml/README.sgml b/sgml/README.sgml
index 0e828fd..4baac6a 100644
--- a/sgml/README.sgml
+++ b/sgml/README.sgml
@@ -13,11 +13,10 @@
 
 <title>README for XFree86&tm; &relvers;
 <author>The XFree86 Project, Inc
-<date>18 December 2003
+<date>14 February 2004
 
 <ident>
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.138 2003/12/19 04:26:12 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.138 2003/12/19 04:26:12 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.139 2004/02/15 02:16:49 dawes Exp $
 </ident>
 
 <abstract>
@@ -54,9 +53,9 @@ XFree86 4.x series.
 ]]>
 
 <![ %snapshot [
-XFree86 &relvers; is a pre-release snapshot of XFree86 &nextfullrelvers;.
+XFree86 &relvers; is a pre-release snapshot of XFree86 &fullrelvers;.
 <![ %relcandidate [
-This snapshot is release candidate &rcnum; for version &nextfullrelvers;.
+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
@@ -66,7 +65,7 @@ to report your findings to the public XFree86 mailing list:
 
 <![ %relcandidate [
 XFree86 &relvers; is a feature-complete snapshot of XFree86
-&nextfullrelvers;.
+&fullrelvers;.
 ]]>
 ]]> 
 
@@ -106,17 +105,29 @@ release, we don't recommend including them in production releases.
 <p>
 
 XFree86 source code is covered by many licenses.  All of these licenses
-have in common the fact that they do not impose conditions on the
-modification or redistribution or either source code or binaries other
-than requiring that the copyright and/or license notices are left intact,
-and in some cases, that attributions are included with documentation
-accompanying binaries.  Most of these licenses are based on the MIT or
-BSD licenses, and all of them are consistent with the <htmlurl name="Open
-Source definition" url="http://www.opensource.org/docs/definition.php">.
-
-Copyright and Licensing information for XFree86, including the attributions
-required by some of the licenses for binary distributions, can be found
-in the <htmlurl name="License Document" url="LICENSE.html">.
+have in common the fact that they do not impose significant conditions
+on the modification or redistribution or either source code or binaries
+beyond requiring one or more of the following:
+
+<enum>
+<item>Copyright and/or license notices are left intact.
+<item>Copyright and/or license notices are reproduced verbatim in
+	documentation accompanying binary distributions.
+<item>Attributions are included with documentation accompanying binaries.
+</enum>
+
+Most of these licenses are based on the MIT, X Consortium, or BSD
+(original and revised) licenses.  All of them are consistent with the
+<htmlurl name="Open Source Definition"
+url="http://www.opensource.org/docs/definition.php">, and most are
+consistent with the Free Software Foundation's <htmlurl name="Free
+Software Definition" url="http://www.fsf.org/philosophy/free-sw.html">.
+
+Copyright and Licensing information for XFree86, including the reproduction
+of copyright and/or license notices and attributions required by some
+of the licenses for binary distributions, can be found in the <htmlurl
+name="License Document" url="LICENSE.html">.  If you find any omissions
+in that document, please contact us with details.
 
 <sect>Pointers to additional information
 <p>
diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index b40a5bf..5d91e7f 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -6,11 +6,10 @@
 
 <title>Release Notes for XFree86&trade; &relvers;
 <author>The XFree86 Project, Inc
-<date>18 December 2003
+<date>14 February 2004
 
 <ident>
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.89 2003/12/19 04:26:12 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.89 2003/12/19 04:26:12 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.110 2004/02/15 19:15:45 dawes Exp $
 </ident>
 
 <abstract>
@@ -45,7 +44,7 @@ and &relvers;.  Please check there first before downloading &relvers;.
 XFree86 4.4 introduces an automatic configuration mechanism for the
 XFree86 server.  This makes it possible to start XFree86 in a usable
 way without first creating a configuration file.  The initial automatic
-configuration support is currently targetted towards Linux and FreeBSD.
+configuration support is currently targeted towards Linux and FreeBSD.
 Automatic configuration will be supported on other platforms in future
 releases.  If you're running Linux or FreeBSD, try it out if you don't
 already have a working <tt>XF86Config</tt> file.  If you want to customise
@@ -59,7 +58,7 @@ a platform that it isn't currently supported on, try one of the older
 methods for getting started.
 
 XFree86 comes with a graphical configuration tool called "<tt>xf86cfg</tt>".
-It also has a text mode interface.  It can be used to create an iniital
+It also has a text mode interface.  It can be used to create an initial
 configuration file, and to customise existing configurations.
 
 Next in the order of configuration preferences is to make use of the
@@ -129,13 +128,13 @@ don't have enough space to cover them all here.
 	<item>Support added to the nv driver for the GeForce FX 5700,
 		which didn't work with XFree86 4.3.
 
-	<item>The driver now does a much better job of autodetecting
+	<item>The driver now does a much better job of auto-detecting
 		which connector of dual output cards the monitor is
 		attached to, which should reduce or eliminate the need
 		for manual XF86Config overrides.
 
 	<item>The 2D acceleration for TNT and GeForce was completely
-		rewritten.  Performance should be substantiallly improved.
+		rewritten.  Performance should be substantially improved.
 
 	<item>TNT and GeForce cards have a new Xv PutImage adaptor which
 		does scaled YUV bit blits.
@@ -176,7 +175,7 @@ don't have enough space to cover them all here.
 <p>
 XFree86 4.4 supports IPv6, based on the code contributed by Sun
 Microsystems to X.Org. See 
-<url name="X.org's document" url="http://www.x.org/IPV6_Specific_Changes.html"> for a detailled list of the changes. 
+<url name="X.org's document" url="http://www.x.org/IPV6_Specific_Changes.html"> for a detailed list of the changes. 
 
 <sect2>Protocol names and aliases. 
 <p>
@@ -196,7 +195,7 @@ Or you can force a IPv6 connection by setting <bf>DISPLAY</bf> to
 The IPv6 XDMCP code is not enabled by default on platforms that don't 
 support binding a IPv6 socket to a IPv4 address. 
 <p>
-The XDM-AUTHORIZATION-1 authentification scheme does not support IPv6
+The XDM-AUTHORIZATION-1 authentication scheme does not support IPv6
 addresses. A new release of the protocol, XDM-AUTHORIZATION-2 has been
 designed, but is not implemented yet. 
 Note that  by default XFree86 builds do not enable the XDM-AUTHORIZATION-1
@@ -275,7 +274,7 @@ scroll-back(1, page-2)
 
 	Improved Font Handling:
 	<itemize>
-	<item>Document in xterm's manpage how to use XFree86 ":unscaled"
+	<item>Document in xterm's manual page how to use XFree86 ":unscaled"
 		keyword to suppress scaling of bold fonts.
 
 	<item>Improved logic for deriving bold fontname from normal
@@ -383,6 +382,24 @@ scroll-back(1, page-2)
 	and to fix some bugs.  The "xtt" backend will be dropped in the
 	next release in favour of the updated unified "freetype" backend.
 
+	<itemize>
+	<item>The new "freetype" backend has the improved "very lazy" metric
+		calculation method which enables super-fast loading of
+		proportional CJKV fonts.
+
+	<item>All of the servers, including xfs, Xnest, Xprt, Xvfb, the
+		Cygwin-XFree86 server (as well as the XFree86 server)
+		can handle the perfect TTCap options.
+
+	</itemize>
+
+<item>The Compose file processing mechanism has been improved and made
+	more flexible.  See the <ref id="compose" name="Xlib Compose
+	file support and extensions section below">.
+
+<item>The Bitstream Vera TrueType fonts that Bitstream, Inc donated to
+	the Gnome Foundation are included with this release.
+
 </itemize>
 
 <sect1>OS Support Updates
@@ -408,6 +425,11 @@ scroll-back(1, page-2)
 
 <item>Experimental support added for GNU/KFreeBSD and GNU/KNetBSD systems.
 
+<item>SCO OpenServer support updates.  XFree86 4.4 now works on Release
+5.0.7 with Maintenance Pack 1, or on prior releases through Release
+5.0.4.  Please consult the <htmlurl name="README.SCO" url="SCO.html">
+file for details.
+
 </itemize>
 
 A more complete list of changes can be found in the CHANGELOG that is
@@ -971,6 +993,67 @@ What is included in 4.x:
 
 </itemize>
 
+<sect1>Xlib Compose file support and extensions <label id="compose">
+<p>
+
+A more flexible Compose file processing system was added to Xlib in
+XFree86 4.4.0.  The compose file is searched for in the following order:
+
+<enum>
+<item>If the environment variable <bf>$XCOMPOSEFILE</bf> is set, its value
+is used as the name of the Compose file.
+
+<item>If the user's home directory has a file named "<tt>.XCompose</tt>", it
+is used as the Compose file.
+
+<item>The old method is used, and the compose file is
+"&lt;<it>xlocaledir</it>&gt;<tt>/</tt>&lt;<it>localename</it>&gt;<tt>/Compose</tt>".
+
+</enum>
+
+Compose files can now use an "include" instruction.  This allows local
+modifications to be made to existing compose files without including all
+of the content directly.  For example, the system's iso8859-1 compose file
+can be included with a line like this:
+
+<tscreen><verb>
+include "/usr/X11R6/lib/X11/locale/iso8859-1/Compose"
+</verb></tscreen>
+
+There are two substitutions that can be made in the file name of the
+include instruction.  <bf>%H</bf> expands to the user's home directory
+(the <bf>$HOME</bf> environment variable), and <bf>%L</bf> expands to the
+name of the locale specific Compose file (i.e., 
+"&lt;<it>xlocaledir</it>&gt;<tt>/</tt>&lt;<it>localename</it>&gt;<tt>/Compose</tt>").
+
+For example, you can include in your compose file the default Compose file
+by using:
+
+<tscreen><verb>
+include "%L"
+</verb></tscreen>
+
+and then rewrite only the few rules that you need to change.  New compose
+rules can be added, and previous ones replaced.
+
+Finally, it is no longer necessary to specify in the right part of a rule
+a locale encoded string in addition to the keysym name.  If the string is
+omitted, Xlib figures it out from the keysym according to the current
+locale.  I.e., if a rule looks like:
+
+<tscreen><verb>
+<dead_grave> <A> : "\300" Agrave
+</verb></tscreen>
+
+the result of the composition is always the letter with the "\300" code.
+But if the rule is:
+
+<tscreen><verb>
+<dead_grave> <A> : Agrave
+</verb></tscreen>
+
+the result depends on how Agrave is mapped in the current locale.
+
 <sect1>Luxi fonts from Bigelow and Holmes <label id="luxi">
 <p>
 
@@ -1009,6 +1092,300 @@ please contact
 <p>
 -->
 
+<sect>Credits
+<p>
+
+<![ %snapshot [
+<bf>THIS IS A DRAFT OF THE XFree86 &fullrelvers; CREDITS SECTION.</bf>
+If you find missing credits, incorrect attributions, or other errors, please
+send details to <email>devel@XFree86.org</email>.
+]]>
+
+This section lists the credits for the XFree86 &relvers; release.  For
+a more detailed breakdown, refer to the CHANGELOG file in the XFree86
+source tree, the <url name="cvs-commit archives"
+url="http://www.mail-archive.com/cvs-commit@xfree86.org/maillist.html">,
+or the 'cvs log' information for individual source files.
+
+<descrip>
+<tag>New Features, Enhancements and Updates:</tag>
+  <descrip>
+  <tag>IPv6 support:</tag>Alan Coopersmith, Fabio Massimo Di Nitto,
+	Marc Aurele La France, Matthieu Herrb, David H. Dawes.
+  <tag>NVIDIA 'nv' driver rewrite:</tag>Mark Vojkovich.
+  <tag>SiS driver development:</tag>Thomas Winischhofer.
+  <tag>New VIA video driver:</tag>VIA, Alan Cox, Luc Verhaegen, Thomas
+	Hellstr&ouml;m.
+  <tag>Intel 'i810' driver fixes and stability improvements:</tag>Egbert Eich,
+	David H. Dawes, Christian Zietz
+  <tag>Improved and more flexible Compose system:</tag>Ivan Pascal.
+  <tag>Automatic configuration for the XFree86 server:</tag>David H. Dawes.
+  <tag>Reworked FreeType font backend module:</tag>Chisato Yamauchi and
+	the After X-TT Project.
+  <tag>Xterm fixes, maintenance and enhancements:</tag>Thomas E. Dickey.
+  <tag>Mac OS X enhancements:</tag>Torrey T. Lyons, John Harper.
+  <tag>GNU/Hurd updates and preliminary GNU/KFreeBSD and GNU/KNetBSD
+	support:</tag> Robert Millan.
+  <tag>SCO support updates:</tag>Kean Johnston.
+  <tag>Bitstream Vera fonts:</tag>Bitstream, Inc, and the Gnome Foundation.
+  </descrip>
+<tag>Integration:</tag>
+  <descrip>
+  <tag>General Integration of Submissions:</tag>Egbert Eich, David H. Dawes,
+	Ivan Pascal, Alan Hourihane, Matthieu Herrb.
+  <tag>DRI Integration:</tag>Alan Hourihane.
+  </descrip>
+<tag>Release Engineering:</tag>David H. Dawes.
+
+<tag>Patches and other submissions (in alphabetical order):</tag>
+Roi a Torkilsheyggi,
+Dave Airlie,
+Andrew Aitchison,
+Marco Antonio Alvarez,
+Alexandr Andreev,
+Jack Angel,
+Eric Anholt,
+Ani,
+Juuso &Aring;berg,
+Sergey Babkin,
+Alexey Baj,
+Bang Jun-Young,
+Uberto Barbini,
+Matthew W. S. Bell,
+Vano Beridze,
+Hiroyuki Bessho,
+Andrew Bevitt,
+Christian Biere,
+Martin Birgmeier,
+Jakub Bogusz,
+Le Hong Boi,
+Paul Bolle,
+Charl Botha,
+Stanislav Brabec,
+Eric Branlund,
+Rob Braun,
+Peter Breitenlohner,
+Michael Breuer,
+Kevin Brosius,
+Frederick Bruckman,
+Oswald Buddenhagen,
+Nilg&uuml;n Belma Bug&uuml;ner,
+Julian Cable,
+Yukun Chen,
+Ping Cheng,
+Juliusz Chroboczek,
+Fred Clift,
+Alan Coopersmith,
+Martin Costabel,
+Alan Cox,
+Michel D&auml;nzer,
+David Dawes,
+Leif Delgass,
+Richard Dengler,
+John Dennis,
+Thomas Dickey,
+Randy Dunlap,
+Chris Edgington,
+Paul Eggert,
+Paul Elliott,
+Emmanuel,
+Visanu Euarchukiati,
+Mike Fabian,
+Rik Faith,
+Brian Feldman,
+Wu Jian Feng,
+Kevin P. Fleming,
+Jose Fonseca,
+Hugues Fournier,
+Miguel Freitas,
+Quentin Garnier,
+B&oslash;rre Gaup,
+Michael Geddes,
+Frank Giessler,
+Hansruedi Glauser,
+Wolfram Gloger,
+Alexander Gottwald,
+Guido Guenther,
+Ralf Habacker,
+Bruno Haible,
+Lindsay Haigh,
+John Harper,
+James Harris,
+Mike A. Harris,
+Bryan W. Headley,
+John Heasley,
+Thomas Hellstr&ouml;m,
+Matthieu Herrb,
+Jonathan Hough,
+Alan Hourihane,
+Joel Ray Holveck,
+Harold L Hunt II,
+Ricardo Y. Igarashi,
+Mutsumi ISHIKAWA ,
+Tsuyoshi ITO,
+Kean Johnston,
+Nicolas JOLY,
+Phil Jones,
+Roman Kagan,
+Theppitak Karoonboonyanan,
+Etsushi Kato,
+Koike Kazuhiko,
+Aidan Kehoe,
+Juergen Keil,
+Andreas Kies,
+Thomas Klausner,
+Mario Klebsch,
+Egmont Koblinger,
+Vlatko Kosturjak,
+Kusanagi Kouichi,
+Peter Kunzmann,
+Nick Kurshev,
+Mashrab Kuvatov,
+Marc La France,
+Radics Laszlo,
+Zarick Lau,
+Nolan Leake,
+Michel Lespinasse,
+Noah Levitt,
+Dave Love,
+H.J. Lu,
+Lubos Lunak,
+Sven Luther,
+Torrey T. Lyons,
+Calum Mackay,
+Paul Mackerras,
+Roland Mainz,
+Kevin Martin,
+Michal Maruska,
+Kensuke Matsuzaki,
+maxim,
+Stephen McCamant,
+Ferris McCormick,
+Luke Mewburn,
+Nicholas Miell,
+Robert Millan,
+Hisashi MIYASHITA,
+Gregory Mokhin,
+Patrik Montgomery,
+Joe Moss,
+Josselin Mouette,
+Frank Murphy,
+Reiko Nakajima,
+Paul Nasrat,
+Dan Nelson,
+Bastien Nocera,
+Alexandre Oliva,
+Hideki ONO,
+Peter Osterlund,
+Sergey V. Oudaltsov,
+S&eacute;amus &Oacute; Ciardhu&aacute;in,
+Bob Paauwe,
+Paul Pacheco,
+Tom Pala,
+Ivan Pascal,
+T. M. Pederson,
+Earle F. Philhower III,
+Nils Philippsen,
+Manfred Pohler,
+Alexander Pohoyda,
+Arnaud Quette,
+Jim Radford,
+Dale Rahn,
+Lucas Correia Villa Real,
+Ren&eacute; Rebe,
+Tyler Retzlaff,
+Sebastian Rittau,
+Tim Roberts,
+Alastair M. Robinson,
+Branden Robinson,
+Daniel Rock,
+Ian Romanick,
+Bernhard Rosenkraenzer,
+M&aring;ns Rullg&aring;rd,
+Andriy Rysin,
+Supphachoke Santiwichaya,
+Pablo Saratxaga,
+Matthias Scheler,
+Jens Schweikhardt,
+Danilo Segan,
+Shantonu Sen,
+Stas Sergeev,
+JungShik Shin,
+Jungshik Shin,
+Nikola Smolenski,
+Andreas Stenglein,
+Paul Stewart,
+Alexander Stohr,
+Alan Strohm,
+Will Styles,
+James Su,
+Mike Sulivan,
+Ville Syrjala,
+Slava Sysoltsev,
+Akira TAGOH,
+Toshimitsu Tanaka,
+Akira Taniguchi,
+Owen Taylor,
+Neil Terry,
+Jonathan Thambidurai,
+John Tillman,
+Adam Tlalka,
+Linus Torvalds,
+Christian Tosta,
+Warren Turkal,
+Stephen J. Turnbull,
+Ted Unangst,
+Mike Urban,
+Simon Vallet,
+Thuraiappah Vaseeharan,
+Luc Verhaegen,
+Yann Vernier,
+Michail Vidiassov,
+Sebastiano Vigna,
+Mark Vojkovich,
+Stephane Voltz,
+Boris Weissman,
+Keith Whitwell,
+Thomas Winischhofer,
+Eric Wittry,
+Kim Woelders,
+Roy Wood,
+Jason L. Wright,
+Joerg Wunsch,
+Chisato Yamauchi,
+Hui Yu.
+  
+<tag>Docbook/XML conversion:</tag>John Himpel and the XFree86 documentation
+team.
+
+<tag>Webmaster:</tag>Georgina O. Economou
+
+<tag>Hosting:</tag><url name="Internet Systems Consortium, Inc"
+url="http://www.isc.org/">.
+
+</descrip>
+
+<sect>Attributions/Acknowledgements
+<p>
+
+This product includes software developed by The XFree86 Project, Inc
+(http://www.xfree86.org/) and its contributors.
+
+This product includes software developed by Thomas Winischhofer.
+
+This produce includes software that is based in part of the work of the
+FreeType Team (http://www.freetype.org).
+
+This product includes software developed by the University of California,
+Berkeley and its contributors.
+
+This product includes software developed by Christopher G. Demetriou.
+
+This product includes software developed by the NetBSD Foundation, Inc. and its
+contributors
+
+This product includes software developed by X-Oz Technologies
+(http://www.x-oz.com/).
 
 
 </article>
diff --git a/sgml/fonts.sgml b/sgml/fonts.sgml
index 89d851f..7242abd 100644
--- a/sgml/fonts.sgml
+++ b/sgml/fonts.sgml
@@ -9,7 +9,7 @@
 <date>17 November 2003</date>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.23 2003/11/24 01:57:56 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 2003/12/20 19:30:35 dawes Exp $
 </ident>
 
 <toc>
@@ -1087,7 +1087,7 @@ name="FreeType-specific notes about fontenc"> earlier in this document.
 
 <sect2>About the <it/X-TrueType/ TrueType backend <label id="sec:X-TT">
 
-The `X-TrueType' backend is a backend based on version 1 of the FreeType
+<p>The `X-TrueType' backend is a backend based on version 1 of the FreeType
 library.  X-TrueType doesn't use the `fontenc' layer for managing font
 encodings, but instead uses its own database of encodings.
 
@@ -1101,16 +1101,16 @@ url="http://x-tt.sourceforge.jp/" name="the After X-TT Project page">.
 
 <sect2>Delayed glyph rasterisation
 
-<p>When loading a large character set, the old <it/FreeType/ delayed
-glyph rasterisation until the time at which the glyph was first used.
-The new FreeType (libfreetype-xtt2) has an improved `very lazy' metric
-calculation method to speed up the process when loading TrueType or
-OpenType fonts.   Although the <it/X-TT/ module also has this method,
-the "<tt/vl=y/" TTCap option must be set if you want to use it.  This
-is the default method for <it/FreeType/ when it loads multi-byte fonts.
-Even if you use a unicode font which has tens of thousands of glyphs,
-this delay will not be worrisome as long as you use the new <it/FreeType/
-backend -- its `very lazy' method is super-fast.
+<p>When loading a proportional fonts which contain a huge number of glyphs,
+the old <it/FreeType/ delayed glyph rasterisation until the time at which
+the glyph was first used.   The new FreeType (libfreetype-xtt2) has an
+improved `very lazy' metric calculation method to speed up the process when
+loading TrueType or OpenType fonts.   Although the <it/X-TT/ module also
+has this method, the "<tt/vl=y/" TTCap option must be set if you want to
+use it.  This is the default method for <it/FreeType/ when it loads
+multi-byte fonts.   Even if you use a unicode font which has tens of
+thousands of glyphs, this delay will not be worrisome as long as you use
+the new <it/FreeType/ backend -- its `very lazy' method is super-fast.
 
 The maximum error of bitmap position using `very lazy' method is 1 pixel,
 and is the same as that of a character-cell spacing.  When the X-TT
diff --git a/sgml/index.pre b/sgml/index.pre
index 72544de..05de7cd 100644
--- a/sgml/index.pre
+++ b/sgml/index.pre
@@ -8,11 +8,10 @@
 <!-- Title information -->
 <title>Documentation for XFree86&trade; version &relvers;
 <author>The XFree86 Project, Inc
-<date>18 December 2003
+<date>14 February 2004
 
 <!--
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.21 2003/12/19 04:26:13 dawes Exp $ 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.21 2003/12/19 04:26:13 dawes Exp $ 
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.23 2004/02/15 02:16:49 dawes Exp $ 
 -->
 
 <p>