summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:31 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:31 +0000
commit697693f53073b57bb30503829fb8ec1acdb9a218 (patch)
tree0c5f169629860fc85624e92a68da8207ac27110a
parenta65ace52f7767e5ccc7d731d2a4b5efad92d0235 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
-rw-r--r--hardcopy/XDMCP/xdmcp.PS.gzbin27984 -> 28978 bytes
-rw-r--r--hardcopy/Xext/shape.PS.gzbin15263 -> 13782 bytes
-rw-r--r--man/general/Consortium.man2
-rw-r--r--man/general/Standards.man5
-rw-r--r--man/general/X.man2
-rw-r--r--man/general/XProjectTeam.man2
-rw-r--r--man/general/security.man2
-rw-r--r--registry22
-rw-r--r--sgml/Darwin.sgml70
-rw-r--r--sgml/Install.sgml97
-rw-r--r--sgml/LICENSE.sgml2
-rw-r--r--sgml/LynxOS.sgml2
-rw-r--r--sgml/NetBSD.sgml2
-rw-r--r--sgml/OS2Notes.sgml2
-rw-r--r--sgml/OpenBSD.sgml39
-rw-r--r--sgml/README.sgml200
-rw-r--r--sgml/RELNOTES.sgml1344
-rw-r--r--sgml/SCO.sgml25
-rw-r--r--sgml/Solaris.sgml2
-rw-r--r--sgml/Versions.sgml2
-rw-r--r--sgml/XKB-Config.sgml2
-rw-r--r--sgml/XKB-Enhancing.sgml2
-rw-r--r--sgml/add.sh2
-rw-r--r--sgml/dps.sgml2
-rw-r--r--sgml/fonts.sgml26
-rw-r--r--sgml/index.post2
-rw-r--r--sgml/index.pre4
-rw-r--r--sgml/mdefs.pre2
-rw-r--r--specs/CTEXT/ctext.tbl.ms2
-rw-r--r--specs/ICCCM/icccm.ms2
-rw-r--r--specs/SM/xsmp.ms2
-rw-r--r--specs/X11/CH022
-rw-r--r--specs/X11/CH092
-rw-r--r--specs/X11/CH132
-rw-r--r--specs/X11/CH142
-rw-r--r--specs/X11/glossary2
-rw-r--r--specs/XDMCP/xdmcp.ms10
-rw-r--r--specs/XIM/xim.ms2
-rw-r--r--specs/XProtocol/X11.encoding2
-rw-r--r--specs/Xext/DPMS.ms2
-rw-r--r--specs/Xext/buffer.ms2
-rw-r--r--specs/Xext/evi.ms2
-rw-r--r--specs/Xext/shape.ms24
-rw-r--r--specs/Xext/sync.tex2
-rw-r--r--specs/Xi/porting.ms2
-rw-r--r--specs/Xmu/Xmu.ms2
-rw-r--r--specs/Xserver/analysis.tex2
-rw-r--r--specs/Xserver/secint.tex2
-rw-r--r--specs/i18n/Framework.ms2
-rw-r--r--specs/rstart/rstart.ms2
-rw-r--r--specs/specindex.html2
-rw-r--r--specs/xtrans/Xtrans.mm2
52 files changed, 1104 insertions, 838 deletions
diff --git a/hardcopy/XDMCP/xdmcp.PS.gz b/hardcopy/XDMCP/xdmcp.PS.gz
index b69d845..837ba0a 100644
--- a/hardcopy/XDMCP/xdmcp.PS.gz
+++ b/hardcopy/XDMCP/xdmcp.PS.gz
Binary files differ
diff --git a/hardcopy/Xext/shape.PS.gz b/hardcopy/Xext/shape.PS.gz
index a0e1330..fe85f70 100644
--- a/hardcopy/Xext/shape.PS.gz
+++ b/hardcopy/Xext/shape.PS.gz
Binary files differ
diff --git a/man/general/Consortium.man b/man/general/Consortium.man
index 1a433c5..b708019 100644
--- a/man/general/Consortium.man
+++ b/man/general/Consortium.man
@@ -24,7 +24,7 @@
.\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" $XFree86: xc/doc/man/general/Consortium.man,v 1.4 2001/01/27 18:20:38 dawes Exp $
+.\" $XFree86$
.\"
.TH XCONSORTIUM __miscmansuffix__ __xorgversion__
.SH NAME
diff --git a/man/general/Standards.man b/man/general/Standards.man
index a253a34..cb6ee22 100644
--- a/man/general/Standards.man
+++ b/man/general/Standards.man
@@ -1,4 +1,5 @@
.\" $Xorg: Standards.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $
+.\" $XdotOrg: xc/doc/man/general/Standards.man,v 1.1.10.2 2004/03/16 02:44:56 alanc Exp $
.\" Copyright (c) 1993, 1994, 1996 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -25,7 +26,7 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
-.\" $XFree86: xc/doc/man/general/Standards.man,v 1.4 2001/01/27 18:20:38 dawes Exp $
+.\" $XFree86$
.\"
.\"
.TH XSTANDARDS __miscmansuffix__ __xorgversion__
@@ -91,7 +92,7 @@ X Version 11, Release 6.4
Keith Packard
X11 Nonrectangular Window Shape Extension
-Version 1.0
+Version 1.0.1
X Version 11, Release 6.4
Keith Packard
diff --git a/man/general/X.man b/man/general/X.man
index ff610b1..20a3f8f 100644
--- a/man/general/X.man
+++ b/man/general/X.man
@@ -25,7 +25,7 @@
.\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" $XFree86: xc/doc/man/general/X.man,v 1.8 2002/10/12 16:06:41 herrb Exp $
+.\" $XFree86: xc/doc/man/general/X.man,v 1.7 2001/10/01 13:43:56 eich Exp $
.\"
.TH X __miscmansuffix__ __vendorversion__
.SH NAME
diff --git a/man/general/XProjectTeam.man b/man/general/XProjectTeam.man
index 0914c53..8780cf6 100644
--- a/man/general/XProjectTeam.man
+++ b/man/general/XProjectTeam.man
@@ -25,7 +25,7 @@
.\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" $XFree86: xc/doc/man/general/XProjectTeam.man,v 1.3 2001/12/19 21:37:27 dawes Exp $
+.\" $XFree86: xc/doc/man/general/XProjectTeam.man,v 1.2 2001/01/27 18:20:38 dawes Exp $
.\"
.TH X.Org __miscmansuffix__ __xorgversion__
.SH NAME
diff --git a/man/general/security.man b/man/general/security.man
index a51e386..4219a2f 100644
--- a/man/general/security.man
+++ b/man/general/security.man
@@ -26,7 +26,7 @@
.\" from the X Consortium.
.\"
.\"
-.\" $XFree86: xc/doc/man/general/security.man,v 1.5 2003/07/09 15:27:25 tsi Exp $
+.\" $XFree86: xc/doc/man/general/security.man,v 1.4tsi Exp $
.\"
.nr )S 12
.TH XSECURITY __miscmansuffix__ __xorgversion__
diff --git a/registry b/registry
index b5509df..bdfb3b6 100644
--- a/registry
+++ b/registry
@@ -1,4 +1,5 @@
/* $Xorg: registry,v 1.7 2001/06/01 18:55:58 coskrey Exp $ */
+/* $XdotOrg: xc/registry,v 1.1.4.2.6.2 2004/03/08 23:27:00 alanc Exp $ */
X Registry
@@ -11,8 +12,8 @@ or to
The X.Org Group -- X11 Registry
c/o Ienup Sung
Sun Microsystems, Inc.
- 901 San Antonio Road, MS SJC07-201
- Palo Alto, CA 94303-4900
+ 4150 Network Circle, MS SJC07-201
+ Santa Clara, CA 95054
Electronic mail will be acknowledged upon receipt.
Please allow up to 4 weeks for a formal response to registration and inquiries.
@@ -1087,8 +1088,8 @@ REFERENCES
X.Org Chair:
Steve Swales
Sun Microsystems, Inc.
- 901 San Antonio Road, MS SJC07-201
- Palo Alto, CA 94303-4900
+ 4150 Network Circle, MS SJC07-201
+ Santa Clara, CA 95054
steve.swales@sun.com
X.Org Co-Chair:
@@ -1326,8 +1327,8 @@ REFERENCES
[57] (Originally David Rosenthal)
Steve Swales
Sun Microsystems, Inc.
- 901 San Antonio Road, MS SJC07-201
- Palo Alto, CA 94303-4900
+ 4150 Network Circle, MS SJC07-201
+ Santa Clara, CA 95054
steve.swales@sun.com
[58] (Originally Murali V. Srinivasan)
@@ -1415,11 +1416,8 @@ REFERENCES
P.O. Box 58700
Salt Lake City, UT 84158
-[76] Cheryl Huntington
- MS. MTV21-04
- Sun Microsystems
- 2550 Garcia Ave.
- Mountain View, CA. 94043-1100
+[76] (Originally Cheryl Huntington)
+ See Reference [57]
[77] Junichi Hiramoto
Manager, Engineering Department
@@ -1688,4 +1686,4 @@ REFERENCES
property type and selection target. The ICCCM spec will be updated
in a future release to fully specify UTF8_STRING.
-/* $XFree86: xc/registry,v 1.8 2003/07/09 15:27:23 tsi Exp $ */
+/* $XFree86: xc/registry,v 1.7tsi Exp $ */
diff --git a/sgml/Darwin.sgml b/sgml/Darwin.sgml
index d92e60e..675aaf8 100644
--- a/sgml/Darwin.sgml
+++ b/sgml/Darwin.sgml
@@ -4,10 +4,11 @@
<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>
+$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.1.4.1.4.2 2004/03/04 20:16:20 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.9 2001/12/13 07:09:05 torrey Exp $
</ident>
@@ -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/Install.sgml b/sgml/Install.sgml
index fd2cf4b..33b88ca 100644
--- a/sgml/Install.sgml
+++ b/sgml/Install.sgml
@@ -6,7 +6,7 @@
<title>Installation Details for XFree86&trade; &relvers;
<author>The XFree86 Project, Inc
-<date>24 February 2003
+<date>23 February 2004
<ident>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
@@ -23,7 +23,7 @@ How to install XFree86.
<sect>Introduction
<p>
This document contains information about installing the XFree86 binaries
-as provided by The XFree86 Project.
+provided by The XFree86 Project.
<p>
The XFree86 binaries that we provide for UNIX-like OS's (Linux, the
@@ -101,10 +101,10 @@ distribution.
<itemize>
<item>The Xinstall.sh script must be downloaded in binary mode,
- otherwise it won't run correctly. If you get lots of "command
+ otherwise it will not run correctly. If you get lots of "command
not found" messages when you try to run it, then it is most
- likely because the script wasn't downloaded in binary mode.
- Some web browsers won't do this for files of that name, so we
+ likely because the script was not downloaded in binary mode.
+ Some web browsers will not do this for files of that name, so we
also have a copy of it called "<tt>Xinstall.bin</tt>", and most
browsers should download that correctly. When downloading it
under this name, select "save as" on your browser, and save the
@@ -112,23 +112,24 @@ distribution.
<item>The Xinstall.sh script requires some system commands and
utilities to function correctly. While most systems will have
- these, some Linux installations may not. If you find that the
- script is failing because of some missing system command, you
- will need to install it before you can continue. If you don't
+ these, some Linux installations may not. If the
+ script fails because of some missing system command, you
+ need to install it before you can continue. If you do not
know how to do this, then we recommend that you obtain this
version of XFree86 from your Operating System distributor.
- <item>Always use the version of the Xinstall.sh script that's provided
- with the release you're installing. Older versions of the script
+ <item>Always use the version of the Xinstall.sh script that is provided
+ with the release. Older versions of the script
may not install newer releases correctly.
<item>If the binary distribution reported by the Xinstall.sh script
- isn't present on our site, then there are two possibilities.
- The first is that it hasn't been prepared and uploaded yet.
- This is likely if you are looking soon after the release date.
- The second possibility is that we won't have it available at
- all for this release. This is likely if it's still not there
- about two weeks after the release date. Check <url name="here"
+ is not present on the XFree86 site, then there are two possibilities:
+ first is that it has not uploaded yet. This is likeliest
+ possibility if you are looking shortly after the release date.
+ The second possibility is that your target will not be be
+ available at for this release. This is likeliest possibility
+ if you are looking about two weeks after the release date.
+ Check <url name="here"
url="http://www.xfree86.org/&relvers;/UPDATES.html"> for
information about updates to our binary distributions, and <url
name="here" url="http://www.xfree86.org/&relvers;/ERRATA.html">
@@ -136,12 +137,12 @@ distribution.
</itemize>
-Once you're run the <tt>Xinstall.sh</tt> script and found which binary
-<![ %updaterel; [update ]]>distribution is suitable for your system,
+Assuming that you have run the <tt>Xinstall.sh</tt> script and found the binary
+<![ %updaterel; [update ]]>distribution suitable for your system,
download the necessary files. The <![ %fullbinaries [twelve (12)]]><![
%updaterel [four (4)]]> mandatory files for all installations are listed
-below. If you have not downloaded all of the files, the installer script
-will complain.
+below. The installer script will complain if you do not have all four (4)
+files in the same directory.
<![ %fullbinaries [
<quote><verb>
@@ -173,16 +174,16 @@ NOTES:
<itemize>
<item>Some web browsers have a problem downloading the <tt>extract</tt>
utility correctly. If you encounter this problem, download the
- version called <tt>extract.exe</tt> instead. This should fix the
- problem. (This is not a DOS/Windows executable.)
+ version called <tt>extract.exe</tt>. (NOTE: This is not a
+ MS-DOS/Windows executable.)
<![ %fullbinaries [
- <item>A few distributions don't have or require the <tt>Xvar.tgz</tt>
+ <item>Some distributions do not require the <tt>Xvar.tgz</tt>
tarball. If it is present in the <tt>binaries</tt> sub-directory
for your platform, then it is required.
]]>
- <item>The Darwin/Mac OS X distribution doesn't have or require the
+ <item>The Darwin/Mac OS X distribution do not have or require the
<![ %fullbinaries [<tt>Xmod.tgz</tt>]]><![ %updaterel
[<tt>Xdrivers.tgz</tt>]]> tarball.
@@ -196,17 +197,19 @@ The following eleven (11) tarballs are optional. You should download
the ones you want to install.
<quote><verb>
-1. Xfsrv.tgz Font server
-2. Xnest.tgz Nested X server
-3. Xprog.tgz X header files, config files and compile-time libs
-4. Xprt.tgz X Print server
-5. Xvfb.tgz Virtual framebuffer X server
-6. Xf100.tgz 100dpi fonts
-7. Xfcyr.tgz Cyrillic fonts
-8. Xfscl.tgz Scalable fonts (Speedo, Type1 and TrueType)
-9. Xhtml.tgz HTML version of the documentation
-10. Xps.tgz PostScript version of the documentation
-11. Xjdoc.tgz Documentation in Japanese
+1. Xdrm.tgz Source for DRM kernel modules
+2. Xfsrv.tgz Font server
+3. Xnest.tgz Nested X server
+4. Xprog.tgz X header files, config files and compile-time libs
+5. Xprt.tgz X Print server
+6. Xvfb.tgz Virtual framebuffer X server
+7. Xf100.tgz 100dpi fonts
+8. Xfcyr.tgz Cyrillic fonts
+9. Xfscl.tgz Scalable fonts (Speedo, Type1 and TrueType)
+10. Xhtml.tgz HTML version of the documentation
+11. Xps.tgz PostScript version of the documentation
+12. Xpdf.tgz PDF version of the documentation
+13. Xjdoc.tgz Documentation in Japanese
</verb></quote>
NOTES:
@@ -222,7 +225,7 @@ If you miss some and want to install them later, go to the
<sect>Installing XFree86 &relvers; using the <tt>Xinstall.sh</tt> script
<p>
We strongly recommend that our XFree86 &relvers; binaries be installed
-using the <tt>Xinstall.sh</tt> script that we provide.
+using the <tt>Xinstall.sh</tt> script we provide.
<![ %updaterel [It is also important that the previous full release
(&fullrelvers;) is installed before installing this update release.
Make sure that you use the &relvers; version of the <tt>Xinstall.sh</tt>
@@ -234,10 +237,10 @@ according to the platform and hardware setup. <![ %fullbinaries [There is a des
the manual installation process for the most common cases <ref
id="manual-install" name="below">.]]>
-You must login as the super user (root) to run the installer script.
-Place all of the downloaded files into a single directory (choose a
-temporary location with enough space). Use the cd command to change to
-that directory and then run the installer script as follows:
+You must login as the super user (root) to run the installer script and
+place all of the downloaded files into a single directory.
+Use the cd command to change to the chosen directory and
+run the installer script as follows:
<tscreen><verb>
sh Xinstall.sh
@@ -257,7 +260,7 @@ the first question, the default answers should be OK.
If you run the installer from within an X session (the installer checks
if <tt>$DISPLAY</tt> is set), you will be warned that doing so is not
-a good idea. Unless you have a good reason for knowing that this won't
+a good idea. Unless you have a good reason for knowing that this will not
be a problem, you should exit your X session, including stopping xdm or
equivalent if it is running, before continuing. If you ignore this
warning and run into problems, well, you were warned!
@@ -272,7 +275,7 @@ configuration files may be overwritten though, but the installer should
prompt you before doing so. As the opening greeting says, it is
<bf>strongly</bf> recommended that you backup any existing installation
before proceeding. If you want your old applications to still be there
-after you've installed, don't do the "backup" by simply renaming
+after you've installed, do not do the "backup" by simply renaming
your old <tt>/usr/X11R6</tt> directory. It is better to make a copy of
it, and then install over the top of the original one. If you run into
problems and want to revert to the old installation, you can then
@@ -289,17 +292,17 @@ existing configuration files. As of XFree86 version 3.9.18, the run-time
configuration files are installed by default under <tt>/etc/X11</tt>
instead of under <tt>/usr/X11R6/lib/X11</tt>. The installer will move
the existing ones for you and create the necessary symbolic links. If
-you don't want to have these configuration files under <tt>/etc/X11</tt>,
+you do not want to have these configuration files under <tt>/etc/X11</tt>,
then you should answer "no" when asked about it. Answering "no" here
also means that the new configuration files will be installed in the
old <tt>/usr/X11R6/lib/X11</tt> location.
-Note: for the rare systems that don't have symbolic links, this question
+Note: for the rare systems that do not have symbolic links, this question
will not be asked. The default answer is "yes" because that is best
for most situations. It is our new default. It makes it easier to
share the <tt>/usr/X11R6</tt> directory between multiple hosts, and
-allows it to be mounted read-only. If you don't need these features,
-then you can safely answer "no" if you don't want them moved.
+allows it to be mounted read-only. If you do not need these features,
+then you can safely answer "no" if you do not want them moved.
When installing over an existing version, you will be prompted before
each set of configuration files is installed. If you haven't made any
@@ -318,7 +321,7 @@ proceed without any user intervention.
If you downloaded any of the optional components, the installer will
ask you about each one before it is installed. The default answer is
-"yes". If there are any that you've since decided that you don't want
+"yes". If there are any that you've since decided that you do not want
to install, answer "no" when prompted.
After that is done, the main part of the installation is complete. The
diff --git a/sgml/LICENSE.sgml b/sgml/LICENSE.sgml
index 0bb09db..c074d34 100644
--- a/sgml/LICENSE.sgml
+++ b/sgml/LICENSE.sgml
@@ -8,7 +8,7 @@
<date>February 2003</date>
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.16 2003/10/26 12:17:17 herrb Exp $
+$XFree86$
</ident>
<sect>XFree86 License
diff --git a/sgml/LynxOS.sgml b/sgml/LynxOS.sgml
index 94684b5..cbc09fd 100644
--- a/sgml/LynxOS.sgml
+++ b/sgml/LynxOS.sgml
@@ -8,7 +8,7 @@
<date>25 February 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.20 2000/06/17 00:27:32 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 2000/03/03 21:28:08 dawes Exp $
</ident>
<toc>
diff --git a/sgml/NetBSD.sgml b/sgml/NetBSD.sgml
index b943842..1b1a142 100644
--- a/sgml/NetBSD.sgml
+++ b/sgml/NetBSD.sgml
@@ -12,7 +12,7 @@ Matthieu Herrb
<Date>Last modified on: 9 November 2002
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.68 2003/02/16 17:21:11 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.67 2003/02/16 17:19:22 dawes Exp $
</ident>
<toc>
diff --git a/sgml/OS2Notes.sgml b/sgml/OS2Notes.sgml
index 6bdc7d1..916d00c 100644
--- a/sgml/OS2Notes.sgml
+++ b/sgml/OS2Notes.sgml
@@ -6,7 +6,7 @@
<date>Last modified March 8th, 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.2 2003/01/04 04:20:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.1 2001/06/04 13:50:15 dawes Exp $
</ident>
<toc>
diff --git a/sgml/OpenBSD.sgml b/sgml/OpenBSD.sgml
index 142ae16..6219e11 100644
--- a/sgml/OpenBSD.sgml
+++ b/sgml/OpenBSD.sgml
@@ -6,10 +6,10 @@
<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 $
+$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 +31,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 +50,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 +237,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 +250,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 b121882..e6e6501 100644
--- a/sgml/README.sgml
+++ b/sgml/README.sgml
@@ -13,10 +13,10 @@
<title>README for XFree86&tm; &relvers;
<author>The XFree86 Project, Inc
-<date>26 February 2003
+<date>23 February 2004
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.135 2003/10/18 13:30:27 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.140 2004/02/24 03:41:40 dawes Exp $
</ident>
<abstract>
@@ -53,19 +53,19 @@ 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
software. If you find problems with this snapshot, you are encouraged
to report your findings to the public XFree86 mailing list:
-<email>XFree86@XFree86.org</email>.
+<email>devel@XFree86.org</email>.
<![ %relcandidate [
XFree86 &relvers; is a feature-complete snapshot of XFree86
-&nextfullrelvers;.
+&fullrelvers;.
]]>
]]>
@@ -82,17 +82,16 @@ 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.
-
-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.
+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&trade; is produced by The XFree86 Project, Inc through the work
+of a group of volunteer independent developers. The XFree86 Project is
+a non-commercial organisation and XFree86 would not exist without the
+invaluable development contributions of volunteers from around the world.
+This release is dedicated to the greater XFree86 community, developers
+and users alike.
<![ %snapshot [
<sect>Redistribution of Snapshots
@@ -103,6 +102,35 @@ 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 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 at
+<email>bod@XFree86.org</email>.
+
<sect>Pointers to additional information
<p>
@@ -112,16 +140,12 @@ Documentation for the latest release version can always be found <url
name="here" url="http://www.xfree86.org/current/">, and documentation
for the latest pre-release snapshot can be found <url name="here"
url="http://www.xfree86.org/snapshot/">. Checking those last two links
-is a good way of finding out the latest versions available from XFree86.
+is a good way of finding out the latest available versions of XFree86.
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 +155,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 +178,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>
@@ -200,10 +233,18 @@ README file for that version, which can be found on the
<![ %fullrel [
The source for version &fullrelvers; is split into seven tarballs:
-<tt>X&fullsrcvers;src-1.tgz</tt>, <tt>X&fullsrcvers;src-2.tgz</tt>,
-<tt>X&fullsrcvers;src-3.tgz</tt>, <tt>X&fullsrcvers;src-4.tgz</tt>,
-<tt>X&fullsrcvers;src-5.tgz</tt>, <tt>X&fullsrcvers;src-6.tgz</tt> and
-<tt>X&fullsrcvers;src-7.tgz</tt>. The first three contain everything
+
+<tscreen><verb>
+XFree86-&fullrelvers;-src-1.tgz
+XFree86-&fullrelvers;-src-2.tgz
+XFree86-&fullrelvers;-src-3.tgz
+XFree86-&fullrelvers;-src-4.tgz
+XFree86-&fullrelvers;-src-5.tgz
+XFree86-&fullrelvers;-src-6.tgz
+XFree86-&fullrelvers;-src-7.tgz
+</verb></tscreen>
+
+The first three contain everything
except the fonts and general X11 documentation. Those three are sufficient
for building XFree86 if you already have a set of fonts. The fourth
and fifth contain the fonts. The sixth contains the source for the
@@ -212,10 +253,11 @@ documentation in hardcopy format.
<![ %onediff; [
A source patch relative to version &prevfullrelvers; is also available.
-The patch file is <tt>&prevfullrelvers;-&fullrelvers;.diff.gz</tt>.
+The patch file is <tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff.gz</tt>.
<![ %difftar; [
There is also a tarball that contains some files that have components that
-can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>.
+can't be included in a diff. It is
+<tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
]]>
The patch
should be applied to a clean &prevfullrelvers; source tree, working from
@@ -223,23 +265,23 @@ the directory containing the <tt>xc/</tt> directory. The patch should
be applied by running:
<tscreen><verb>
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff.gz | patch -p0 -E
</verb></tscreen>
<![ %difftar; [
<tscreen><verb>
-gzip -d &lt; &fullrelvers;.tgz | tar vxf -
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
</verb></tscreen>
]]>
]]>
<![ %twodiffs; [
A source patch relative to version &prevfullrelvers; is also available.
-Because of its size, it is split into two parts.
-The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt> and
-<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>.
+Because of its size, it is split into two parts. The patch files are
+<tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz</tt> and
+<tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>.
<![ %difftar; [
There is also a tarball that contains some files that have components that
-can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>.
+can't be included in a diff. It is <tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
]]>
These patches should
be applied to a clean &prevfullrelvers; source tree, working from the directory
@@ -247,12 +289,12 @@ containing the <tt>xc/</tt> directory. The patches should be applied by
running:
<tscreen><verb>
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
</verb></tscreen>
<![ %difftar; [
<tscreen><verb>
-gzip -d &lt; &fullrelvers;.tgz | tar vxf -
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
</verb></tscreen>
]]>
]]>
@@ -260,12 +302,18 @@ gzip -d &lt; &fullrelvers;.tgz | tar vxf -
<![ %threediffs; [
A source patch relative to version &prevfullrelvers; is also available.
Because of its size, it is split into three parts.
-The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt>,
-<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt> and
-<tt>&prevfullrelvers;-&fullrelvers;.diff3.gz</tt>.
+The patch files are:
+
+<tscreen><verb>
+XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz
+XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz
+XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz
+</verb></tscreen>
+
<![ %difftar; [
There is also a tarball that contains some files that have components that
-can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>.
+can't be included in a diff. It is
+<tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
]]>
These patches should
be applied to a clean &prevfullrelvers; source tree, working from the directory
@@ -273,13 +321,13 @@ containing the <tt>xc/</tt> directory. The patches should be applied by
running:
<tscreen><verb>
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
</verb></tscreen>
<![ %difftar; [
<tscreen><verb>
-gzip -d &lt; &fullrelvers;.tgz | tar vxf -
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
</verb></tscreen>
]]>
]]>
@@ -287,13 +335,24 @@ gzip -d &lt; &fullrelvers;.tgz | tar vxf -
<![ %fourdiffs; [
A source patch relative to version &prevfullrelvers; is also available.
Because of its size, it is split into four parts.
-The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt>,
-<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>,
-<tt>&prevfullrelvers;-&fullrelvers;.diff3.gz</tt> and
-<tt>&prevfullrelvers;-&fullrelvers;.diff4.gz</tt>.
+The patch files are:
+
+<tscreen><verb>
+XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz
+XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz
+XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz
+XFree86-&prevfullrelvers;-&fullrelvers;.diff4.gz
+</verb></tscreen>
+
<![ %difftar; [
-There is also a tarball that contains some files that have components that
-can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>.
+There is also a tarball and a cleanup script that handle files that have
+components that can't be included in a diff. These are:
+
+<tscreen><verb>
+XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz
+XFree86-&prevfullrelvers;-&fullrelvers;-cleanup.sh
+</verb></tscreen>
+
]]>
These patches should
be applied to a clean &prevfullrelvers; source tree, working from the directory
@@ -301,30 +360,15 @@ containing the <tt>xc/</tt> directory. The patches should be applied by
running:
<tscreen><verb>
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
-gzip -d &lt; &prevfullrelvers;-&fullrelvers;.diff4.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff4.gz | patch -p0 -E
</verb></tscreen>
<![ %difftar; [
-<![ %removefiles; [
-<tscreen><verb>
-rm -f xc/doc/hardcopy/Xext/mit-shm.PS.gz
-rm -f xc/doc/hardcopy/saver/saver.PS.gz
-rm -fr xc/fonts/scaled/Ethiopic
-rm -fr xc/fonts/scaled/Meltho
-rm -fr xc/programs/Xserver/hw/darwin/bundle
-rm -f xc/programs/Xserver/hw/hp/input/drivers/XHPKeymaps
-rm -f xc/programs/Xserver/hw/hp/ngle/ngledoblt.o.8.07
-rm -f xc/programs/Xserver/hw/xwin/X.ico
-rm -fr xc/programs/xcursorgen/redglass
-rm -fr xc/programs/xcursorgen/whiteglass
-touch xc/extras/Mesa/src/Trace/tr_attrib.c
-touch xc/lib/fontconfig/NEWS
-</verb></tscreen>
-]]>
<tscreen><verb>
-gzip -d &lt; &fullrelvers;.tgz | tar vxf -
+sh XFree86-&prevfullrelvers;-&fullrelvers;-cleanup.sh
+gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
</verb></tscreen>
]]>
]]>
diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index dc6e6cf..3a6482d 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -6,16 +6,16 @@
<title>Release Notes for XFree86&trade; &relvers;
<author>The XFree86 Project, Inc
-<date>21 November 2003
+<date>29 February 2004
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.83 2003/11/21 05:44:11 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.115 2004/02/24 03:41:40 dawes Exp $
</ident>
<abstract>
-This document contains some information about features present
-in XFree86 &relvers; and their status.
+This document contains information about features and their status in XFree86
+&relvers;.
</abstract>
@@ -39,31 +39,32 @@ of the hardware drivers from 3.3.x have been ported to 4.x yet, but
conversely, 4.x has support for a lot of hardware that is not supported
in 3.3.x. Our <htmlurl name="Driver Status document" url="Status.html">
summarizes how the hardware driver support compares between &legacyvers;
-and &relvers;. Please check there first before downloading &relvers;.
+and &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.
-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
-things afterwards, you can cut and paste the automatically generated
-configuration from the <tt>/var/log/XFree86.0.log</tt> file into an
-<tt>XF86Config</tt> file and make your customisations there. Runtime
-and dynamic configuration is planned for future releases.
-
-If you don't have any luck with automatic configuration, or you are using
-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
-configuration file, and to customise existing configurations.
-
-Next in the order of configuration preferences is to make use of the
-XFree86 server's ability to create a starting configuration file. To
-do this, just run (as root):
+XFree86 server which makes it now possible to start XFree86 without first
+creating a configuration file. The initial automatic configuration
+support is targeted towards Linux and FreeBSD and it is hoped that
+automatic configuration will be supported on other platforms in
+future releases.
+
+If you are running either Linux or FreeBSD, try it out if you
+do not already have a working <tt>XF86Config</tt> file. If you want to
+customise things afterwards, you can cut and paste the automatically
+generated configuration from the <tt>/var/log/XFree86.0.log</tt> file
+into an <tt>XF86Config</tt> file and make your customisations there.
+
+If you do not have any luck with automatic configuration, or you are using
+a platform that is not currently supported, try one of the older methods
+for getting started.
+
+XFree86 comes with a graphical configuration tool called "<tt>xf86cfg</tt>",
+which also has a text mode interface and can be used to create an initial
+configuration file. It can also be used to customise existing
+configurations.
+
+Next in the order of configuration preferences is to use the XFree86
+server's ability to create a starting configuration file. Run as root:
<tscreen><verb>
XFree86 -configure
@@ -71,22 +72,24 @@ XFree86 -configure
and follow the instructions.
-Finally, the trusty old text-based tool "<tt>xf86config</tt>" can also
-be used for generating X server config files.
+Finally, if all else fails, the trusty old standby text-based tool
+"<tt>xf86config</tt>" can also be used for generating X server config
+files.
-At least one of these configuration options will give you a reasonable
-starting point for a suitable configuration file. With the automatic
-mechanism you might even find that you don't need one! If you do need
-to customise the configuration file, you can find it fully documented
-in the <htmlurl name="XF86Config manual page" url="XF86Config.5.html">.
-Also check the driver-specific manual pages and the related documentation
-for further information. References to this driver-specific information
-can be found in the <ref id="drivertables" name="tables below">.
+At least one, and hopefully, all of these configuration options will
+give you a reasonable starting point for a suitable configuration
+file. With the automatic mechanism you might even find that you don't
+need one!
-Before you go to download and install the binary distributions for
-this release, please have a quick read through the <htmlurl
-name="Installation Document" url="Install.html">. It may save you some
-time and help you figure out which of the binary releases you need.
+If you do need to customise the configuration file, see the <htmlurl
+name="XF86Config manual page" url="XF86Config.5.html">. You can also
+check the driver-specific manual pages and the related documentation
+(found at <ref id="drivertables" name="tables below"> also.
+
+Before downloading the binary distributions for this release, please
+have a quick read through the <htmlurl name="Installation Document"
+url="Install.html">. It may save you some time and also help you figure out
+which of the binary releases you need.
<![ %updaterel [
The next sections describe what has changed in the update release(s)
@@ -110,44 +113,60 @@ don't have enough space to cover them all here.
]]>
<sect>Summary of new features in &fullrelvers;.
+<p>
-<sect1>NEEDS TO BE UPDATED
+This is a sampling of the new features in XFree86 &fullrelvers;. A more
+complete list of changes can be found in the CHANGELOG that is part of
+the XFree86 source tree. It can also be viewed online at our <url
+name="CVSweb server"
+url="http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/CHANGELOG?rev=HEAD">.
<sect1>Video Driver Enhancements
<p>
<itemize>
-<item> 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>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> 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>The nv driver for NVIDIA cards has been updated as follows:
-<item> National Semiconductor SC1x00, GX1, and GX2 chipset support added
- with the "nsc" driver.
+ <itemize>
+ <item>Support added to the nv driver for the GeForce FX 5700,
+ which didn't work with XFree86 4.3.
-<item> Support added for the NVIDIA nForce2 integrated graphics, GeForce 4,
- and GeForce FX.
+ <item>The driver now does a much better job of auto-detecting
+ which connector of dual output cards the monitor is
+ attached to, and this should reduce or eliminate the
+ need for manual XF86Config overrides.
-<item> Major SiS driver updates for some of the latest chipsets. Unfortunately
- the SiS 3D driver has had to be disabled because no one has yet
- taken up the challenge to port it to Mesa 4.x.
+ <item>The 2D acceleration for TNT and GeForce has been completely
+ rewritten and its performance should be substantially
+ improved.
+
+ <item>TNT and GeForce cards have a new Xv PutImage adaptor which
+ does scaled YUV bit blits.
+
+ </itemize>
-<item> The s3virge driver now has support for double scan modes on the DX
- (with XVideo disabled).
-
-<item> Updates to the savage driver, including fixing problems with the
- TwisterK, and problems with incorrect memory size detection.
+<item>The SiS driver has seen major updates, including:
-<item> 2D acceleration added for the Trident CyberBladeXP/Ai1 chipsets.
+ <itemize>
+ <item>Support for 661/741/760 and support for 330 (Xabre).
+
+ <item>Merged Framebuffer mode.
+
+ <item>Support for DVI, and much more.
+
+ <item>DRI for 300 series (300/305, 540, 630, 730) is supported
+ again.
+
+ </itemize>
-<item> 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.
+<item>Various updates and bug fixes have been made to most other drivers.
</itemize>
@@ -155,97 +174,239 @@ don't have enough space to cover them all here.
<p>
<itemize>
-<item> The mouse driver now has automatic protocol detection for PS/2 mice.
+<item>The mouse driver has some support on Linux and FreeBSD for
+ auto-detecting which device node to use. This makes it unnecessary
+ to supply this information in the XF86Config file in most cases.
-<item> Several new input drivers have been added, including tek4957,
- jamstudio (js_x), fpit, palmax, and ur98 (Linux only).
</itemize>
-<sect1>X Server and Extension Updates
+<sect1>IPv6 support
+<p>
+XFree86 4.4 supports IPv6, based on the code contributed by Sun
+Microsystems, Inc. to X.Org. See <url name="X.org's document"
+url="http://www.x.org/IPV6_Specific_Changes.html"> for a detailed list
+of what these changes are and how your system is affected by them.
+<sect2>Protocol names and aliases.
<p>
<itemize>
-<item> Support for the RandR extension has been partially integrated
- into the XFree86 server, providing support for resizing the root
- window at run-time.
+<item>tcp is an alias for both IPv6 and IPv4 transports.
+<item>inet specifies IPv4 only.
+<item>inet6 specifies IPv6 only.
+</itemize>
+<p>
+You can force the X server to only listen to IPv4 connections with the
+<tt>X -nolisten inet6 </tt> command or you can force a IPv6 connection
+by setting <bf>DISPLAY</bf> to <tt>inet6/host:0</tt>.
-<item> The Mesa version used for OpenGL&reg; 1.3 and DRI
- driver support has been updated to 4.0.4.
+<sect2>XDM
+<p>
+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 authentication scheme does not support IPv6
+addresses but a new release of the protocol, XDM-AUTHORIZATION-2 has
+been designed; this though is yet to be implemented. By default XFree86
+builds do not enable the XDM-AUTHORIZATION-1 code.
-<item> The XFree86 server's hot keys (including those for switching
- modes and virtual terminals) can now be configured via XKB.
- Previously they were hard coded. An X server configuration
- option has been added to allow the VT switching hot keys to be
- disabled.
+
+<sect1>X Server and Extension Updates
+
+<p>
+<itemize>
+
+<item>The Mesa version used for OpenGL&reg; 1.3 and DRI driver support
+ has been updated to 5.0.2.
</itemize>
<sect1>Client and Library Updates
<p>
-<itemize>
-<item> An Xcursor library providing support for alpha blended (ARGB)
- and animated cursors. Two Xcursor themes are provided (redglass
- and whiteglass), as well as the default "core" theme (the traditional
- cursors).
+<sect2>Xterm
+<p>
+
+The user-visible changes to xterm since XFree86 4.3 are:
-<item> Xterm updated to patch level 173, including the following bugfixes:
+ Bug Fixes:
<itemize>
- <item> Fix two infinite loops (special cases of mouse hilite tracking,
- DECUDK parsing).
- <item> Make repainting of the 256-color example work properly.
- <item> Modify parser tables to improve detection of malformed
- control sequences, making xterm behave more like a real
- DEC terminal.
- <item> Fix a problem with the blinking cursor which occasionally caused
- xterm to pause until a key was pressed.
- <item> Fix improper parsing of multiple items in the ttyModes resource.
+ <item>Make signalInhibit resource work, i.e., disable the menu
+ entries that would send signals to, or exit xterm.
+
+ <item>Make cursor definition in tek4014 emulation work as originally
+ implemented.
+
+ <item>Modify translations for scrollbar so that one can use
+ shifted pageup, wheel mouse, etc., while the mouse
+ pointer is over the scrollbar.
+
+ <item>Correct initialization of G1 character set mapping.
</itemize>
- and the following improvements:
+
+ New Features:
<itemize>
- <item> Modify xterm to invoke luit.
- <item> Add simple session management client capabilities.
- <item> Add a modifyCursorKeys resource to control how the shift- and
- similar modifiers are used to make a cursor escape sequence.
- <item> Check if the printerCommand resource string is empty,
- and use this to allow the user to disable printer function.
- <item> Sort the options list which is displayed in help- and
- syntax-messages at runtime to simplify maintenance.
+ <item>Modify the predictable version of the generated logfile
+ name to append the process-id rather than a random value.
+
+ <item>Modify scroll-back and scroll-forw actions to accept an
+ adjustment value, e.g.,
+
+ <tscreen><verb>
+scroll-back(1, page-2)
+ </verb></tscreen>
+
+ to scroll back by 2 lines less than a page.
+
+ <item>Add visualBellDelay resource to modify the length of
+ time used for visual bell, for very slow displays or
+ very fast computers.
+
</itemize>
-</itemize>
+ Improved Locale Support:
+ <itemize>
+ <item>modify uxterm script to strip modifiers such as "@euro" from the
+ locale setting before adding ".UTF-8".
+
+ <item>Add logic to wide-character support which attempts to
+ load fonts specified by utf8Fonts subresources at startup.
+ The subresources have the same names as the fonts which
+ they replace, e.g., font, font1, etc., so that the
+ ISO-10646-1 fonts can be specified in the XTerm
+ app-defaults file.
+
+ <item>Improved performance with chinput application.
+
+ </itemize>
+
+ Improved Font Handling:
+ <itemize>
+ <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
+ fontname.
+
+ <item>Make double-width characters work with -u8 option.
+
+ <item>Updated table of Unicode line-drawing characters.
+
+ <item>Several fixes for rendering using Xft (option -fa):
+ <itemize>
+ <item>Make height of TrueType fonts match ascent+descent.
+
+ <item>Translate Unicode values (from UTF-8 output to
+ xterm) for line-drawing to xterm's internal
+ code, etc., since TrueType fonts generally do
+ not have either set of line-drawing glyphs.
+ xterm can draw these directly.
+
+ <item>Pass 16-bit values rather than 8-bit values to
+ xtermXftDrawString() to allow for wide-characters.
+
+ <item>Use built-in line-drawing characters for Xft fonts.
+
+ <item>Implement underlining.
+ </itemize>
+
+ <item>Implement boldMode for wide-characters.
+
+ <item>Modified to work with CJK double-width (bi-width/monospace)
+ fonts.
+
+ </itemize>
+
+ Workarounds for Special Applications:
+ <itemize>
+ <item>Add option -k8 and resource allowC1Printable to allow
+ users of non-VTxxx character sets such as KOI-8 to treat
+ the C1 control area (character codes 128-159) as printable
+ rather than control characters.
+
+ <item>Add configure option --enable-broken-st and resource
+ brokenStringTerm to allow user to revert one part of
+ the parsing table corrections.
+
+ <item>Add configure option --enable-broken-osc and resource
+ brokenLinuxOSC to accommodate scripts which do not
+ distinguish between running in the Linux console and
+ running in X. Linux console recognizes malformed control
+ strings which start with an OSC, but are fixed-length,
+ with no terminator.
+
+ <item>Add configure option --enable-pty-handshake to allow
+ one to compile-in support for the pty handshaking logic,
+ and resource ptyHandshake to enable or disable it. This
+ feature is normally enabled.
+
+ </itemize>
+
+ Modified Resources:
+ <itemize>
+ <item>Change color4 to "dodger blue", since this provides
+ better contrast.
+
+ <item>Remove color resources from XTerm.ad, leaving them only
+ in XTerm-col.ad
+
+ <item>Modify UXTerm.ad resource file to include "XTerm-color"
+ rather than "XTerm", in case the latter file contains
+ no color resource definitions.
+
+ <item>Changed class of veryBoldColors to VeryBoldColors, since
+ ColorMode is associated with boolean resources.
+
+ <item>Changed classes of colorBDMode and similar resources
+ that override colors when a video attribute is set to
+ ColorAttrMode, to make them distinct from ColorMode.
+ This avoids an unexpected rendering of reverse video,
+ for example.
+
+ </itemize>
+
+ Modified terminfo/termcap entries:
+ <itemize>
+ <item>Add indp and rin to terminfo entry.
+
+ <item>Add le to termcap xterm-basic entry. Though missing
+ from older termcaps for xterm, some applications check
+ for it.
+
+ <item>Correct AF/AB strings in termcap for xterm-256color and
+ xterm-88color entries.
+
+ </itemize>
<sect1>I18N and Font Updates
<p>
<itemize>
-<item> FreeType2 updated to version 2.1.1.
+<item>FreeType2 updated to version 2.1.4.
+
+<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.
-<item> 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.
+ <itemize>
+ <item>The new "freetype" backend has the improved "very lazy" metric
+ calculation method which enables super-fast loading of
+ proportional CJKV fonts.
-<item> A new utility called "mkfontscale", which builds fonts.scale files,
- has been added.
+ <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.
-<item> The Xft library has undergone a major restructuring, and is now
- split into fontconfig (which deals with font discovery and
- configuration and is independent from X), and Xft itself (which
- uses fontconfig and deals with font rasterisation and rendering.
- The format of the Xft font configuration files has changed in
- an incompatible manner.
+ </itemize>
-<item> Support has been added to the Xft library to do rendering with the
- core X11 protocol. This allows clients using this library to
- render to X servers that don't have support for the RENDER extension.
+<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> 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 Bitstream Vera TrueType fonts that Bitstream, Inc donated to
+ the GNOME Foundation have been included with this release.
</itemize>
@@ -253,39 +414,32 @@ don't have enough space to cover them all here.
<p>
<itemize>
-<item> Updates for Darwin/Mac OS X, including:
+<item>On Mac OS X, the appropriate backend drawing code is now dynamically
+ loaded at runtime which 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> Various Cygwin support updates, including an experimental rootless
- X server for Cygwin/XFree86.
-
-<item> AMD AMD64 support (primarily for Linux so far) has been added.
+<item>On Darwin, IOKit mode now uses shadowfb for much faster drawing.
-<item> Support added for OpenBSD/sparc64.
+<item>Various GNU/Hurd support updates.
-<item> Major OS/2 support updates.
-
-<item> Major SCO OpenServer updates.
-
-<item> Multi-head support has been added for 460GX-based Itanium systems,
- and for ZX1-based Itanium2 systems.
-
-<item> Experimental support for SunOS/Solaris on UltraSPARC systems.
+<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
-part of the XFree86 source tree. It can also be viewed online at our
-<url name="CVSweb server"
-url="http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/CHANGELOG?rev=HEAD">.
-
<!--
<sect>Summary of new features in &prevrelvers;.
<p>
@@ -371,6 +525,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
@@ -406,6 +562,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>
@@ -414,10 +572,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
@@ -446,50 +603,78 @@ XFree86 &relvers; includes the following input drivers:
Drivers marked with (*) are available for Linux only.
+<sect>Known Problems
+<p>
+
+<itemize>
+<item>Known issues with this version of the SiS driver:
+
+ <itemize>
+ <item>The driver will not work with upcoming laptops/notebooks
+ with 661/741/760 and 30xLV bridges as regards LCD output. This
+ is due folks at SiS at the very moment writing an entirely new
+ VBIOS for such machines whose data layout is not decided yet.
+ (This might affect machines with 650/740 as well within the next
+ year.)
+
+ <item>Xv does not work correctly in TV NTSC 1024x768 mode, if
+ the overlay is very large (or full screen). The effect are
+ flickering lines on the screen. This is a hardware problem. Do
+ not use this mode for video.
+
+ <item>YPbPr 720p output is blurry (at least at 1024x768; unknown
+ for other modes). This is a driver problem; solution currently
+ unknown.
+
+ </itemize>
+
+<item>We have received a late report that enabling DPMS support with
+the radeon driver can damage some Viewsonic monitors. DPMS is usually
+disabled by default. You can verify whether or not DPMS is enabled by
+running 'xset q' from within your X session.
+
+</itemize>
+
<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 &relvers; has X server support for most UNIX(R) 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.
+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, and in that manner 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 and
+some BSD OSs on Alpha, PowerPC, IA-64, AMD64, Sparc, and Mips platforms,
+and for Darwin on PowerPC. 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
+The XFree86 X server has a built-in run-time loader, which 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 loader in version &relvers; has support for Intel (x86), Alpha and
-PowerPC platforms. It also has preliminary support for Sparc platforms.
+The loader does not rely on an operating system's native dynamic
+loader support and it works on platforms that do not provide this feature.
+This allows for the modules to be operating system independent (although
+not, of course, CPU architecture independent) which 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.
+
+A main benefit of this, 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.
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 (both API and ABI) used in this release are 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>
@@ -497,373 +682,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
@@ -902,15 +758,15 @@ Known problems:
<sect1>DGA version 2
<p>
-DGA 2.0 is included in &relvers;, but is not implemented by all drivers.
-Preliminary documentation for the client libraries can be found in the
-<tt>README.DGA</tt> document. A good degree of backwards compatibility
-with version 1.0 is provided.
+DGA 2.0 is included in &relvers;.
+Documentation for the client libraries can be found in the <htmlurl
+name="XDGA(3)" url="XDGA.3.man"> man page. A good degree of backwards
+compatibility with version 1.0 is provided.
<sect1>DDC
<p>
-The VESA(R) Display Data Channel (DDC&trade;) standard allows the monitor
+The VESA&reg; Display Data Channel (DDC&trade;) standard allows the monitor
to tell the video card (or on some cases the computer directly) about
itself; particularly the supported screen resolutions and refresh rates.
@@ -921,10 +777,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>
@@ -939,27 +794,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>
@@ -1030,7 +869,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>
@@ -1066,14 +905,14 @@ slower than core text.
The XFree86-Misc extension has not been fully ported to the new server
architecture yet. This should be completed in a future release.
-The XFree86-VidModeExtension extension has been updated, and mostly
-ported to the new server architecture. The area of mode validation
-needs further work, and the extension should be used with care. This
-extension has support for changing the gamma setting at run-time, for
-modes where this is possible. The <tt>xgamma</tt> utility makes
-use of this feature. Compatibility with the 3.3.x version of the
-extension is provided. The missing parts of this extension and some
-new features should be completed in a future release.
+The XFree86-VidModeExtension extension has been updated, and mostly ported
+to the new server architecture. The area of mode validation needs further
+work, and the extension should be used with care. This extension has
+support for changing the gamma setting at run-time, for modes where this
+is possible. The <tt>xgamma</tt> utility makes use of this feature.
+Compatibility with the 3.3.x version of the extension is provided.
+The missing parts of this extension and some new features should be
+completed in a future release.
<!--
@@ -1108,9 +947,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>
@@ -1183,6 +1025,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>
@@ -1221,22 +1124,299 @@ please contact
<p>
-->
-<sect1>Directory rearrangements
+<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,
+Mel Kravitz,
+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,
+Alain Poirier,
+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,
+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>
-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.
+This product includes software developed by The XFree86 Project, Inc
+(http://www.xfree86.org/) and its contributors.
+
+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/SCO.sgml b/sgml/SCO.sgml
index b13bde4..e530137 100644
--- a/sgml/SCO.sgml
+++ b/sgml/SCO.sgml
@@ -8,6 +8,7 @@
<date>14 February 2003
<ident>
+$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 1.1.4.2.4.2 2004/03/04 20:16:20 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.22 2003/02/17 18:58:07 dawes Exp $
</ident>
@@ -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/Solaris.sgml b/sgml/Solaris.sgml
index 8061af8..43c6a2e 100644
--- a/sgml/Solaris.sgml
+++ b/sgml/Solaris.sgml
@@ -7,7 +7,7 @@
<date>2001 October 01
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.4 2003/01/04 04:20:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3 2002/01/25 21:55:53 tsi Exp $
</ident>
<!-- Table of contents -->
diff --git a/sgml/Versions.sgml b/sgml/Versions.sgml
index 4eea959..15ec42c 100644
--- a/sgml/Versions.sgml
+++ b/sgml/Versions.sgml
@@ -10,7 +10,7 @@
<date>23 February 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.4 2003/02/24 03:41:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.3 2002/12/21 03:37:09 dawes Exp $
</ident>
<abstract>
diff --git a/sgml/XKB-Config.sgml b/sgml/XKB-Config.sgml
index c1b352b..ebc85ef 100644
--- a/sgml/XKB-Config.sgml
+++ b/sgml/XKB-Config.sgml
@@ -6,7 +6,7 @@
<date>25 November 2002
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 2003/09/21 01:55:03 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.3 2003/04/07 15:29:21 eich Exp $
</ident>
<abstract>
diff --git a/sgml/XKB-Enhancing.sgml b/sgml/XKB-Enhancing.sgml
index 44bc10f..81f24de 100644
--- a/sgml/XKB-Enhancing.sgml
+++ b/sgml/XKB-Enhancing.sgml
@@ -6,7 +6,7 @@
<date>25 November 2002
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.2 2003/02/25 19:31:02 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.1 2002/12/10 03:52:56 dawes Exp $
</ident>
<abstract>
diff --git a/sgml/add.sh b/sgml/add.sh
index 86bc7e8..d97b845 100644
--- a/sgml/add.sh
+++ b/sgml/add.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/add.sh,v 1.3 2003/10/19 00:58:11 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/add.sh,v 1.2 2003/10/18 13:29:34 dawes Exp $
#
name=`basename $1 .sgml`
sgmlfmt -f index $name.sgml | \
diff --git a/sgml/dps.sgml b/sgml/dps.sgml
index 77b4341..aa5380b 100644
--- a/sgml/dps.sgml
+++ b/sgml/dps.sgml
@@ -8,7 +8,7 @@
<author>Juliusz Chroboczek, <email/jch@xfree86.org/
<date>27 February 2001</date>
-<ident>$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v 1.2 2003/01/20 03:43:07 dawes Exp $</ident>
+<ident>$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v 1.1 2001/03/02 02:45:37 dawes Exp $</ident>
<toc>
diff --git a/sgml/fonts.sgml b/sgml/fonts.sgml
index ff4ab93..e2c7f9e 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.22 2003/11/19 01:44:58 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.23 2003/11/24 01:57:56 dawes Exp $
</ident>
<toc>
@@ -314,7 +314,7 @@ CID/fonts.scale
</verb></tscreen>
After creating this directory structure and copying the relevant
-files, you should create a <`tt/fonts.scale/' file. This file has the
+files, you should create a `<tt/fonts.scale/' file. This file has the
same format as in the case of (non-CID) scalable fonts, except that
its first column contains PostScript font names with the extension
`<tt/.cid/' appended rather than actual filenames:
@@ -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.post b/sgml/index.post
index 360a5e0..bfc866e 100644
--- a/sgml/index.post
+++ b/sgml/index.post
@@ -27,5 +27,5 @@ Other:
</article>
<!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.3 2003/03/19 01:49:28 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.2 2000/03/21 19:57:10 dawes Exp $
-->
diff --git a/sgml/index.pre b/sgml/index.pre
index dff4c73..1e70787 100644
--- a/sgml/index.pre
+++ b/sgml/index.pre
@@ -8,10 +8,10 @@
<!-- Title information -->
<title>Documentation for XFree86&trade; version &relvers;
<author>The XFree86 Project, Inc
-<date>18 October 2003
+<date>29 February 2004
<!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.20 2003/10/19 00:58:39 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.23 2004/02/15 02:16:49 dawes Exp $
-->
<p>
diff --git a/sgml/mdefs.pre b/sgml/mdefs.pre
index 2c6993b..7ace207 100644
--- a/sgml/mdefs.pre
+++ b/sgml/mdefs.pre
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.2 2003/03/19 01:49:28 dawes Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.1 2000/03/21 19:57:11 dawes Exp $ -->
<!-- entity definitions for man pages -->
diff --git a/specs/CTEXT/ctext.tbl.ms b/specs/CTEXT/ctext.tbl.ms
index 64b3f79..b7edfff 100644
--- a/specs/CTEXT/ctext.tbl.ms
+++ b/specs/CTEXT/ctext.tbl.ms
@@ -1,6 +1,6 @@
.\" Use tbl and -ms
.\"
-.\" $XFree86: xc/doc/specs/CTEXT/ctext.tbl.ms,v 1.2 2000/12/11 19:39:40 dawes Exp $
+.\" $XFree86$
.\"
.\" --- bP --- bulleted paragraph macro
.\"
diff --git a/specs/ICCCM/icccm.ms b/specs/ICCCM/icccm.ms
index 1a26c09..c094a10 100644
--- a/specs/ICCCM/icccm.ms
+++ b/specs/ICCCM/icccm.ms
@@ -3,7 +3,7 @@
.\"
.\"
.\"
-.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.3 2001/01/17 16:57:41 dawes Exp $
+.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.2 2000/12/11 19:39:43 dawes Exp $
.\"
.\" Use tbl, eqn, -ms, and macros.t
.\" @(#)icccm.ms 1.50 16 Apr 1994 14:13:55
diff --git a/specs/SM/xsmp.ms b/specs/SM/xsmp.ms
index 0a962e4..3f24869 100644
--- a/specs/SM/xsmp.ms
+++ b/specs/SM/xsmp.ms
@@ -1,6 +1,6 @@
.\" Use tbl, -ms, and macros.t
.\" $Xorg: xsmp.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $
-.\" $XFree86: xc/doc/specs/SM/xsmp.ms,v 1.2 2003/07/09 15:27:25 tsi Exp $
+.\" $XFree86$
.EH ''''
.OH ''''
.EF ''''
diff --git a/specs/X11/CH02 b/specs/X11/CH02
index df7d676..61554b8 100644
--- a/specs/X11/CH02
+++ b/specs/X11/CH02
@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
-.\" $XFree86: xc/doc/specs/X11/CH02,v 1.2 2003/07/09 15:27:25 tsi Exp $
+.\" $XFree86$
\&
.sp 1
.ce 3
diff --git a/specs/X11/CH09 b/specs/X11/CH09
index 078bc19..3821745 100644
--- a/specs/X11/CH09
+++ b/specs/X11/CH09
@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
-.\" $XFree86: xc/doc/specs/X11/CH09,v 1.3 2003/07/18 15:53:24 tsi Exp $
+.\" $XFree86: xc/doc/specs/X11/CH09,v 1.2 2003/07/09 15:27:25 tsi Exp $
\&
.sp 1
.ce 3
diff --git a/specs/X11/CH13 b/specs/X11/CH13
index b9f0266..66cfba1 100644
--- a/specs/X11/CH13
+++ b/specs/X11/CH13
@@ -41,7 +41,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
-.\" $XFree86: xc/doc/specs/X11/CH13,v 1.5 2000/12/04 18:49:17 dawes Exp $
+.\" $XFree86: xc/doc/specs/X11/CH13,v 1.4 2000/11/28 18:49:17 dawes Exp $
.\"
\&
.sp 1
diff --git a/specs/X11/CH14 b/specs/X11/CH14
index 16d66e7..6b0792d 100644
--- a/specs/X11/CH14
+++ b/specs/X11/CH14
@@ -41,7 +41,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
-.\" $XFree86: xc/doc/specs/X11/CH14,v 1.2 2000/11/28 18:49:19 dawes Exp $
+.\" $XFree86$
.\"
\&
.sp 1
diff --git a/specs/X11/glossary b/specs/X11/glossary
index 7aea056..9abb4ab 100644
--- a/specs/X11/glossary
+++ b/specs/X11/glossary
@@ -1,5 +1,5 @@
.\"
-.\" $XFree86: xc/doc/specs/X11/glossary,v 1.2 2000/11/28 18:49:19 dawes Exp $
+.\" $XFree86$
.\"
\&
.sp 1
diff --git a/specs/XDMCP/xdmcp.ms b/specs/XDMCP/xdmcp.ms
index 90d31da..8346403 100644
--- a/specs/XDMCP/xdmcp.ms
+++ b/specs/XDMCP/xdmcp.ms
@@ -1,4 +1,5 @@
.\" Use eqn, tbl, and -ms
+.\" $XdotOrg: xc/doc/specs/XDMCP/xdmcp.ms,v 1.1.4.2.4.1 2004/03/04 17:46:01 eich Exp $
.\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $
.\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.2 2003/07/09 15:27:26 tsi Exp $
.EQ
@@ -17,7 +18,7 @@ define cc % "\\fR}\\fP" %
.ce 7
\s+2\fBX Display Manager Control Protocol\fP\s-2
-\s+1\fBVersion 1.1
+\s+1\fBVersion 1.1 DRAFT
X.Org Standard
@@ -1694,9 +1695,10 @@ Protocol Encoding
When XDMCP is implemented on top of the Internet User Datagram Protocol (UDP),
port number 177 is to be used. When using UDP over IPv4, Broadcast Query
packets are sent via UDP broadcast. When using UDP over IPv6, Broadcast Query
-packets are sent via multicast, either to the officially registered XDMCP
-multicast address of (TBD) or to a locally assigned multicast address.
-The version number in all packets will be 1.
+packets are sent via multicast, either to an address in the IANA registered
+XDMCP multicast address range of FF0\fIX\fP:0:0:0:0:0:0:12B
+(where the \fIX\fP is replaced by a valid scope id) or to a locally assigned
+multicast address. The version number in all packets will be 1.
Packet opcodes are 16-bit integers.
.RS
.TS
diff --git a/specs/XIM/xim.ms b/specs/XIM/xim.ms
index c7f80c2..5ffb74b 100644
--- a/specs/XIM/xim.ms
+++ b/specs/XIM/xim.ms
@@ -1,6 +1,6 @@
.\" $Xorg: xim.ms,v 1.3 2000/08/17 19:42:21 cpqbld Exp $
.\" To print this out, type tbl macros.t ThisFile | troff -ms
-.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.3 2001/01/17 16:57:42 dawes Exp $
+.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.2 2000/12/14 17:48:58 dawes Exp $
.EH ''''
.OH ''''
.EF ''''
diff --git a/specs/XProtocol/X11.encoding b/specs/XProtocol/X11.encoding
index 346a374..5233c2a 100644
--- a/specs/XProtocol/X11.encoding
+++ b/specs/XProtocol/X11.encoding
@@ -1,5 +1,5 @@
.\" $Xorg: X11.encoding,v 1.3 2000/08/17 19:42:23 cpqbld Exp $
-.\" $XFree86: xc/doc/specs/XProtocol/X11.encoding,v 1.2 2003/07/09 15:27:26 tsi Exp $
+.\" $XFree86$
\&
.sp 1
.ps 11
diff --git a/specs/Xext/DPMS.ms b/specs/Xext/DPMS.ms
index 5c87093..0636bf3 100644
--- a/specs/Xext/DPMS.ms
+++ b/specs/Xext/DPMS.ms
@@ -1,5 +1,5 @@
.\" Use -ms and macros.t
-.\" $XFree86: xc/doc/specs/Xext/DPMS.ms,v 1.2 1998/12/20 11:56:39 dawes Exp $
+.\" $XFree86$
.EH ''''
.OH ''''
.EF ''''
diff --git a/specs/Xext/buffer.ms b/specs/Xext/buffer.ms
index 06a6013..8f4c085 100644
--- a/specs/Xext/buffer.ms
+++ b/specs/Xext/buffer.ms
@@ -3,7 +3,7 @@
.\"
.\"
.\"
-.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.4 2001/01/17 16:57:43 dawes Exp $
+.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.3 2000/03/03 23:16:24 dawes Exp $
.TL
Extending X for Double-Buffering, Multi-Buffering, and Stereo
.AU
diff --git a/specs/Xext/evi.ms b/specs/Xext/evi.ms
index 52fe25f..601fdc1 100644
--- a/specs/Xext/evi.ms
+++ b/specs/Xext/evi.ms
@@ -4,7 +4,7 @@
.\"
.\"
.\"
-.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.4 2001/01/17 16:57:44 dawes Exp $
+.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.3 2000/03/03 23:16:24 dawes Exp $
.EH ''''
.OH ''''
.EF ''''
diff --git a/specs/Xext/shape.ms b/specs/Xext/shape.ms
index a39fd2a..6ebdbe4 100644
--- a/specs/Xext/shape.ms
+++ b/specs/Xext/shape.ms
@@ -1,5 +1,6 @@
.\" Use -ms and macros.t
.\" $Xorg: shape.ms,v 1.3 2000/08/17 19:42:36 cpqbld Exp $
+.\" $XdotOrg: xc/doc/specs/Xext/shape.ms,v 1.1.10.1 2004/03/16 02:44:56 alanc Exp $
.\" edited for DP edits and code consistency w/ core protocol/xlib 4/1/96
.EH ''''
.OH ''''
@@ -15,8 +16,8 @@
Shape Extension Protocol\fP\s-2
.sp 3
.ce 3
-Version 1.0
-X Consortium Standard
+Version 1.0.1
+X.Org Standard
X Version 11, Release 6.4
.sp 6
.ce 4
@@ -27,7 +28,7 @@ MIT X Consortium
.nr PS 9
.sp 8
.LP
-Copyright \(co 1989 X Consortium
+Copyright \(co 1989, 2004 The Open Group
.LP
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the ``Software''), to deal
@@ -42,13 +43,13 @@ 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
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+OPEN GROUP 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.
.LP
-Except as contained in this notice, the name of the X Consortium shall not be
+Except as contained in this notice, the name of the Open Group 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 X Consortium.
+in this Software without prior written authorization from the Open Group.
.ps 10
.nr PS 10
.bp 1
@@ -736,7 +737,7 @@ Requests
.PN ShapeInputSelected
.sp 6p
1 CARD8 opcode
- 1 6 shape opcode
+ 1 7 shape opcode
2 2 request length
4 WINDOW destination window
.De
@@ -759,7 +760,7 @@ Requests
.PN ShapeGetRectangles
.sp 6p
1 CARD8 opcode
- 1 7 shape opcode
+ 1 8 shape opcode
2 3 request length
4 WINDOW window
1 SHAPE_KIND source kind
@@ -877,3 +878,10 @@ the default clip region, the client clip region (if any) and the client
bounding region (if any). Otherwise, the effective clip region is the
same as the default clip region.
.KE
+.NH 1
+Revision History
+.LP
+1.0 - 1989 - Original Revision
+.LP
+1.0.1 - March 2004 - Corrected misnumbering of \fIShapeInputSelected\fP
+and \fIShapeGetRectangles\fP requests in encoding section.
diff --git a/specs/Xext/sync.tex b/specs/Xext/sync.tex
index 22a2884..b202abc 100644
--- a/specs/Xext/sync.tex
+++ b/specs/Xext/sync.tex
@@ -20,7 +20,7 @@
% IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
% OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
%
-% $XFree86: xc/doc/specs/Xext/sync.tex,v 1.3 2001/04/27 12:58:27 dawes Exp $
+% $XFree86$
%\documentstyle[a4]{article}
\documentstyle{article}
diff --git a/specs/Xi/porting.ms b/specs/Xi/porting.ms
index 0298957..58280ab 100644
--- a/specs/Xi/porting.ms
+++ b/specs/Xi/porting.ms
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/doc/specs/Xi/porting.ms,v 1.2 2000/12/04 23:25:59 dawes Exp $
+.\" $XFree86$
.\" Input Extension Porting Document
.EH ''''
.OH ''''
diff --git a/specs/Xmu/Xmu.ms b/specs/Xmu/Xmu.ms
index dadbfb8..c647bdf 100644
--- a/specs/Xmu/Xmu.ms
+++ b/specs/Xmu/Xmu.ms
@@ -1,5 +1,5 @@
.\"
-.\" $XFree86: xc/doc/specs/Xmu/Xmu.ms,v 1.2 2000/11/28 18:49:20 dawes Exp $
+.\" $XFree86$
.\"
.sp 8
.ce 2
diff --git a/specs/Xserver/analysis.tex b/specs/Xserver/analysis.tex
index 87edc71..a2eeabd 100644
--- a/specs/Xserver/analysis.tex
+++ b/specs/Xserver/analysis.tex
@@ -2,7 +2,7 @@
\setlength{\parindent}{0 pt}
\setlength{\parskip}{6pt}
-% $XFree86: xc/doc/specs/Xserver/analysis.tex,v 1.2 2001/04/19 23:36:35 dawes Exp $
+% $XFree86$
\begin{document}
diff --git a/specs/Xserver/secint.tex b/specs/Xserver/secint.tex
index 3e17dba..56aac6c 100644
--- a/specs/Xserver/secint.tex
+++ b/specs/Xserver/secint.tex
@@ -2,7 +2,7 @@
\setlength{\parindent}{0 pt}
\setlength{\parskip}{6pt}
-% $XFree86: xc/doc/specs/Xserver/secint.tex,v 1.2 2001/04/19 23:36:35 dawes Exp $
+% $XFree86$
\begin{document}
diff --git a/specs/i18n/Framework.ms b/specs/i18n/Framework.ms
index 9366185..67c8a0c 100644
--- a/specs/i18n/Framework.ms
+++ b/specs/i18n/Framework.ms
@@ -1,6 +1,6 @@
.\" $Xorg: Framework.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $
.\" To print this out, type tbl macros.t ThisFile | troff -ms
-.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.5 2001/02/09 00:02:52 dawes Exp $
+.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.4 2001/01/17 16:57:45 dawes Exp $
.EH ''''
.OH ''''
.EF ''''
diff --git a/specs/rstart/rstart.ms b/specs/rstart/rstart.ms
index 2800442..e243fdc 100644
--- a/specs/rstart/rstart.ms
+++ b/specs/rstart/rstart.ms
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/doc/specs/rstart/rstart.ms,v 1.2 2001/05/29 18:14:12 dawes Exp $
+.\" $XFree86$
.ds iL Brown
.ds iI J.
.ds iO Quarterdeck Office Systems
diff --git a/specs/specindex.html b/specs/specindex.html
index e70cd60..b05ac1e 100644
--- a/specs/specindex.html
+++ b/specs/specindex.html
@@ -107,7 +107,7 @@
<li><a href="ctlseqs.html">Xterm control sequences</a> <a href="../PDF/ctlseqs.pdf">[PDF]</a></li>
</ul>
- <!-- $XFree86: xc/doc/specs/specindex.html,v 1.3 2003/10/19 02:30:29 dawes Exp $ -->
+ <!-- $XFree86: xc/doc/specs/specindex.html,v 1.4 2003/12/06 19:11:52 dawes Exp $ -->
</body>
</html>
diff --git a/specs/xtrans/Xtrans.mm b/specs/xtrans/Xtrans.mm
index 4176ec0..0d39e7d 100644
--- a/specs/xtrans/Xtrans.mm
+++ b/specs/xtrans/Xtrans.mm
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/doc/specs/xtrans/Xtrans.mm,v 1.3 2003/11/16 16:40:19 herrb Exp $
+.\" $XFree86: xc/doc/specs/xtrans/Xtrans.mm,v 1.2 2003/07/09 15:27:27 tsi Exp $
'\".nr Ej 1
.PH "'''"
.ce