summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:26 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:26 +0000
commit4ab483fb8701381c4e183f7eebd9d80258053db5 (patch)
tree240f67f9b88dcf0035f06884279efbdfc4e80f11
parent903b510b4c343beee8d4914a6b6c3a69a256d5b0 (diff)
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
-rw-r--r--sgml/Darwin.sgml72
-rw-r--r--sgml/LICENSE.sgml562
-rw-r--r--sgml/OpenBSD.sgml40
-rw-r--r--sgml/README.sgml58
-rw-r--r--sgml/RELNOTES.sgml570
-rw-r--r--sgml/SCO.sgml27
-rw-r--r--sgml/index.pre5
7 files changed, 727 insertions, 607 deletions
diff --git a/sgml/Darwin.sgml b/sgml/Darwin.sgml
index d92e60e..17fcd39 100644
--- a/sgml/Darwin.sgml
+++ b/sgml/Darwin.sgml
@@ -4,11 +4,12 @@
<article>
<title>XFree86 on Darwin and Mac OS X
-<author>Torrey T. Lyons, <email>torrey@mrcla.com</email>
-<date>12 December 2001
+<author>Torrey T. Lyons
+<date>15 December 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.9 2001/12/13 07:09:05 torrey Exp $
+$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.10 2003/12/15 20:47:41 torrey Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.10 2003/12/15 20:47:41 torrey Exp $
</ident>
<toc>
@@ -69,7 +70,7 @@ typically means any card that has been shipped by Apple. If a card works
for you with the Mac OS&nbsp;X GUI, it will work on the same machine with
XFree86. If you have a pure Darwin installation, you may need to download
additional third-party drivers from
-<htmlurl url="http://www.opensource.apple.com/projects/darwin/"
+<htmlurl url="http://developer.apple.com/darwin/"
name="Apple's Darwin site">. IOKit drivers are typically installed in
<tt>/System/Library/Extensions/</tt> or <tt>/Library/Extensions/</tt>.
@@ -94,10 +95,12 @@ the XFree86 FTP server at <url
url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/binaries/">.
Follow the instructions in the <htmlurl
url="http://www.xfree86.org/&relvers;/Install.html" name="Install">
-document to install it. This will create two new directory trees,
-<tt>/usr/X11R6</tt> and <tt>/etc/X11</tt> For Mac OS&nbsp;X Quartz
-support, download the optional Xquartz.tgz tarball. With Quartz support,
-the XDarwin application will be installed in <tt>/Applications</tt>.
+document to install it. This will create three new directory trees,
+<tt>/usr/X11R6</tt>, <tt>/etc/X11</tt> and <tt>/etc/fonts</tt>. On
+Mac OS&nbsp;X the Xquartz.tgz tarball is required in addition to the
+other tarballs required on other platforms. With Mac OS&nbsp;X Quartz
+support, the XDarwin application will be installed in
+<tt>/Applications</tt>.
<p>
If you get the precompiled binaries you can skip ahead to the section
@@ -149,12 +152,17 @@ sudo make install.man >& man.log
</verb></tscreen>
<sect>Run the X Window System<label id="running">
+
+<sect1>Setting Your Path
<p>
You need to add the X Window System executables to your path. Your path
is the list of directories to be searched for executable commands.
The X11 commands are located in <tt>/usr/X11R6/bin</tt>, which needs to be
-added to your path. XDarwin does this for you by default and can also add
-additional directories where you have installed command line applications.
+added to your path. In Quartz mode, the XDarwin application does this for
+you automatically. It can also be configured to add additional directories
+where you have installed command line applications. When running from the
+Darwin console, you will need to set the path correctly for your shell as
+XDarwin will not do this for you.
<p>
More experienced users will have already set their path correctly using the
@@ -171,24 +179,21 @@ of pages to be searched when you are looking for documentation. The X11 man
pages are located in <tt>/usr/X11R6/man</tt> and the <tt>MANPATH</tt>
environment variable contains the list of directories to search.
+<sect1>Starting the X Server
<p>
On Mac OS&nbsp;X, you can run XFree86 from the Darwin
text console or in parallel with Aqua. To get to the text
console in Mac OS&nbsp;X you need to logout and type ``&gt;console'' as
the user name. This will shutdown Core Graphics and
-bring up the console login prompt. Login again as your user.
-
-<p>
+bring up the console login prompt. Login again as your user.
From the text console you can start the X Window System by typing
-``exec startx''. After a brief wait at least one terminal window should
-pop up for you. So far it probably isn't very impressive as you might not
-even have a window manager running to allow you to move windows around.
+``exec startx''.
<p>
When you are ready to quit XFree86 type ``exit'' in the main
terminal window or quit with the window manager if you have one
-running. Unfortunately the X server does not shutdown correctly and if
-you did not start with ``exec startx'', you
+running. Unfortunately in IOKit mode, the X server does not shutdown
+correctly and if you did not start with ``exec startx'', you
will get an apparently frozen screen with only a spinning beachball
cursor on it. Nothing you type shows up on the screen, but in fact
your keystrokes are being received by the console. Type
@@ -206,10 +211,29 @@ to always use a particular mode in the preferences, or you can specify
the ``-fullscreen'' or ``-rootless'' options on the command line instead
of ``-quartz''.
+<sect1>Double-clickable X11 Executables
<p>
-<bf/Customize the X Window System/
+Mac OS&nbsp;X 10.3 can be configured to automatically launch XDarwin when
+you double-click an X11 executable in the Finder. When an executable file
+is double-clicked Launch Services checks to see if it is linked against
+the X11 libraries. If it is, Launch Services opens the default X server.
+To set the default X server, do the following:
+
+<itemize>
+<item>Create a simple file which ends in ''.x11app''.
+<item>Open the file with Get Info in the Finder.
+<item>Under ''Open with:'' select the XDarwin application.
+<item>Select ''Change All...'' to set XDarwin as the default.
+</itemize>
+
<p>
+On Mac OS&nbsp;X 10.3 the default X server is started when an X11
+executable is double-clicked, whether or not its extension is
+''.x11app''. On previous versions of Mac OS&nbsp;X, an X11 executable must
+have a ''.x11app'' extension for this to work.
+<sect1>Customize the X Window System
+<p>
The X Window System is very customizable and you will certainly want to
change some things. There is a lot you can do to control how your windows
look, how the windows are moved, resized, etc. You will likely want to
@@ -224,6 +248,10 @@ following pages contain collections of window managers and other X
window system clients:
<itemize>
+<item> <htmlurl url="http://darwinports.opendarwin.org/"
+name="DarwinPorts">: An easy way to install various open-source software
+products on Darwin and Mac OS&nbsp;X.
+
<item> <htmlurl url="http://fink.sourceforge.net/" name="Fink">: A
package manager that will easily download, compile, and install lots
of open source software from the Internet.
@@ -231,12 +259,6 @@ of open source software from the Internet.
<item> <htmlurl url="http://gnu-darwin.sourceforge.net/" name="GNU-Darwin">:
A source for tons of software ported to Darwin.
-<item> <htmlurl url="http://softrak.stepwise.com/Apps/WebObjects/Softrak"
-name="Stepwise's Softrak site">
-
-<item> <htmlurl url="http://www.darwinfo.org/ports/"
-name="Darwinfo's ports page">
-
</itemize>
<p>
diff --git a/sgml/LICENSE.sgml b/sgml/LICENSE.sgml
index 0bb09db..954fd6f 100644
--- a/sgml/LICENSE.sgml
+++ b/sgml/LICENSE.sgml
@@ -4,17 +4,24 @@
<article>
<title>Licenses</title>
-<author>The XFree86 Project</author>
-<date>February 2003</date>
+<author>Compiled by The XFree86 Project</author>
+<date>December 2003</date>
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.16 2003/10/26 12:17:17 herrb Exp $
+$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 $
</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,
+copyright owner information, and copyright dates.
+
<sect>XFree86 License
<p>
-XFree86 code without an explicit copyright is covered by the following
-copyright/license:
<p>
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
@@ -42,14 +49,9 @@ 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>Other Licenses
-<p>
-Portions of code are covered by the following licenses/copyrights. See
-individual files for the copyright dates.
-
-<sect1>X/MIT Copyrights
+<sect>X/MIT Licenses
<p>
-<sect2>X Consortium
+<sect1>X Consortium
<p>
Copyright (C) <it>&lt;date&gt;</it> X Consortium
@@ -78,7 +80,7 @@ the X Consortium.
X Window System is a trademark of X Consortium, Inc.
-<sect2>The Open Group
+<sect1>The Open Group
<p>
Copyright <it>&lt;date&gt;</it> The Open Group
@@ -103,9 +105,14 @@ 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>Berkeley-based copyrights:
+<sect>Berkeley-style Licenses
<p>
-<sect2>General
+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.
+
+<sect1>General
<p>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -132,7 +139,7 @@ are met:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<sect2>UCB/LBL
+<sect1>UCB/LBL
<p>
Copyright (c) 1993
The Regents of the University of California. All rights reserved.
@@ -177,7 +184,116 @@ are met:
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-<sect2>The NetBSD Foundation, Inc.
+<sect1>Lennart Augustsson.
+<p>
+
+Copyright (c) 1999 Lennart Augustsson &lt;augustss@netbsd.org&gt;<newline>
+All rights reserved.
+
+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.
+</enum>
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR 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.
+
+<sect1>Chris Costello.
+<p>
+Copyright (c) 1999 Chris Costello<newline>
+All rights reserved.
+
+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.
+</enum>
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR 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.
+
+<sect1>Christopher G. Demetriou.
+<p>
+
+Copyright (c) 1993, 1994 Christopher G. Demetriou<newline>
+All rights reserved.
+
+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 Christopher G. Demetriou.
+<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>Todd C. Miller
+<p>
+Copyright (c) 1998 Todd C. Miller &lt;Todd.Miller@courtesan.com&gt;
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+FOR ANY SPECIAL, DIRECT, 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>The NetBSD Foundation, Inc.
<p>
Copyright (c) 2003 The NetBSD Foundation, Inc.
All rights reserved.
@@ -215,7 +331,97 @@ 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.
-<sect2>Theodore Ts'o.
+<sect1>Theo de Raadt and Damien Miller
+<p>
+Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
+Copyright (c) 2001-2002 Damien Miller. All rights reserved.
+
+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.
+</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>Andy Ritger/NVIDIA.
+<p>
+
+Copyright (c) 2001, Andy Ritger aritger@nvidia.com<newline>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+<itemize>
+<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>Neither the name of NVIDIA nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+</itemize>
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 REGENTS OR 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.
+
+<sect1>Eric Sunshine.
+<p>
+Copyright (C) 1999,2000 by Eric Sunshine &lt;sunshine@sunshineco.com&gt;
+All rights reserved.
+
+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>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>Theodore Ts'o.
<p>
Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All
rights reserved.
@@ -230,7 +436,7 @@ are met:
<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>he name of the author may not be used to endorse or promote
+<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>
@@ -248,50 +454,189 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
-<sect2>Theo de Raadt and Damien Miller
+<sect1>Paul Vojta.
<p>
-Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
-Copyright (c) 2001-2002 Damien Miller. All rights reserved.
+
+Copyright (c) 1994 Paul Vojta. All rights reserved.
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
+<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
+<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.
</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.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR 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.
+
+<sect1>X-Oz Technologies
+<p>
-<sect2>Todd C. Miller
+Copyright 2003 by David H. Dawes.<newline>
+Copyright 2003 by X-Oz Technologies.<newline>
+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:
+
+<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>The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment: "This product
+ includes software developed by X-Oz Technologies
+ (http://www.x-oz.com/)." Alternately, this acknowledgment may
+ appear in the software itself, if and wherever such third-party
+ acknowledgments normally appear.
+
+<item>Except as contained in this notice, the name of X-Oz
+ Technologies shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization from X-Oz Technologies.
+</enum>
+
+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 X-OZ TECHNOLOGIES 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.
+
+<sect1>X-TrueType Server Project, After X-TT Project, and contributors.
<p>
-Copyright (c) 1998 Todd C. Miller &lt;Todd.Miller@courtesan.com&gt;
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+ Copyright (c) 1998 X-TrueType Server Project, All rights reserved.<newline>
+ Copyright (c) 2003 After X-TT Project, All rights reserved.<newline>
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-FOR ANY SPECIAL, DIRECT, 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.
+Contributors include:
+
+ Copyright (c) 1998 Takuya SHIOZAKI, All Rights reserved.<newline>
+ Copyright (c) 1998-1999 Shunsuke Akiyama &lt;akiyama@jp.FreeBSD.org&gt;.
+ All rights reserved.<newline>
+ Copyright (c) 1998,1999 Pablo Saratxaga
+ &lt;srtxg@chanae.alphanet.ch&gt;<newline>
+ Copyright (c) 1998 Go Watanabe, All rights reserved.<newline>
+ Copyright (c) 2001 Roger So, All rights reserved.<newline>
+ Copyright (c) 1998,1999 Chen Xiangyang, All Rights reserved.<newline>
+ Copyright (c) 1997 Jyunji Takagi, All rights reserved.<newline>
+ Copyright (c) 1998 Kazushi (Jam) Marukawa, All rights reserved.<newline>
+ Copyright (c) 1999 Mutsumi ISHIKAWA, All rights reserved.<newline>
+ Copyright (c) 1999 Nozomi YTOW, All rights reserved.
+
+===Notice
+
+ 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.
+</enum>
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR 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.
+
+Notice===
+
+<sect>BSD-style license with export notice
+<p>
+
+<sect1>National Semiconductor Corporation Open Source License for Durango
+<p>
-<sect1>NVIDIA Corp
+(BSD License with Export Notice)
+
+Copyright (c) 1999-2001<newline>
+National Semiconductor Corporation.<newline>
+All rights reserved.<newline>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+<itemize>
+<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>Neither the name of the National Semiconductor Corporation nor
+ the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+</itemize>
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"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
+NATIONAL SEMICONDUCTOR CORPORATION OR 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,
+INTELLECTUAL PROPERTY INFRINGEMENT, OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+
+EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF
+YOUR JURISDICTION. It is licensee's responsibility to comply with
+any export regulations applicable in licensee's jurisdiction. Under
+CURRENT (2001) U.S. export regulations this software
+is eligible for export from the U.S. and can be downloaded by or
+otherwise exported or reexported worldwide EXCEPT to U.S. embargoed
+destinations which include Cuba, Iraq, Libya, North Korea, Iran,
+Syria, Sudan, Afghanistan and any other country to which the U.S.
+has embargoed goods and services.
+
+
+<sect>NVIDIA Corp
<p>
Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
@@ -322,7 +667,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOURCE CODE.
-<sect1>GLX Public License
+<sect>GLX Public License
<p>
GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
@@ -538,7 +883,7 @@ The Original Software is GLX version 1.2 source code, released February,
Those portions of the Subject Software created by Silicon Graphics, Inc.
are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-<sect1>CID Font Code Public License
+<sect>CID Font Code Public License
<p>
CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
@@ -753,7 +1098,7 @@ Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
solely in object code form, Recipient may replace the words "this file" with
"this software" in both the first and second sentences.]
-<sect1>Bigelow &amp; Holmes Inc and URW++ GmbH Luxi font license
+<sect>Bigelow &amp; Holmes Inc and URW++ GmbH Luxi font license
<p>
Luxi fonts copyright (c) 2001 by Bigelow &amp; Holmes Inc. Luxi font
@@ -799,4 +1144,121 @@ info@urwpp.de
or
design@bigelowandholmes.com
+<sect>FreeType License
+<p>
+
+<bf>0. Definitions</bf>
+
+Throughout this license, the terms `package', `FreeType Project',
+and `FreeType archive' refer to the set of files originally
+distributed by the authors (David Turner, Robert Wilhelm, and
+Werner Lemberg) as the `FreeType Project', be they named as alpha,
+beta or final release.
+
+`You' refers to the licensee, or person using the project, where
+`using' is a generic term including compiling the project's source
+code as well as linking it to form a `program' or `executable'.
+This program is referred to as `a program using the FreeType
+ engine'.
+
+This license applies to all files distributed in the original
+FreeType Project, including all source code, binaries and
+documentation, unless otherwise stated in the file in its
+original, unmodified form as distributed in the original archive.
+If you are unsure whether or not a particular file is covered by
+this license, you must contact us to verify this.
+
+The FreeType Project is copyright (C) 1996-2000 by David Turner,
+Robert Wilhelm, and Werner Lemberg. All rights reserved except as
+specified below.
+
+<bf>1. No Warranty</bf>
+
+THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
+USE, OF THE FREETYPE PROJECT.
+
+<bf>2. Redistribution</bf>
+
+This license grants a worldwide, royalty-free, perpetual and
+irrevocable right and license to use, execute, perform, compile,
+display, copy, create derivative works of, distribute and
+sublicense the FreeType Project (in both source and object code
+forms) and derivative works thereof for any purpose; and to
+authorize others to exercise some or all of the rights granted
+herein, subject to the following conditions:
+
+<itemize>
+ <item>Redistribution of source code must retain the license file
+ (`FTL.TXT') unaltered; any additions, deletions or changes to
+ the original files must be clearly indicated in accompanying
+ documentation. The copyright notices of the unaltered,
+ original files must be preserved in all copies of source
+ files.
+
+ <item>Redistribution in binary form must provide a disclaimer that
+ states that the software is based in part of the work of the
+ FreeType Team, in the distribution documentation. We also
+ encourage you to put an URL to the FreeType web page in your
+ documentation, though this isn't mandatory.
+</itemize>
+
+These conditions apply to any software derived from or based on
+the FreeType Project, not just the unmodified files. If you use
+our work, you must acknowledge us. However, no fee need be paid
+to us.
+
+<bf>3. Advertising</bf>
+
+Neither the FreeType authors and contributors nor you shall use
+the name of the other for commercial, advertising, or promotional
+purposes without specific prior written permission.
+
+We suggest, but do not require, that you use one or more of the
+following phrases to refer to this software in your documentation
+or advertising materials: `FreeType Project', `FreeType Engine',
+`FreeType library', or `FreeType Distribution'.
+
+As you have not signed this license, you are not required to
+accept it. However, as the FreeType Project is copyrighted
+material, only this license, or another one contracted with the
+authors, grants you the right to use, distribute, and modify it.
+Therefore, by using, distributing, or modifying the FreeType
+Project, you indicate that you understand and accept all the terms
+of this license.
+
+<bf>4. Contacts</bf>
+
+There are two mailing lists related to FreeType:
+
+<itemize>
+ <item>freetype@freetype.org
+
+ Discusses general use and applications of FreeType, as well as
+ future and wanted additions to the library and distribution.
+ If you are looking for support, start in this list if you
+ haven't found anything to help you in the documentation.
+
+ <item>devel@freetype.org
+
+ Discusses bugs, as well as engine internals, design issues,
+ specific licenses, porting, etc.
+
+ <item>http://www.freetype.org
+
+ Holds the current FreeType web page, which will allow you to
+ download our latest development version and read online
+ documentation.
+</itemize>
+
+You can also contact us individually at:
+
+ David Turner &lt;david.turner@freetype.org&gt;<newline>
+ Robert Wilhelm &lt;robert.wilhelm@freetype.org&gt;<newline>
+ Werner Lemberg &lt;werner.lemberg@freetype.org&gt;
+
+
</article>
diff --git a/sgml/OpenBSD.sgml b/sgml/OpenBSD.sgml
index 142ae16..8df7c96 100644
--- a/sgml/OpenBSD.sgml
+++ b/sgml/OpenBSD.sgml
@@ -6,10 +6,11 @@
<title>README for XFree86 &relvers; on OpenBSD
<author>
Matthieu Herrb
-<Date>Last modified on: 9 November 2002
+<Date>Last modified on: 9 December 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.30 2003/02/25 19:31:01 dawes Exp $
+$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 $
</ident>
<toc>
@@ -31,7 +32,7 @@ The sources for XFree86 &relvers; are available by anonymous ftp from:
<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;"
url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;">
-Binaries for OpenBSD/i386 3.2 and later are available from:
+Binaries for OpenBSD/i386 3.4 and later are available from:
<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/OpenBSD"
url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/OpenBSD">
@@ -50,15 +51,27 @@ XFree86 also builds on other OpenBSD architectures. See section
<sect>Bug Reports for This Document
<p>
-Send email to <email>herrb@xfree86.org</email> (Matthieu Herrb) or
-<email>XFree86@XFree86.org</email> if you have comments or suggestions about
-this file and we'll revise it.
+Use the XFree86 bugzilla at <url url="http://bugs.xfree86.org">
+to submit comments or suggestions about this file.
<sect>New OS dependent features
<p>
See the <htmlurl url="RELNOTES.html" name="Release Notes"> for
non-OS dependent new features in XFree86 &relvers;.
+<sect1>New OS related features in 4.4
+<p>
+<itemize>
+<item>The IPv6 support is enabled on OpenBSD, but XDMCP over IPv6 is
+not currently enabled since the code uses IPv6 mapped IPv4 addresses
+which are not supported on OpenBSD.
+<item>The userland part of DRI is enabled and built. Now waiting for
+someone to port the kernel modules...
+<item>All major revisions of the shared libraries are incremented on
+OpenBSD 3.3 and later, to support the API changes introduced by
+gcc stack protector.
+</itemize>
+
<sect1>New OS related features in 4.3
<p>
<itemize>
@@ -225,18 +238,11 @@ line must be in your config file in <tt>/sys/arch/i386/conf</tt>:
<sect1>Console drivers
<p>
-The server supports the standard OpenBSD/i386
-console drivers: pcvt and wscons. They are detected at runtime and no
-configuration of the server itself is required.
-
-<p>
-The pcvt console driver is the default in OpenBSD up to OpenBSD 2.8.
-It offers several virtual consoles and international keyboard support.
+The server supports wscons, the standard OpenBSD/i386 console driver.
<p>
-OpenBSD 2.9 and later has switched to the wscons console
-driver. This console driver has a pcvt compatibility mode for X
-support.
+The pcvt console driver which was the default up to OpenBSD
+2.8, is also supported on those releases.
<sect1>Aperture Driver
<p>
@@ -245,7 +251,7 @@ feature that disables access to the <tt>/dev/mem</tt> device when in
multi-user mode. But the XFree86 server requires
linear access to the display memory in most cases.
-OpenBSD now requires the aperture driver to be enabled for all X
+OpenBSD requires the aperture driver to be enabled for all X
servers, because the aperture driver also controls access to the
I/O ports of the video boards.
<p>
diff --git a/sgml/README.sgml b/sgml/README.sgml
index f62fdf7..0e828fd 100644
--- a/sgml/README.sgml
+++ b/sgml/README.sgml
@@ -13,10 +13,11 @@
<title>README for XFree86&tm; &relvers;
<author>The XFree86 Project, Inc
-<date>26 February 2003
+<date>18 December 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.136 2003/12/03 04:51:30 dawes Exp $
+$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 $
</ident>
<abstract>
@@ -82,17 +83,15 @@ Specific release enhancements can be viewed in the
Most modern PC video hardware is supported in XFree86 &relvers;, and
most PC video hardware that isn't supported explicitly can be used with
-the "vesa" driver. The <htmlurl name="Driver Status document"
-url="Status.html"> has a summary of what hardware is supported in
-&relvers; compared with the old 3.3.x (&legacyvers;) series. It is a
-good idea to check there before upgrading if you are currently running
-&legacyvers; with older hardware.
+the "vesa" driver. The <htmlurl name="Releaes Notes" url="RELNOTES3.html">
+has a table showing the drivers provided with XFree86 &relvers;, and links
+to related documentation.
XFree86 is produced by The XFree86 Project, Inc, which is a group of
mostly volunteer independent developers. XFree86 is a non-commercial
organisation, and would not be viable without the invaluable development
-contributions of volunteers. This release is dedicated to all who have
-supported and contributed to XFree86 over the last eleven years.
+contributions of volunteers. This release is dedicated to the greater
+XFree86 community.
<![ %snapshot [
<sect>Redistribution of Snapshots
@@ -103,6 +102,22 @@ prohibit vendors and others redistributing binaries of this snapshot
release, we don't recommend including them in production releases.
]]>
+<sect>Licensing
+<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">.
+
<sect>Pointers to additional information
<p>
@@ -118,10 +133,6 @@ Information about binary distributions and the attendant installation
instructions can be found in the <htmlurl name="Installation Document"
url="Install.html">.
-Copyright and Licensing information for this release and all XFree86
-releases can be found in the <htmlurl name="License Document"
-url="LICENSE.html">.
-
The XFree86 version numbering system (including historical information)
can be found in the <htmlurl name="Versions Document" url="Versions.html">.
@@ -131,6 +142,10 @@ other information are available at the <url name="XFree86 support page"
url="http://www.xfree86.org/support.html">.
<sect>The Public Mailing Lists
+<p>
+Current information about the XFree86 public mailing lists can be found
+at our <url name="web site" url="http://www.xfree86.org/lists.html">.
+
<sect1>CVS Commit
<p>
For those who want to see what has been committed recently to our CVS
@@ -150,16 +165,21 @@ This list is available for any discussions and questions related to XFree86.
Support related questions should be sent here. Many experienced XFree86
developers monitor this list.
-</sect1>
-</sect>
+<sect1>Forum
+<p>
+This list is available for high level discussions about XFree86 and related
+technologies, their future, and for inter-project communication.
<sect>Contributing to XFree86
<p>
If you have any new work or enhancements/bug fixes for existing work,
-please submit them to <email>fixes@XFree86.org</email>. This will ensure
-that they are included in future releases. For new work, it's usually
-a good idea to discuss it first on the <email>devel@XFree86.org</email>
-list.
+please submit them to <email>patch@XFree86.org</email> or to our <url
+name="bug tracking system" url="http://bugs.xfree86.org/">. This will
+ensure that they are included in future releases. New works should be
+discussed on our <email>devel@XFree86.org</email> list prior to submission.
+
+Current information about the XFree86 development process can be found
+at our <url name="web site" url="http://www.xfree86.org/developer.html">.
<sect>How to get XFree86 &relvers;
<p>
diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index bb58c26..b40a5bf 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -6,10 +6,11 @@
<title>Release Notes for XFree86&trade; &relvers;
<author>The XFree86 Project, Inc
-<date>23 November 2003
+<date>18 December 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.87 2003/12/03 02:12:19 dawes Exp $
+$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 $
</ident>
<abstract>
@@ -117,17 +118,10 @@ don't have enough space to cover them all here.
<p>
<itemize>
-<item>[OLD] ATI Radeon 9x00 2D support added, and 3D support added for the
- Radeon 8500, 9000, 9100, and M9. The 3D support for the Radeon
- now includes hardware TCL.
-
-<item>[OLD] Support added to the i810 driver for Intel 845G, 852GM, 855GM
- and 865G integrated graphics chipsets, including 2D, 3D (DRI)
- and XVideo. Support for the 830M has been improved, and XVideo
- support added.
-
-<item>[OLD] National Semiconductor SC1x00, GX1, and GX2 chipset support added
- with the "nsc" driver.
+<item>Several stability issues with the support for the Intel 830M,
+ 845G, 852GM, 855GM and 865G integrated graphics chipsets have been
+ fixed. Some limitations related to the driver's use of the video
+ BIOS remain, especially for some laptops.
<item>The nv driver for NVIDIA cards has been updated as follows:
@@ -162,16 +156,7 @@ don't have enough space to cover them all here.
</itemize>
-<item>[OLD] The s3virge driver now has support for double scan modes on the DX
- (with XVideo disabled).
-
-<item>[OLD] Updates to the savage driver, including fixing problems with the
- TwisterK, and problems with incorrect memory size detection.
-
-<item>[OLD] 2D acceleration added for the Trident CyberBladeXP/Ai1 chipsets.
-
-<item>[OLD] Support for big endian architectures has been added to the C&amp;T
- driver.
+<item>A new driver for several VIA integrated graphics chipsets has been added.
<item>Various updates and bug fixes have been made to most other drivers.
@@ -185,9 +170,6 @@ don't have enough space to cover them all here.
auto-detecting the device node to use, making it unnecessary to
supply this information in the XF86Config file in most cases.
-<item>[OLD] Several new input drivers have been added, including tek4957,
- jamstudio (js_x), fpit, palmax, and ur98 (Linux only).
-
</itemize>
<sect1>IPv6 support
@@ -395,19 +377,11 @@ scroll-back(1, page-2)
<itemize>
<item>FreeType2 updated to version 2.1.4.
-<item>[OLD] The "freetype" X server font backend has undergone a partial rewrite.
- The new version is based on FreeType 2, and handles TrueType
- (including OpenType/TTF), OpenType/CFF and Type 1 fonts. The old
- "type1" backend is now deprecated, and is only used for CIDFonts
- by default.
-
-<item>[OLD] A new utility called "mkfontscale", which builds fonts.scale files,
- has been added.
-
-<item>[OLD] There has been a significant reworking of the XKB support to allow
- multi-layout configurations. Multi-layout configurations provide
- a flexible way of supporting multiple language layouts and switching
- between them.
+<item>The "freetype" X server font backend has been updated by the
+ <url name="After X-TT Project" url="http://x-tt.sourceforge.jp/"> to
+ include the functionality previously provided by the "xtt" backend,
+ and to fix some bugs. The "xtt" backend will be dropped in the
+ next release in favour of the updated unified "freetype" backend.
</itemize>
@@ -415,36 +389,25 @@ scroll-back(1, page-2)
<p>
<itemize>
-<item>[OLD] Updates for Darwin/Mac OS X, including:
+<item>On Mac OS X, the appropriate backend drawing code is now dynamically
+ loaded at runtime. This reduces the X server's memory footprint.
+ In rootless mode, Apple's Xplugin library is used where available.
+ (Xplugin is included as part of Mac OS X on Panther.) With Xplugin,
+ XDarwin provides identical performance to Apple's X11, including
+ the following improvements over 4.3:
<itemize>
- <item>Indirect GLX acceleration added.
- <item>Smaller memory footprint and faster 2-D drawing in rootless
- mode.
- <item>Full screen mode now uses shadowfb for much faster 2-D drawing.
- <item>Native fonts can be used on MacOS X.
+ <item>Added direct GLX rendering with thread support.
+ <item>Faster 2-D drawing.
+ <item>Added support for the Apple-WM extension so XDarwin interoperates
+ with quartz-wm.
</itemize>
+<item>On Darwin, IOKit mode now uses shadowfb for much faster drawing.
+
<item>Various GNU/Hurd support updates.
<item>Experimental support added for GNU/KFreeBSD and GNU/KNetBSD systems.
-<item>[OLD] Various Cygwin support updates, including an experimental rootless
- X server for Cygwin/XFree86.
-
-<item>[OLD] AMD AMD64 support (primarily for Linux so far) has been added.
-
-<item>[OLD] Support added for OpenBSD/sparc64.
-
-<item>[OLD] Major OS/2 support updates.
-
-<item>[OLD] Major SCO OpenServer updates.
-
-<item>[OLD] Multi-head support has been added for 460GX-based Itanium systems,
- and for ZX1-based Itanium2 systems.
-
-<item>[OLD] Experimental support for SunOS/Solaris on UltraSPARC systems.
-
-
</itemize>
A more complete list of changes can be found in the CHANGELOG that is
@@ -537,6 +500,8 @@ XFree86 &relvers; includes the following video drivers:
<tabrow><tt>trident</tt><colsep>Trident<colsep><htmlurl
name="trident(4)" url="trident.4.html"></tabrow>
<tabrow><tt>tseng</tt><colsep>Tseng Labs<colsep>&nbsp;</tabrow>
+ <tabrow><tt>via</tt><colsep>VIA<colsep><htmlurl
+ name="via(4)" url="via.4.html"></tabrow>
<tabrow><tt>vesa</tt><colsep>VESA<colsep><htmlurl
name="vesa(4)" url="vesa.4.html"></tabrow>
<tabrow><tt>vga</tt><colsep>Generic VGA<colsep><htmlurl
@@ -572,6 +537,8 @@ XFree86 &relvers; includes the following input drivers:
<!--
<tabrow><tt>acecad</tt><colsep>AceCad<colsep>&nbsp;</tabrow>
-->
+ <tabrow><tt>aiptek(*)</tt><colsep>Aiptek USB tablet<colsep><htmlurl
+ name="aiptek(4)" url="aiptek.4.html"></tabrow>
<tabrow><tt>calcomp</tt><colsep>Calcomp<colsep>&nbsp;</tabrow>
<tabrow><tt>citron</tt><colsep>Citron<colsep><htmlurl
name="citron(4)" url="citron.4.html"></tabrow>
@@ -580,10 +547,9 @@ XFree86 &relvers; includes the following input drivers:
name="dmc(4)" url="dmc.4.html"></tabrow>
<tabrow><tt>dynapro</tt><colsep>Dynapro<colsep>&nbsp;</tabrow>
<tabrow><tt>elographics</tt><colsep>EloGraphics<colsep>&nbsp;</tabrow>
- <tabrow><tt>elographics</tt><colsep>EloGraphics<colsep>&nbsp;</tabrow>
<tabrow><tt>fpit</tt><colsep>Fujitsu Stylistic Tablet PCs<colsep><htmlurl
name="fpit(4)" url="fpit.4.html"></tabrow>
- <tabrow><tt>hyperpen</tt><colsep>HyperPen<colsep>&nbsp;</tabrow>
+ <tabrow><tt>hyperpen</tt><colsep>Aiptek HyperPen 6000<colsep>&nbsp;</tabrow>
<tabrow><tt>js_x</tt><colsep>JamStudio pentablet<colsep><htmlurl
name="js_x(4)" url="js_x.4.html"></tabrow>
<tabrow><tt>kbd</tt><colsep>generic keyboards (alternate)<colsep><htmlurl
@@ -614,35 +580,32 @@ Drivers marked with (*) are available for Linux only.
<sect>Overview of XFree86 4.x.
<p>
-Unlike XFree86 3.3.x where there are multiple X server binaries, each
-of which drive different hardware, XFree86 &relvers; has a single X
-server binary called <tt>XFree86</tt>. This binary can either have one
-or more video drivers linked in statically, or, more usually, dynamically
-load the video drivers and other modules that are needed.
+XFree86 4.x has a single X server binary called <tt>XFree86</tt>. This
+binary can either have one or more video and input drivers linked in
+statically, or, more usually, dynamically load the video drivers, input
+drivers, and other modules that are needed.
XFree86 &relvers; has X server support for most UNIX&reg; and UNIX-like
-operating systems on Intel/x86 platforms, plus support for Linux on
-Alpha, PowerPC, IA-64, Sparc, and Mips platforms, and for Darwin on PowerPC.
-Work on support for additional architectures and operating systems is
-in progress, and is planned for future releases.
+operating systems on Intel/x86 platforms, plus support for Linux and
+some BSD OSs on Alpha, PowerPC, IA-64, AMD64, Sparc, and Mips platforms,
+and for Darwin on PowerPC. Work on support for additional architectures
+and operating systems is in progress, and is planned for future releases.
<sect1>Loader and Modules
<p>
-The XFree86 X server has a built-in run-time loader, donated by <url
-name="Metro Link" url="http://www.metrolink.com">. This loader can load
-normal object files and libraries in most of the commonly used formats.
-Since the loader doesn't rely on an operating system's native dynamic
-loader support, it works on platforms that don't provide this feature,
-and makes it possible for the modules to be operating system independent
-(although not, of course, independent of CPU architecture). This means
-that a module compiled on Linux/x86 can be loaded by an
-X server running on Solaris/x86, or FreeBSD, or even OS/2.
-<p>
-One of the
-main benefits of this loader is that when modules are updated, they do not need
-to be recompiled for every different operating system. In the future
-we plan to take advantage of this to provide more frequent driver module
-updates in between major releases.
+The XFree86 X server has a built-in run-time loader developed from code
+donated by <url name="Metro Link" url="http://www.metrolink.com">. This
+loader can load normal object files and libraries in most of the commonly
+used formats. Since the loader doesn't rely on an operating system's
+native dynamic loader support, it works on platforms that don't provide
+this feature, and makes it possible for the modules to be operating
+system independent (although not, of course, independent of CPU
+architecture). This means that a module compiled on Linux/x86 can be
+loaded by an X server running on Solaris/x86, or FreeBSD, or even OS/2.
+
+One of the main benefits of this loader is that when modules are
+updated, they do not need to be recompiled for every different operating
+system.
The loader in version &relvers; has support for Intel (x86), Alpha and
PowerPC platforms. It also has preliminary support for Sparc platforms.
@@ -651,11 +614,13 @@ The X server makes use of modules for video drivers, X server extensions,
font rasterisers, input device drivers, framebuffer layers (like mfb,
cfb, etc), and internal components used by some drivers (like XAA),
-The module interfaces (API and ABI) used in this release is still subject
+The module interfaces (API and ABI) used in this release is subject
to change without notice. While we will attempt to provide backward
compatibility for the module interfaces as of the 4.0 release (meaning
that 4.0 modules will work with future core X server binaries), we cannot
-guarantee this.
+guarantee this. Compatibility in the other direction is explicitly
+not guaranteed because new modules may rely on interfaces added in new
+releases.
<bf>Note about module security</bf>
<quote><p>
@@ -663,373 +628,44 @@ guarantee this.
the X server loadable modules also run with these privileges.
For this reason we recommend that all users be careful to only
use loadable modules from reliable sources, otherwise the
- introduction of viruses and contaminated code can occur and wreak
- havoc on your system. We hope to have a
- mechanism for signing/verifying the modules that we provide
- available in a future release.
+ introduction of viruses and contaminated code can occur and
+ wreak havoc on your system. We hope to have a mechanism for
+ signing/verifying the modules that we provide available in a
+ future release.
</quote>
<sect1>Configuration File <label id="config">
<p>
-The X server configuration file format has been extended to handle some
-of the new functionality. The <tt>xf86config</tt> utility can be used
-to generate a basic config file, that may require some manual editing.
-The X server also has preliminary support for generating a basic config
-file. This is done by running (as root) "<tt>XFree86 -configure</tt>".
-Alternatively, the sample config file <tt>XF86Config.eg</tt> that is
-installed in <tt>/usr/X11R6/lib/X11</tt> may be used as a starting point.
-The <tt>xf86cfg</tt> utility can also be used to create a new configuration
-file or to edit an existing one.
-The <tt>XF86Setup</tt> utility is currently not usable, but work is
-continuing in this area.
-
-The main changes are covered here, but please refer to the <htmlurl
-name="XF86Config(5)" url="XF86Config.5.html">
-manual page for more comprehensive information:
-
-<itemize>
- <item>The Module section is used to load server extension modules and
- font modules, but not XInput drivers. The <tt>.so</tt> suffix
- should no longer be specified with module names. Options may
- be supplied for modules by loading the module via a SubSection
- instead of the usual Load keyword. The <tt>bitmap</tt> module
- is the only font module that is loaded by default. No server
- extensions are loaded by default, but some are built-in to the
- server. It is strongly recommended that the extension module
- containing a range of small miscellaneous extensions (<tt>extmod</tt>)
- be loaded because some commonly used things won't work correctly
- without it. The following example shows how to load all the server
- extensions plus the Type1 and TrueType fonts support, and a
- commented example that shows how to pass options to an extension
- (this one is for loading the misc extensions (<tt>extmod</tt>)
- with the XFree86-VidModeExtension disabled):
-
-<quote><verb>
-Section "Module"
-
- Load "dbe"
- Load "record"
- Load "glx"
- Load "extmod"
-
- Load "type1"
- Load "freetype"
-
- # SubSection "extmod"
- # Option "Omit XFree86-VidModeExtension"
- # EndSubSection
-
-EndSection
-</verb></quote>
-
- <item>Option flags have been extended and are now used more widely in the
- config file. Options flags come in two main types. The first type
- is exactly like the old form:
-
-<quote><verb>
- Option "name"
-</verb></quote>
-
- where the option just has a name specified. The name is case
- insensitive, and white space and underscore characters are ignored.
- The second type consists of a name and a value:
-
-<quote><verb>
- Option "name" "value"
-</verb></quote>
-
- The value is passed transparently as a string to the code that
- uses the option. Common value formats are integer, boolean,
- real, string and frequency. The following boolean option values
- are recognised as meaning TRUE: <tt>"true"</tt>, <tt>"yes"</tt>,
- <tt>"on"</tt>, <tt>"1"</tt>, and no value. The values recognised
- as FALSE are <tt>"false"</tt>, <tt>"no"</tt>, <tt>"off"</tt>,
- <tt>"0"</tt>. In addition to this, <tt>"no"</tt> may be prepended
- to the <em>name</em> of a boolean option to indicate that it is
- false. Frequency options can have the strings <tt>Hz</tt>,
- <tt>kHz</tt>, or <tt>MHz</tt> appended to the numerical value
- specified.
-
- Note: the value must always be enclosed in double quotes
- (<tt>"</tt>), even when it is numerical.
-
- <item>The ServerFlags section now accepts its parameters as Options
- instead of as special keywords. The older keyword format is
- still recognised for compatibility purposes, but is deprecated
- and support for it will likely be dropped in a future release.
- The DPMS and screen save timeout values are now specified in the
- ServerFlags section rather than elsewhere (because they are global
- parameters, not screen-specific). This example shows the defaults
- for these:
-
-<quote><verb>
- Option "blank time" "10"
- Option "standby time" "20"
- Option "suspend time" "30"
- Option "off time" "40"
-</verb></quote>
-
- The new option <tt>AllowDeactivateGrabs</tt> allows deactivating
- any active grab with the key sequence <tt>Ctrl+Alt+Keypad-Divide</tt>
- and the new option <tt>AllowClosedownGrabs</tt> allows closing the
- connection to the grabbing client with the key sequence
- <tt>Ctrl+Alt+Keypad-Multiply</tt>. Note that these options are off
- by default as they allow users to remove the grab used by screen
- saver/locker programs.
-
- <item>The Keyboard, Pointer and XInput sections have been replaced by a
- more general InputDevice section. The old Keyboard and Pointer
- sections are still recognised for compatibility purposes, but
- they are discommended and support for them may be dropped in future
- releases. The old XInput sections are no longer recognised.
- The keywords from the old sections are expressed as Options in
- the InputDevice sections. The following example shows typical
- InputDevice sections for the core mouse and keyboard.
-
-<quote><verb>
-Section "InputDevice"
- Identifier "Keyboard 1"
- Driver "keyboard"
- Option "AutoRepeat" "500 5"
- Option "XkbModel" "pc104"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse 1"
- Driver "mouse"
- Option "Protocol" "PS/2"
- Option "Device" "/dev/mouse"
- Option "SampleRate" "80"
-EndSection
-</verb></quote>
-
- <item>The Monitor section is mostly unchanged. The main difference is
- that a set of VESA modes is defined internally in the server,
- and so for most monitors, it isn't necessary to specify any modes
- explicitly in the Monitor section. There is also a new Modes section
- that can be used to define a set of modes separately from the
- Monitor section, and the Monitor section may "include" them
- with the "<tt>UseModes</tt>" keyword. The Monitor section may also
- include Options. Options that are monitor-specific, like the
- <tt>"DPMS"</tt> and <tt>"Sync on Green"</tt> options are best
- specified in the Monitor sections.
-
- <item>The Device sections are mostly unchanged. The main difference
- is the new (and mandatory) Driver keyword that specifies which
- video driver should be loaded to drive the video card. Another
- difference is the BusID keyword that is used to specify which of
- possibly multiple video cards the Device section is for. The
- following is an example for a Matrox card:
-
-<quote><verb>
-Section "Device"
- Identifier "MGA 1"
- Driver "mga"
- BusID "PCI:1:0:0"
-EndSection
-</verb></quote>
-
- <item>The Screen sections are mostly unchanged. The old Driver keyword
- is no longer used, and a mandatory Identifier keyword has been
- added. The DefaultColorDepth keyword has been renamed to
- DefaultDepth.
-
- <item>A new section called ServerLayout has been added to allow the
- layout of the screens and the selection of input devices to be
- specified. The ServerLayout sections may also include options
- that are normally found in the ServerFlags section. Multiple
- ServerLayout sections may be present, and selected from the command
- line. The following example shows a ServerLayout section for a
- dual-headed configuration with two Matrox cards, and two mice:
-
-<quote><verb>
-Section "ServerLayout"
- Identifier "Layout 1"
- Screen "MGA 1"
- Screen "MGA 2" RightOf "MGA 1"
- InputDevice "Keyboard 1" "CoreKeyboard"
- InputDevice "Mouse 1" "CorePointer"
- InputDevice "Mouse 2" "SendCoreEvents"
- Option "BlankTime" "5"
-EndSection
-</verb></quote>
-
-See the <htmlurl name="XF86Config(5)" url="XF86Config.5.html"> man page
-for a more detailed explanation of the format of the new ServerLayout
-section.
-
-
-</itemize>
-
-The config file search patch has been extended, with the directories
-<tt>/etc/X11</tt> and <tt>/usr/X11R6/etc/X11</tt> being added. The full
-search path details are documented in the XF86Config manual page.
+The XFree86 server uses a configuration file as the primary mechanism
+for providing configuration and run-time parameters. The configuration
+file format is described in detail in the <htmlurl name="XF86Config(5)"
+url="XF86Config.5.html"> manual page.
+The XFree86 server has support for automatically determining an initial
+configuration on most platforms, as well as support or generating a basic
+initial configuration file.
<sect1>Command Line Options
<p>
-The following new X server command line options have been added:
-
-<quote><p>
-
-<tt>-depth</tt> <it>n</it>
-<quote><p>
- This specifies the colour depth that the server is running at.
- The default is 8 for most drivers. Most drivers support the
- values 8, 15, 16 and 24. Some drivers also support the values
- 1 and 4. Some drivers may also support other depths. Note that
- the depth is different from the ``bpp'' that was specified with
- previous versions. The depth is the number of bits in each
- pixel that are significant in determining the pixel's value.
- The bpp is the total size occupied by each pixel, including bits
- that are not used. The old <tt>-bpp</tt> option is no longer
- recognised because it isn't a good way of specifying the server
- behaviour.
-
-</quote>
-
-<tt>-fbbpp</tt> <it>n</it>
-<quote><p>
- This specifies the bpp format to use for the framebuffer. This
- may be used in 24-bit mode to force a framebuffer format that is
- different from what the driver chooses by default. In most cases
- there should be no need to use this option.
-
-</quote>
-
-<tt>-pixmap24</tt>
-<quote><p>
- This specifies that the client-side pixmap format should be the
- packed 24-bit format that was often used by the 3.3.x servers.
- The default is the more common 32-bit format. There should normally
- be no need to use this option.
-
-</quote>
-
-<tt>-pixmap32</tt>
-<quote><p>
- This specifies that the client-side pixmap format should be the
- sparse 32-bit format. This is the default, so there should
- normally be no need to use this option.
-
-</quote>
-
-<tt>-layout</tt> <it>name</it>
-<quote><p>
- This specifies which ServerLayout section in the config file to
- use. When this option is not specified, the first ServerLayout
- section is used. When there is no ServerLayout section, the
- first Screen section is used.
-
-</quote>
-
-<tt>-screen</tt> <it>name</it>
-<quote><p>
- This specifies which Screen section in the config file to
- use. When this option is not specified, the first ServerLayout
- section is used. When there is no ServerLayout section, the
- first Screen section is used.
-
-</quote>
-
-<tt>-keyboard</tt> <it>name</it>
-<quote><p>
- This specifies which InputDevice section in the config file to
- use for the core keyboard. This option may be used in conjunction
- with the <tt>-screen</tt> option.
-
-</quote>
-
-<tt>-pointer</tt> <it>name</it>
-<quote><p>
- This specifies which InputDevice section in the config file to
- use for the core pointer. This option may be used in conjunction
- with the <tt>-screen</tt> option.
-
-</quote>
-
-<tt>-modulepath</tt> <it>path</it>
-<quote><p>
- This specifies the module search path. The path should be a
- comma-separated list of absolute directory paths to search for
- server modules. When specified here, it overrides the value
- specified in the config file. This option is only available
- when the server is started by the <tt>root</tt> user.
-
-</quote>
-
-<tt>-logfile</tt> <it>file</it>
-<quote><p>
- This specifies the log file name. When specified here, it
- overrides the default value. This option is only available when
- the server is started by the <tt>root</tt> user.
-
-</quote>
-
-<tt>-scanpci</tt>
-<quote><p>
- This specifies that the <tt>scanpci</tt> module should be loaded and
- executed. This does a scan of the PCI bus.
-
-</quote>
-
-<tt>-logverbose</tt> [<it>n</it>]
-<quote><p>
- This options specifies the verbosity level to use for the log file.
- The default is 3.
-
-</quote>
-
-</quote>
-
-The following X server command line options have been changed since 3.3.x:
-
-<quote><p>
-
-<tt>-verbose</tt> [<it>n</it>]
-<quote><p>
- This option specifies the verbosity level to use for the server
- messages that get written to stderr. It may be specified multiple
- times to increase the verbosity level (as with 3.3.x), or the
- verbosity level may be specified explicitly as a number. The
- default verbosity level is 0.
-
-</quote>
-
-<tt>-xf86config</tt> <it>filename</it>
-<quote><p>
- This option has been extended to allow non-root users to specify
- a relative config file name. The config file search path will be
- used to locate the file in this case. This makes it possible for
- users to choose from multiple config files that the the sysadmin
- has provided.
-
-</quote>
-
-
-</quote>
-
-A more complete list of XFree86 X server command line options can be found
-in the <htmlurl name="XFree86(1)" url="XFree86.1.html"> manual page.
-
+Command line options can be used to override some default parameters and
+parameters provided in the configuration file. These command line options
+are described in the <htmlurl name="XFree86(1)"
+url="XFree86.1.html"> manual page.
+
<sect1>XAA
<p>
-The XFree86 Acceleration Architecture (XAA) has been completely rewritten
+The XFree86 Acceleration Architecture (XAA) was completely rewritten
from scratch for XFree86 4.x. Most drivers implement acceleration by
making use of the XAA module.
<sect1>Multi-head
<p>
Some multi-head configurations are supported in XFree86 4.x, primarily
-with multiple PCI/AGP cards. However, this is an area that is still
-being worked on, and we expect that the range of configurations for which
-it works well will increase in future releases. A configuration that
-is known to work well in most cases is multiple (supported) Matrox cards.
+with multiple PCI/AGP cards.
One of the main problems is with drivers not sufficiently initialising
cards that were not initialised at boot time. This has been improved
@@ -1087,10 +723,9 @@ and 2; these can be disabled independently with <tt>Option "NoDDC1"</tt>
and <tt>Option "NoDDC2"</tt>.
At startup the server prints out DDC information from the display, and
-can use this information to set or warn about monitor sync limits (but
-not modelines yet). For some drivers, the X server's new
-<tt>-configure</tt> option uses the DDC information when generating the
-config file.
+can use this information to set the default monitor parameters, or to
+warn about monitor sync limits if those provided in the configuration file
+don't match those that are detected.
<sect2>Changed behavior caused by DDC.
<p>
@@ -1105,27 +740,11 @@ of the config file.
<sect1>GLX and the Direct Rendering Infrastructure (DRI)
<p>
-<url name="Precision Insight" url="http://www.precisioninsight.com">
-was provided with funding and support from <url name="Red Hat"
-url="http://www.redhat.com">, <url name="SGI" url="http://www.sgi.com">,
-<url name="3Dfx" url="http://www.3dfx.com">, <url name="Intel"
-url="http://www.intel.com">, <url name="ATI" url="http://www.ati.com">,
-and <url name="Matrox" url="http://www.matrox.com"> to integrate the GLX
-extension for 3D rendering in an X11 window. The 3D core rendering
-component is the <url name="Mesa" url="http://www.mesa3d.org"> library.
-SGI has released the sources to the GLX extension framework under an
-open license, which essentially provides the glue between the 3D
-library and this windowing system. Precision Insight has integrated
-these components into the XFree86 X Server and added a Direct Rendering
-Infrastructure (DRI). Direct Rendering provides a highly optimized
-path for sending 3D data directly to the graphics hardware. This
-release provides a complete implementation of direct rendering support
-for the 3Dfx Banshee, Voodoo3 and Voodoo5 graphics cards, as well as
-the Intel i810/i815 cards, ATI Rage 128, and Matrox G400.
-Updated information on DRI
-compatible drivers can be found at the <url name="DRI Project"
-url="http://dri.sourceforge.net"> on <url name="SourceForge"
-url="http://www.sourceforge.net">.
+Direct rendered OpenGL&reg; support is provided for several hardware
+platforms by the Direct Rendering Infrastructure (DRI). Further information
+about DRI can be found at the <url name="DRI Project's web site"
+url="http://dri.sf.net/">. The 3D core rendering component is provided by
+<url name="Mesa" url="http://www.mesa3d.org">.
<sect1>XVideo Extension (Xv)
<p>
@@ -1196,7 +815,7 @@ file is included in the <htmlurl name="Xft(3)" url="Xft.3.man"> man page.
<sect2>FreeType support in Xft
<p>
-XFree86 &relvers; includes sources for FreeType version 2.1.1, and, by
+XFree86 &relvers; includes sources for FreeType version 2.1.4, and, by
default, they are built and installed automatically.
</sect2>
@@ -1274,9 +893,12 @@ in the <htmlurl name="README.fonts" url="fonts.html"> document.
<p>
XFree86 4.x comes with two TrueType backends, known as
-`xfsft' (the <tt>"freetype"</tt> module) and `X-TrueType' (the
-<tt>"xtt"</tt> module). Both of these backends are based on the FreeType
-library.
+"FreeType" backend (the <tt>"freetype"</tt> module) and `X-TrueType'
+(the <tt>"xtt"</tt> module). Both of these backends are based on the
+FreeType library. The functionality of X-TrueType has been merged into
+the FreeType backend by the After X-TT Project for XFree86 4.4.
+Consequently, the old X-TrueType backend will be dropped as of XFree86
+4.5.
<sect1>CID font support
<p>
@@ -1387,22 +1009,6 @@ please contact
<p>
-->
-<sect1>Directory rearrangements
-<p>
-
-Some changes to the installed XFree86 directory structure have been
-implemented for 4.x.
-One important
-change is a modified search path for the X
-server's <tt>XF86Config</tt> file. The details of this can be found
-in the XF86Config manual page. The other main change is moving
-most of the run-time configuration files to <tt>/etc/X11</tt>, with
-symbolic links in the old <tt>/usr/X11R6/lib/X11</tt> location pointing
-to the new location. Some run-time generated files are now located
-under the appropriate subdirectories of <tt>/var</tt>, again with the
-relevant symbolic links in the old location.
-
-
</article>
diff --git a/sgml/SCO.sgml b/sgml/SCO.sgml
index b13bde4..e031876 100644
--- a/sgml/SCO.sgml
+++ b/sgml/SCO.sgml
@@ -8,7 +8,8 @@
<date>14 February 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.22 2003/02/17 18:58:07 dawes Exp $
+$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.23 2003/12/18 16:38:38 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.23 2003/12/18 16:38:38 dawes Exp $
</ident>
<!-- Table of contents -->
@@ -27,15 +28,17 @@ XFree86, the following conditions must be met:
<item>Ensure that OSS646, the ``Execution Environment Update'' package is
installed, if appropriate. Check the release notes for that update
to see whether or not your current operating system requires this
- update. This supplement will be available to the public in February
- 2003.
- <item>Ensure that OSS631, the "Graphics, Web and X11 Libraries" package
- is installed. This ships standard with release 5.0.7 and later, and
- is only required for 5.0.[456] users. This package will be updated fairly
- frequently, and it us always suggested you have the latest possible
- version installed. At some point in the future it may even update the
- libraries in 5.0.7, so it is worth checking the release notes for this
- supplement.
+ update. At least version OSS646B is required. If you are running
+ SCO OpenServer Release 5.0.7, you must have Maintenance Pack 1 installed.
+ <item>Ensure that the "Graphics, Web and X11 Libraries" package is
+ installed. At least version 1.3.2Ag is required. You should always
+ install the latest possible version of this supplement that is valid
+ for your operating system release. From time to time this release is
+ bundled with Maintenance Packs, so if you are running 5.0.7 or later,
+ the latest version may be in the latest Maintenance Pack. Always check
+ the release notes for GWXLIBS to see if your platform requires the
+ update. The latest version can always be found at the
+ <url name="SCO FTP site" url="ftp://ftp.sco.com/pub/openserver5/opensrc">.
<item>To compile XFree86, you must use the SCO-supported version of
the GNU C Compiler. It is possible that Skunkware versions of the
compiler will work too, but this has not been tested. The ``GNU
@@ -43,8 +46,8 @@ XFree86, the following conditions must be met:
SCO OpenServer Release 5.0.5. It is provided with the operating system
in all versions from Release 5.0.7, although you need to run ``custom''
to install it from the media. You can always download the latest
- latest version of the GNU Development System from the <url
- name="SCO Web site" url="http://www.sco.com">.
+ latest version of the GNU Development System from the
+ <url name="SCO FTP site" url="ftp://ftp.sco.com/pub/openserver5/opensrc">.
<item>If you are not using OSR 5.0.7 or later, you need to get an updated
console driver. See <url url="http://www.sco.com"> for details on
OpenServer supplements. If you can't or don't want to upgrade your
diff --git a/sgml/index.pre b/sgml/index.pre
index dff4c73..72544de 100644
--- a/sgml/index.pre
+++ b/sgml/index.pre
@@ -8,10 +8,11 @@
<!-- Title information -->
<title>Documentation for XFree86&trade; version &relvers;
<author>The XFree86 Project, Inc
-<date>18 October 2003
+<date>18 December 2003
<!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.20 2003/10/19 00:58:39 dawes Exp $
+$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 $
-->
<p>