Import of XFree86 4.2.99.2

47 files changed, 2650 insertions, 1463 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/CHANGELOG b/xc/programs/Xserver/hw/xfree86/CHANGELOG
index f8f82acc4..2747f30e2 100644
--- a/xc/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/xc/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,3 +1,870 @@
+XFree86 4.2.99.2 (21 October 2002)
+ 438. Fix some memory leaks in libX11 i18n code (#A.1314, Olivier Chapuis).
+ 437. Add DGA and Xvideo support to the i740 driver (#A.1307, Kopecek Tomas).
+ 436. Fix the number of beeps when using AccessX and XKB 
+      (#A.1302, Alan Coopersmith).
+ 435. Add twelve hour format to xclock's digital format
+      (#A.1285, Brian L. Matthews).
+ 434. Fix application crash when using DPS client libraries 
+      (#A.1282, Frank Giessler).
+ 433. Fix pixmap cache corruption on VT switches in mga driver
+      (#A.1279, Ross Mikosh).
+ 432. Add missing Increment option in Summa input driver (#A.1276, G.P.Halkes).
+ 431. Missing semicolon in twm/gram.y (#A.1307, Jim Gifford).
+ 430. Cygwin/XFree86 updates
+      - Add X.ico, an icon for Windows (Harold Hunt, Jehan Bing)
+      - Include a preliminary pseudo-rootless mode (Matsuzaki Kensuke)
+      - XF86Config file support (Alexander Gottwald)
+      - Scrollbars support (Jehan Bing, Harold Hunt)
+      (#5424, Cygwin/XFree86 developers).
+ 429. Add ko_KR.UTF-8 and ja_JP.UTF-8 XLC_LOCALE files (#5421, Jungshik Shin).
+ 428. Add TCVN support to luit (#5416, Tomohiro KUBOTA).
+ 427. Expand luit to support several major non-ISO-2022-compliant
+      encodings such as GBK and Shift_JIS (#5416, Tomohiro KUBOTA).
+ 426. Add support for double-buffering to the tdfx driver's XVideo overlay
+      support (#5415, Stephen Davies).
+ 425. Add a -strftime option for xclock's digital mode (#5414, George Belotsky).
+ 424. README.fonts update (#5409, 5410, Khoda Hafez).
+ 423. Major update for VMware driver
+      - recoded to use XAA, offscreen memory support, and color expansion code
+      - Add RENDER support
+      - Optimization of HWcursor
+      - Bug fixes for HWcursor in 8bit mode and VT switching
+      (#5423, Nolan Leake, VMware).
+ 422. Updates for shadowfb code
+      - Add RENDER support
+      - support for pre-fb modifications
+      - support for real framebuffers rather than memory based framebuffer
+      - Removal of old fullscreen update code (when VT switching)
+      - fix bug in FillSpans
+      (#5411, #5413, Nolan Leake, VMware).
+ 421. Clear the list of registered renderers at the start of each new server
+      generation, and only print warnings about suffixes with more than
+      one registered renderer for the first generation (David Dawes).
+ 420. Make xf86PrintModes() show which modes are hot-key switchable
+      (David Dawes).
+ 419. Fix the vesa driver's misuse of virtualX for displayWidth (David Dawes).
+ 418. Fix the VBE module's depth/bpp matching, which fixes some 24/32 problems
+      as well as some 15/16 problems (David Dawes).
+ 417. Fix black cursor images on Mac OS X 10.2.2 (Joseph Maurer).
+ 416. Fix hotkey switching for user-specified modes, and fix hotkey switching
+      between all valid modes when no specific modes are specified in the
+      config file (David Dawes).
+ 415. Trival input drivers Imakefile cleanup (#5299, Mike Harris).
+ 414. Use INSTDATFLAGS when installing X server modules (#5292,
+      Branden Robinson).
+ 413. Fix the iso8859-15 Compose map -- there is no diaeresis codepoint
+      in iso8859-15 (#5389, Wolfgang Sourdeau, Rüdiger Kuhlman).
+ 412. Acute/apostrophe fix for nodeadkeys section of XKB German symbols
+      (#5388, Andreas Metzler).
+ 411. Fix Cards file typo (#5387, Branden Robinson).
+ 410. Cleanup the XKB Macinosh US keyboard symbols, and remove those that
+      should be in other country maps (#5386, Branden Robinson).
+ 409. Add a user-configurable throttle on xconsole's number of saved lines
+      (#5379, Branden Robinson).
+ 408. Fix missing declaration of XShmGetEventBase() in XShm.h (#5375,
+      Branden Robinson).
+ 407. Remove inconsistencies in the way extension headers are referred to
+      in most extension libraries (David Dawes).
+ 406. Install extension struct/protocol headers that weren't already
+      being installed (#5369, Branden Robinson).
+ 405. Fix long-standing colour map bug in ATI driver (Marc La France).
+ 404. Enable imake.c to perform correct C library version detection on hppa
+      machines (#5372, Ben Collins).
+ 403. Add new Imake rules to handle C++ programs that don't have man pages
+      (#5371, Branden Robinson).
+ 402. Add a -color app-defaults file for xmessage that exercises some
+      features of Xaw7, and fix the base app-defaults to not use the no
+      longer supported "whenNeeded" value for the "Scroll" resource (#5370,
+      Branden Robinson).
+ 401. Stop the drm module from creating a world-writable directory in /dev.
+      Since dev nodes can only be created by root, there's no need for
+      anyone else to be able to write to /dev/dri (#5367, Brendan O'Dea,
+      #5380, 5422, Mike Harris).
+ 400. Fix a SEGV in lbxproxy because it's ResizeReverseMap() makes assumptions
+      about the atom numbers that can lead to unallocated memory being
+      accessed (#5366, Branden Robinson and Anthony DeRobertis).
+ 399. Increase the wacom driver's timeout for reading data after a request.
+      This is needed for PalmWac (Wacom emulation for PalmOS) (#5364,
+      Mathieu Clabaut).
+ 398. Add Big5-HKSCS to locale.dir, and fix a missing portion in X-TT's
+      Big5HKSCS-Unicode table (#5362, Branden Robinson and ThizLinux
+      Laboratory Ltd).
+ 397. Handle vetoed APM suspend events properly on Linux (#5362,
+      Branden Robinson).
+ 396. Handle ARM and HP-PA separately from m68k and PowerPC in xfree86.cf,
+      and some cleanups (#5360, Branden Robinson).
+ 395. xfs updates and cleanups (#5359, Branden Robinson).
+ 394. Fix for random crashes when a screen fails to initialise (Marc La France).
+ 393. Update RandR to include refresh rates (v1.1) (Keith Packard)
+ 392. Numerous man pages fixes, add some missing manpages (#5365, #5373,
+      #5376, #5377, #5382-5385, #5390, #5391, #5393, #5295 Branden Robinson
+      #5374, Jonathan Amery, #5378, Jochen Voss)
+ 391. Install bdftruncate and ucs2any without the .pl extension
+      (#5391, Branden Robinson) 
+ 390. Rewrite Radeon DDC/DFP mode detection and management (Kevin Martin).
+ 389. Integrate ATI patch:
+      - Add 2D support for Radeon 9000 (RV250), Mobility M9 (RV250 mobile)
+        and Radeon 9700 (R300)
+      - Clone mode fixes and improvements
+      - Dell VE card fixes
+      - Dual-head VT switching fixes
+      - General code clean up
+      (#A.1217, Hui Yu@ATI).
+ 388. Rewrite XDarwin's event handling to fix some bugs and to use
+      SetInputCheck() for a performance boost (Torrey T. Lyons).
+ 387. Add a little utility to write files through mmap() (Marc La France).
+ 386. Add National Semiconductor Geode driver, support for the 5530, SC1200
+      and SC1400 chipsets (NSC, Alan Hourihane).
+ 385. linux.cf updates:
+       - Resync the DebianMaintainer #define and the stuff in the
+         corresponding if block to meet Debian's current needs.
+       - Sort long chains of architecture-dependent #if-#elif directives in
+         ASCII order.
+       - Add explicit recongition of several architectures to the #ifndef
+         BuildXF86DRI block.
+       - Define a fallback CplusplusCmd (g++) if we don't recongize the
+         platform we're on.
+       - Turn off the loadable server on MIPS and SuperH platforms, where it
+         doesn't (yet) work.
+       - Trash some unneeded #defines in the Mc68020Architecture compilation
+         environment.
+       - Remove the block that #defines HasXserver NO for the s390 and s390x
+         architectures (things like Xvfb build fine on these platforms).
+      (#5357, Branden Robinson).
+ 384. Fix an error in the Finnish XKB keyboard map (#5356, Marko Myllynen).
+ 383. Add a Malayalam XKB keyboard map (#5355, Baiju M).
+ 382. Add a "kbd" driver module that can eventually replace the built-in
+      "keyboard" driver (#5344, Ivan Pascal).
+ 381. Add os-support level support for a loadable keyboard driver for BSD
+      and Linux (#5344, Ivan Pascal).
+ 380. Add some new common layer functions for supporting a loadable keyboard
+      driver (#5344, Ivan Pascal).
+ 379. Move the XkbDisable option to a global server flag rather than
+      keyboard driver flag, since it really is a global setting (#5344,
+      Ivan Pascal).
+ 378. Fix RenderCreateCursor's conversion from an ARGB cursor to a 2-color
+      cursor when the cursor is wider than 8 pixels (#5353, Greg Parker).
+ 377. Fix 24bpp displays with the fbdev driver when not using shadowfb
+      (#5351, Michel Lanners).
+ 376. Fixes and improvements for the en_US.UTF8 compose rules (#5346,
+      Alexandre Oliva).
+ 375. Fix compose rules for some dead accents for iso8859-1 and iso8859-15
+      (#5338, 5339, Alexandre Oliva).
+ 374. Add support for th_TH.UTF-8. with XIM (#5336, Theppitak Karoonboonyanan).
+ 373. Fix some bugs in the Thai XIM:
+       - excessive '(' char when switching XKB keyboard group
+       - ineffective Ctrl-<key> and Alt-<key>
+      (#5335, Theppitak Karoonboonyanan).
+ 372. Add an X server command line flag (-br) to make the default root window
+      solid black (#5334, Jens Owen).
+ 371. Add support for th_TH.ISO-8859-11 (#5327, Theppitak Karoonboonyanan).
+ 370. Use pci_alloc_consistent/pci_free_consistent instead of the
+      local page alloc/free functions in the i810 and i830 DRM drivers
+      (#5323, Arjan van de Ven).
+ 369. Fix some non-POSIX usage of tail, expand and sort (#5322, Paul Eggert).
+ 368. Fix bug in PCI code for Solaris/SPARC (Marc La France).
+ 367. When enabling PCI adapters, also enable their bus mastering capability;
+      Consequently, deprecate xf86EnablePciBusMaster() (Marc La France).
+ 366. Fix lndir's handling of relative symbolic links, and update the man page
+      to document the -withrevinfo flag (H. J. Lu, Marc La France).
+ 365. Xdm patches: realloc usage, zero malloc()ated memory, enable 
+      /dev/urandom on NetBSD 1.4 and later, OpenBSD patches (#5345, 
+      Mike A. Harris, #5401, Matthias Scheler, Matthieu Herrb)
+ 364. Xterm patches #168, #169 (Thomas Dickey).
+ 363. In certain circumstances, allow VGA-rerouting through Simba bridges.
+      This only affects UltraSPARC-IIi systems.  This is a small but
+      necessary step in eradicating SparcArchitecture's need to compile the ati
+      dribver with -DAVOID_CPIO (Marc La France).
+ 362. In int10, ignore interrupts whose simulation isn't yet implemented.
+      Previously, such interrupts caused the emulation to stop.  (Egbert Eich,
+      Marc La France).
+ 361. Add full support for multi-head on 460GX-based Itanium systems
+      (Marc La France, with documentation loaned by Intel under NDA).
+ 360. Fix Darwin build problems with libXrandr and the new FreeType2 backend
+      (Torrey T. Lyons).
+ 359. Savage driver updates.
+      - Support for ProSavage DDR (PCI ID 0x8D04)
+      - TV output fixes
+      - support for -pixmap24 flag
+      - XAA fixes to cure lockups
+      (#5412, Tim Roberts).
+ 358. Enable version controlled .dll's on Cygwin/XFree86 (Alexander Gottwald).
+ 357. Some build fixes for Cygwin/XFree86 (Alan Hourihane).
+ 356. Add new FreeType2 backend which fixes a bug with -c- fonts
+      (#5347, #5348, Juliusz Chroboczek).
+ 355. Add new command line options to glxinfo for more detailed output
+      (#5354, Brian Paul).
+ 354. Support for 24bpp, fix screen blanking and bug fixes for newport driver
+      (#5329, #5349, Guido Guenther).
+ 353. Add RandR support to XFree86 DDX. (Keith Packard)
+ 352. Update RandR extension to 1.0.  Eliminate depth switching 
+      (Keith Packard, Jim Gettys)
+ 351. Fix XDarwin rootless crash when window resizing with complex bit
+      gravity (Greg Parker).
+ 350. Fix some incorrect mappings in the gbk-0.enc encodings file (#5313,
+      Tomohiro KUBOTA).
+ 349. Fix C precedence bug in mfb (#5309, Tassia St. Germain).
+ 348. Updates to mkfontscale (#5307, Juliusz Chroboczek).
+ 347. Add SharedXcursorReqs to Cygwin build (#5405, Harold Hunt).
+ 346. Add image transformation and subpixel order to Render (Keith Packard)
+ 345. Add Xcursor-def.cpp to Xcursor library (#5350, Alexander Gottwald).
+ 344. Update to pci.ids to 2002-09-24 snapshot (Marc La France).
+ 343. Add a little utility to read files through mmap() (Marc La France).
+ 342. Implement a means to ignore certain host bridges while determining PCI
+      bus topology (not yet used) (Marc La France).
+ 341. Bridge driver interface fixups for host bridges (Marc La France).
+ 340. Change makedepend to recognise invocations of parameter'ed macros
+      (Marc La France).
+ 339. Major redesign in the Xedit syntax highlight code. Now there isn't
+      anymore the builtin C mode, but a new version using the xedit lisp
+      interpreter, as well as several new modes, including Lisp/Scheme,
+      Imakefile, X Resource files, Makefile, Manpage source, Sgml and
+      Html (Paulo César Pereira de Andrade).
+ 338. Print a warning if more than one renderer is registered for a font type
+      (#5305, Juliusz Chroboczek).
+ 337. Fix a double free() that can cause a crash in XCloseIM() (based one
+      #5303, Mo DeJong).
+ 336. Allow xman's MANCONF definition to be specified in the Imakefile
+      (based on #5302, Mike Harris).
+ 335. Config typo and update for Linux on Hitachi SuperH architecture (#5301,
+      ISHIKAWA Mutsumi).
+ 334. Add a "DefaultRefresh" option to the vesa driver (David Dawes).
+ 333. Fix build problem when calling GNU make with "--" prefixed options
+      (#5291, Toomas (toomas at tklabor.ee)).
+ 332. Avoid noise from hostname call in startx (#5270, Mike Harris).
+ 331. xwd ignores the -frame option if the -id option is used (#5251,
+      Mike Harris).
+ 330. Fix problem where DRIUnlock was called when DRI fails to load
+      (Kevin Martin)
+ 329. Fix erroneous warnings about removing DRM signal handler when DRI
+      fails to load (Kevin Martin)
+ 328. Add LINE_LIMIT_COORDS option to XAA to work around limited coordinate
+      space for lines on Radeons (Kevin Martin)
+ 327. Fix Radeon DGA code to use XAA sync function (Michel Dänzer)
+ 326. Major rework of Radeon accel code:
+      - Merge CP and MMIO code (Kevin Martin and Michel Dänzer)
+      - Fix indirect buffer CP code (Kevin Martin and Michel Dänzer)
+      - Add CP support for scanline color expansion and image writes
+        (Michel Dänzer)
+      - Fix Mono8x8 problems (Kevin Martin and Michel Dänzer)
+      - Fix clipping routine to properly set transparency and
+        dp_gui_master_cntl reg (Kevin Martin and Michel Dänzer)
+      - Fix clipping calculation errors (Kevin Martin)
+      - Properly set line bias so that sw rendered solid and dashed lines
+        match the accel TwoPoint lines (Kevin Martin)
+      - Fix drawing last point for solid and dashed lines (Kevin Martin)
+      - Remove NoLineAccel option since two point lines work (Kevin Martin)
+ 325. Export some more Xft symbols (Cygwin) that are needed for qt 3.x
+      (#5285, Ralf Habacker).
+ 324. Don't sleep on Cygwin for ICE directory mode problems (#5284,
+      Ralf Habacker).
+ 323. Fix a bug in XtGetDisplays() with more than 1 open display (#5282,
+      Kip Rugger).
+ 322. Second part of xkb multi-layout keyboard map support (#5321,
+      Ivan Pascal).
+ 321. Allow the Record extension to report logical coordinated with Xinerama
+      (#5231, Paul Stewart).
+ 320. Allow the XTrap extension to report logical coordinated with Xinerama
+      (#5230, Paul Stewart).
+ 319. Moved LdPreLib define after the vendor/OS specific config files
+      as it may depend on setting done there (Egbert Eich).
+ 318. Several fixes for cross compile environment (Egbert Eich).
+ 317. Added code to allow for building of static only libraries with
+      -fPIC for platforms which require it (Egbert Eich).
+ 316. Added '-m32' to gcc flags as default for ia32 builds when gcc version
+      is >= 3.1. This allows building a 32 bit Version of X on 64bit x86-64
+      (Egbert Eich).
+ 315. Changed direct calls of ld to 'gcc -nostdlib' for Linux (Egbert Eich). 
+ 314. Changed calls to as to 'gcc -c -x assembler-with-cpp' for Linux
+      (Egbert Eich).
+ 313. Added '-fno-strict-aliasing' flag to gcc version >= 3.1 (Egbert Eich).
+      Strict requires that one address must not contain pointers to
+      different types - a feature heavily used by X (Egbert Eich).
+ 312. Fixed a core dump problem in libXtt (?) (Egbert Eich).
+ 311. Removed '#pragma pack' from structures that contain function pointers
+      in x86emu. This causes problems on gcc 3.1 for ia64 (Egbert Eich).
+ 310. Added defines for missing X types to saverproto.h (Egbert Eich).
+ 309. Fixed compiler warings generated by gcc >= 3.1 in mesa drivers 
+      (Egbert Eich).
+ 308. For platforms that allow both 32 and 64 bit libraries to be executed
+      split Xlib i18n modules path into 
+      <libpath>/X11R6/lib/X11/locale/lib/common and
+      <libpath>/X11R6/lib/X11/locale/lib64/common. 'lib64' has been defined
+      to be the default path for 64bit shared libraries on these platforms
+      (Egbert Eich).
+ 307. Fixed obvious typo in OMlib (Egbert Eich).
+ 306. Fixed code in cfb that didn't comply with C sequence rules.
+      Modern C compilers tend to be more aggressive on code reordering 
+      (Egbert Eich).
+ 305. Changed arguments of NoopDDA() from VarArgs to void. Handling
+      of VarArgs by gcc isn't compatible with the way it was used
+      on certain platforms (Egbert Eich).
+ 304. Added support for 32bit pixmaps for 24bit overlay framebuffers in 
+      fb overlay code (Egbert Eich).
+ 303. Fixed kdrive to print a meaningful error message instead of just
+      core dump when no matching graphics cards is found (Egbert Eich).
+ 302. fixed portability bug in xwd (Andreas Schwab <schwab@suse.de>)
+ 301. fixed X Server crash, which happended each time a proportional iso10646
+      font was loaded with xtt backend (Yong Li <rigel863@yahoo.com>)
+ 300. Added some ARM specific fixes to compiler.h (Uli Hecht).
+ 299. Added a virtual 'dummy' driver (Egbert Eich).
+ 298. Fixed core dump when certain access functions are not set in
+      xf86Bus.c (Egbert Eich).
+ 297. Fixed problem where SIGIO could be disabled after a server reset.
+ 296. Added configurable list of devices the xf86Misc extension is allowed
+      to change the mouse device to (Egbert Eich).
+ 295. Changed default mouse type to 'auto' when generating config file
+      with '-configure' (Egbert Eich).
+ 294. Made sure keyboard modifier settings are consistent after exit 
+      from DGA when the xkb extension is used (Egbert Eich).
+ 293. Disabled keyboard processing when Xserver is suspended by power 
+      management.
+      This allows effective locking of laptops when stolen (Egbert Eich).
+ 292. Added/improved options for lockfile syncing (Egbert Eich).
+ 291.  Added support for backup copy of Xserver logfile (Egbert Eich).
+ 290. Fixed GetTimeInMillis() to use deltas instead of absolute time
+      returend by gettimeofday(). This ensures time is monotonic in X
+      (Egbert Eich).
+ 289. Fixed xf86Misc extension to allow modification of Expps2 mice 
+      (Egbert Eich).
+ 288. Made code in xf86MiscExt.c more readable (Egbert Eich).
+ 287. Fixed PCI CardBus bridge handling (Egbert Eich).
+ 286. Added code to reenable PCI bus mastering after coming back from a 
+      VT switch to radeon driver (Charl P. Botha <http://cpbotha.net/>) 
+      (Egbert Eich).
+ 285. Dito for r128 driver (M. Harris).
+ 284. Dito for glint and mga driver (Egbert Eich).
+ 283. Fixed double scan issues for low res modes in C&T driver (Egbert Eich).
+ 282. Set rgbBits to 8 for all HiQV chips in chips driver (Egbert Eich).
+ 281. Moved initialization of accel funtions past initialization of
+      offscreen fb manager in chips driver (Egbert Eich).
+ 280. Fixed initialization of video in chips driver (?).
+ 279. Fixed HALlib problem restoring text mode on G550 (Egbert Eich).
+ 278. Restructured and included Matrox's Merged Framebuffer changes
+      to mga driver (Egbert Eich).
+ 277. G450/550 clockchip programming fixes (Matrox).
+ 276. Fixed HW Cursor for HALlib frame granularity (Egbert Eich).
+ 275. Enabling 2D accel in 24-bit for neomagic 2360 and 2380 (Egbert Eich).
+ 274. Added support for builtin 1024x480 mode of Sony subnotebooks for
+      Neomagic driver (Egbert Eich).
+ 273. Fixed support for lowRes (320x240) modes in neomagic driver 
+      (Egbert Eich).
+ 272. Fixed RAC function registration in S3 driver (Egbert Eich).
+ 271. Added some voodoo to screen initialization of S3 driver (Egbert Eich).
+ 270. Fixed vbe/int10 support in SMI driver. It used to core dump
+      when BIOS was not usable (Egbert Eich).
+ 269. Separated BRIGHTNESS and and CAPTURE_BRIGNTESS video attributes
+      in smi driver: CAPTURE_BRIGHTNESS refers to the capture chip 
+      (ie. Philips SAA7110) while BRIGHTNESS controls the video overlay
+      of the SMI chip itself (Egbert Eich).
+ 268. Disable automatic loading of DRI when running SUN ffb as this is
+      inconsistent with other drivers (Thorsten Kukuk).
+ 267. Fixed Gamma/Brightness code in trident driver (Egbert Eich).
+ 266. Added FpDelay debugging option (Egbert Eich).
+ 260. Fixed video support for Trident 9397 (Egbert Eich).
+ 265. Fixed Cursor/VT switch support for vmware driver (Egbert Eich).
+ 264. Fixed Blit problems in vmware driver when running KDE (Egbert Eich).
+ 263. Added RENDER support to vmware driver (Egbert Eich).
+ 262. Added C&T 69030 to extrapci.ids (Egbert Eich).
+ 261. Improved mouse autodetection code (Egbert Eich).
+ 260. Restructured int10 code so that vm86 and x86emu support can be loaded
+      as modules. Implemented heuristic to try vm86 first and fall back to
+      x86emu. This allows 32 bit Xservers to run on x86_64 on 64-bit kernel
+      without vm86 support (Egbert Eich).
+ 259. Restructured elf loader: determine which section to load from elfheader
+      flags (Egbert Eich).
+ 258. Adding RENDER Support to RAC (Egbert Eich).
+ 257. Using borderClip instead of borderSize region for redisplay function
+      in miext/shadow code to avoid core dumps when vt switched away 
+      (Egbert Eich).
+ 256. Replacing sprintf() by snprintf() in lbxproxy to eliminate possible
+      buffer overrun exploits (Egbert Eich).
+ 255. KP_Decimal fixes to Czech and Slovak keybards 
+      (Jan Holesovsky <kendy@suse.cz>) (Egbert Eich).
+ 254. Treat PCI-to-MCA and PCI-to_EISA bridges as PCI-to-ISA (Marc La France).
+ 253. Correct the server's understanding of CardBus resource ranges
+      (Marc La France).
+ 252. Ignore unconfigured (and mis-configured) PCI-to-PCI and PCI-to-CardBus
+      bridges (Marc La France).
+ 251. Prevent infinite loops during VGA re-routing (Marc La France).
+ 250. Add a framework for bus bridge drivers and use it to rework the handling
+      of Sun's Simba P2P bridges (Marc La France).
+ 249. Fix bdftopcf memory leak (Marc La France).
+ 248. XVideo support for the i830 and i845G (David Dawes, Alan Hourihane).
+ 247. Fix various bugs in the DRI support for the i830 and i845G
+      (Keith Whitwell).
+ 246. Major rework of the 2D i830/i845G support, including:
+       - Improve VESA mode selection, and fix refresh rate selection.
+       - Don't duplicate functions provided in the vbe modules.
+       - Don't duplicate functions provided in the vgahw module.
+       - Rewrite memory allocation.
+       - Rewrite initialisation and save/restore state handling.
+       - Decouple the i810 support from i830 and later.
+       - Remove various unnecessary hacks and workarounds.
+       - Fix an 845G problem with the ring buffer not in pre-allocated
+         memory.
+       - Fix screen blanking.
+       - Fix some HW cursor glitches, and turn HW cursor off at VT switch
+         and exit.
+       - Don't attempt to use the i830's function 1 entity.
+       - Fix problems with option handling.
+      (David Dawes).
+ 245. A "hammer" approach at ensuring font properties are freed properly
+      (Marc La France).
+ 244. Fix 'su' usage for FreeBSD in the default xdm config (Eric Anholt).
+ 243. Fix a FreeBSD scrollwheel problem that shows up with gcc 3.1
+      (Eric Anholt).
+ 242. Make C++ libraries on FreeBSD get linked with $(CXX), fixing libGLU
+      (Eric Anholt).
+ 241. FreeBSD.cf updates, including enabling SSE/3DNow support (Eric Anholt).
+ 240. Intel 830 and 845G DRI support, including i830 support updated for
+      Mesa 4.x (#5288, Jeff Hartmann, 2D3D).
+ 239. [SECURITY] Fix an Xlib problem that made it possible to load arbitrary
+      code into privileged clients.
+ 238. Add Xcursor library.  Make Xlib use it. (Keith Packard)
+ 237. Fix threaded libraries on Mac OS X 10.2 (A.1229, Marko Karppinen).
+ 236. Add hardware accelerated GLX to XDarwin (Greg Parker).
+ 235. Use Imake custom version variables in XDarwin startup message
+      (Torrey T. Lyons).
+ 234. Attempt to prevent PCI scans on non-PCI ix86 systems (Marc La France).
+ 233. Allow master aborts on CardBus buses to complete normally during PCI
+      scans (Marc La France).
+ 232. Fix bug that prevented the server from restoring CardBus data properly
+      (Marc La France).
+ 231. Fix DEVID define and make it more generally available (Marc La France).
+ 230. Fix bug in NetBSD PCI code (Marc La France).
+ 229. Add an option to completely disable PCI scans (Marc La France).
+ 228. Xterm patch #167 (Thomas Dickey).
+ 227. Add CreateCursor request to Render extension (Keith Packard)
+ 226. Change scanpci to not disable I/O too early (Marc La France).
+ 225. Better error handling in xfs -ls argument parsing (Mordy Ovits).
+ 224. Make loader ignore ELF objects that don't define any symbols (H. J. Lu)
+ 223. Add a HasGcc3 imake symbol (Marc La France).
+ 222. Enable threaded libraries on Darwin (Jeff Whitaker and Torrey T. Lyons).
+ 221. Xaw documentation fixes (A.1218, Paul Vojta).
+ 220. Add some mode collection/handling interfaces to the vbe module,
+      which makes it easier for drivers to set modes via the video BIOS
+      (David Dawes).
+ 219. I830/845 Workaround for BIOSes which force 1MB stolen memory, and
+      agpgart related fix (#5300, Abraham vd Merwe).
+ 218. Add NetBSD specific PCI access functions for powerpc and alpha 
+      platforms (Charles Hannum). 
+ 217. Split bsd_video.c into architecture specific files, and merge NetBSD
+      alpha and powerpc support there. (Matthieu Herrb, Simon Burge, 
+      Charles Hannum & other NetBSD developers). 
+ 216. Define CSRG_BASED for Darwin and fix xman so it works on Darwin
+      (Torrey T. Lyons).
+ 215. On Darwin, fix imake to find Gcc and correct config for RawCppCmd
+      (Torrey T. Lyons).
+ 214. Add functions to allow modules to query the core X server version
+      and the version of its sub modules (David Dawes).
+ 213. Fix scanpci's printing of 64-bit PCI bases (Marc La France).
+ 212. Add missing dependency and regenerate xf86PciStdIds.h accordingly
+      (Marc La France).
+ 211. A more flexible way of dealing with ix86 motherboard chipsets that can
+      only implement less than the full 256 PCI buses (Marc La France).
+ 210. RAC-related fixups to ATI drivers and xf86SetOperatingState() call
+      cleanups in most drivers (Marc La France).
+ 209. Fix int10 miscompilation glitch on IA-64 (Marc La France).
+ 208. Add support for Permedia3 (rev C) chips that use slightly different
+      clock programming techniques (Jay Estabrook).
+ 207. Fix Finder warnings about XDarwin plist format on Jaguar
+      (Torrey T. Lyons).
+ 206. Fix XDarwin build issues on Jaguar (Sean Fagan).
+ 205. Fix Radeon DDC for non-Dell cards, and fix a radeon pci id-related
+      build problem (#5326, Andrew C Aitchison).
+ 204. Change the X server (and scanpci) to use the pci.ids file (from
+      pciids.sf.net) for vendor/device descriptions (David Dawes).
+ 203. Change XDarwin to use NSQuickDrawView instead of Carbon windows to
+      get a QuickDraw graphics port for rootless windows (Torrey T. Lyons).
+ 202. Add support for some missing 32-bit address modes to x86emu.  Some
+      video BIOSes use them, especially those for some of the integrated
+      Intel chipsets, and this fixes int10/vbe support for these on
+      platforms that use the emulator (David Dawes).
+ 201. Add PCI ID for ATI Radeon Mobility M7 'LX' (#5233, Mike Harris).
+ 200. Fix CrossCompile environment for Cygwin/XFree86 
+      (#5324, Alexander Gottwald, Harold Hunt).
+ 199. ATI patch to:
+      - Fix Dell OEM VE card support
+      - Add better clone mode support
+      - Fix large panel (>= 1600x1200) detection and initialization problems
+      - Remove "PanelSize" and "CrtScreen" options since they are no longer
+        needed with new CloneMode and improved flat panel support
+      - Add "DDCMode" option to detect and use DDC modes
+      - Add "PanelOff" option to disable panel on laptops
+      - Fix corrupted console problem
+      - Other misc fixes
+      (#A.1043, Hui Yu@ATI).
+ 198. Remove -DNO_TCP_H from cygwin.cf for Cygwin/XFree86 (#5320, Harold Hunt).
+ 197. Major updates to Cygwin/XFree86.
+       - fix depth 24 issues.
+       - fix the handling of the DirectDraw module.
+       - disable the use of the LAYER/RANDR extension.
+       - lots of bug fixes. 
+      (#5318, #5317, Harold L. Hunt, Alan Hourihane).
+ 196. When using the vesa driver and the DisplaySize option the server
+      would crash with a floating point exception due to a divide by zero
+      in miscreeninit() (#5298, Mike A. Harris).
+ 195. The function MoveLine in lib/Xaw/TextAction.c sometimes attempts to
+      read uninitialized memory when hit ctrl-N in a Text widget to move to
+      the next line (#5245, Johnathan Kamens).
+ 194. Adjust -probe for change in default stderr verbosity (Marc La France).
+ 193. Radeon patch for Xv on all known Radeon devices (James Ralston and
+      Keith Packard).
+ 192. New XDarwin application icon (Michael Oland).
+ 191. Dead strip unneeded code in rootlessValTree.c and other miscellaneous
+      XDarwin code cleanup (Greg Parker and Torrey T. Lyons).
+ 190. Lots of Cygwin/XFree86 cleanups and fixes (#5304, Harold Hunt)
+ 189. Fix rootless XDarwin crash when resizing a window with negative x
+      coordinate (Torrey T. Lyons).
+
+XFree86 4.2.99.1 (7 June 2002)
+ 188. Fix some build problems when building with shared libraries disabled
+      (David Dawes).
+ 187. Update the magellan input driver and turn it on in the build process
+      (#A.1024, Christoph Koulen).
+ 186. Add Peritek Borealis support to the I128 driver (Robin Cutshaw).
+ 185. Modify the r128 and radeon drivers to use fbdev's DPMS support when
+      fbdev is enabled (#5219, Michel Dänzer).
+ 184. Add support for the composite sync mode flag to the radeon driver
+      (#5219, Michel Dänzer).
+ 183. Add a mkfontscale utility for creating fonts.scale files (#5213, 5214,
+      Juliusz Chroboczek).
+ 182. Add a 1152x768 mode suitable for Titanium PowerBooks to the set of
+      build-in modes (#5212, Michel Dänzer).
+ 181. Add support to xkbcomp and libxkbfile for composing multi-layout
+      keyboard maps from partial "single layout" files.  This allows
+      the XkbLayout to be specified as a comma-separated list of single
+      layout names.  Note: new "single layout" symbol maps aren't available
+      yet. (#5210, Ivan Pascal).
+ 180. Fix Xv endianess problem with the Radeon driver (#5207, Guido Guenther).
+ 179. Updates to the Finnish xkb map, including:
+       - add ISO-8859-15 missing symbols ([zZsS]caron)
+       - reorganize some special symbols (such as paragraph, cent, division)
+       - map AltGr+SPCE as space, nobreakspace comes way too often by accident
+       - minor white space/comment cleanups
+      (#5197, Marko Myllynen).
+ 178. Add an option to the r128 driver for enabling DMA for Xv image transfers
+      (#5195, Michel Dänzer).
+ 177. Make the 'distclean' target remove depend files (#5194,
+      Carlos A M dos Santos).
+ 176. Fix bad usage of "UseInstalled" in FreeBSD.cf (#5192,
+      Carlos A M dos Santos).
+ 175. Several xkb layout updates:
+       - Added other Armenian layouts.
+       - Added Swedish dvorak layout.
+       - Fixed typo in "la" file.
+       - Added EuroSign in Dutch keyboard.
+       - Added a "comma" variant for "ro" keyboard allowing to type real comma
+         below Romanian letters.
+       - New file "ro2" with the real Romanian layout (the file "ro" is not a
+         Romanian keyboard, but a modified US one that has been hacked to
+         include Romanian letters).
+      (#5191, Pablo Saratxaga).
+ 174. Fix makedepend so that it can parse a unary '+' operator (#5185,
+      Mark Snitily).
+ 173. Fix a typo in Xvesa's emulation of instructions forbidden in vm86
+      mode (#5184, Juliusz Chroboczek)
+ 172. Fix a bounds check in Xlib's Region code (#5183, Owen Taylor).
+ 171. Fix LIBXML2LIBDIR name clash in lib/Imakefile (#5180, ISHIKAWA Mutsumi).
+ 170. Avoid a problem with setfontdirs when run in some locales (#5179,
+      ISHIKAWA Mutsumi).
+ 169. A little tuning for XtAppPeekEvent() (#5178, Dan McNichol).
+ 168. Add a command line option to luit to specify the encoding (#5177, 5181,
+      Tomohiro Kubota).
+ 167. A fix for luit's command line argument handling (#5173, Tomohiro Kubota).
+ 166. Add support to luit for some more 8-bit encodings (#5171,
+      Juliusz Chroboczek).
+ 165. Add an option to luit to enable using GL codes instead of GR codes
+      after a single shift for keyboard input (#5170-5172, Tomohiro Kubota
+      and Juliusz Chroboczek).
+ 164. Fix an fbdev driver crash when the VT isn't active (#5169,
+      Michel Dänzer).
+ 163. Fix a bug that resulted in XwcTextPropertyToTextList() storing an
+      incomplete list (#5168, Tassia St. Germain, for X.Org).
+ 162. Add "ISO8859-16" to the registry (#5167, Tassia St. Germain, for X.Org).
+ 161. A revised Greek xkb layout, including a three-level "extended"
+      variant, and a "polytonic" variant (#5165, Vasilis Vasaitis).
+ 160. Add support for an el_GR.UTF-8 locale, including a compose file with
+      support for polytonic Greek text (#5165, Vasilis Vasaitis).
+ 159. Add missing zh_CN XI18N_OBJS file (#5164, Yong Li).
+ 158. Make xfs chdir to "/" before fork()ing (#5162, Mike Harris).
+ 157. Add some reference counting for Xlib's i18n modules, preventing
+      a module getting unloaded while it's still in use (#5160, Owen Taylor).
+ 156. Update for SCO OpenServer support (#5158, Kean Johnston).
+ 155. Add aliases for the Brazilian Portuguese locale as defined on FreeBSD
+      (#5157, Carlos A M dos Santos).
+ 154. Recognise the en_UK.ISO8859-15 and en_US.ISO8859-15 locales (#5156, 5186,
+      Matthias Scheler).
+ 153. Some cleanups for the UTF-8 Compose file, including:
+       - Better support for Greek
+       - Typo fixes, including incorrect character literals and keysyms.
+      (#5154, Vasilis Vasaitis).
+ 152. Modify Xt's default fallback font pattern to work better in locales
+      where the current one fails to find a useful font (#5152,
+      Tomohiro KUBOTA).
+ 151. Updates to bdf/misc UCS fonts, and generate ISO8859-16 subsets
+      (#5147, Markus Kuhn).
+ 150. Fix some empty delay loops and jiffie wrap bugs in the i830 drm driver
+      (#5149, Arjan Van de Ven).
+ 149. Fix a potential NULL dereference in the drm kernel module (#5148,
+      Andreas Schwab).
+ 148. Major OS/2 support update (#5119, Holger Veit).
+ 147. Fix mode setting in DGA on the Rage128 & Radeon drivers (Alan Hourihane).
+ 146. Build libXt as a flat namespace image on Darwin (Torrey T. Lyons).
+ 145. Install the bitmap file xc/programs/bitmap/Stipple as Stippler on file
+      systems that are not case sensitive (Torrey T. Lyons).
+ 144. Fix enabling of MMIO window on BladeXP desktop chips (Alan Hourihane).
+ 143. Due to bugs in the CyberBladei7/i1 series that cause offset problems,
+      we're disabling the hardware cursor (for now) (Alan Hourihane).
+ 142. Fix Xft-def.cpp file for Cygwin/XFree86 (#5283, Harold Hunt).
+ 141. Server support for OpenBSD/sparc64 (Jason Wright, Matthieu Herrb).
+ 140. Alignment fixes for Xvideo on the Permedia3 (Alan Hourihane).
+ 139. lndir fix for paths containing '//' (H. J. Lu).
+ 138. Fix blank display problem in trident driver for older TGUI series
+      chips, and a few Xv cleanups too (Alan Hourihane).
+ 137. Enable MIT-SHM extension in Xnest server (#A.795, Steve Schwarz).
+ 136. Fix typo in Rage128 DGA driver (#5187. Charles M. Hannum).
+ 135. Fix enabling of DRI when XvMC is disabled (#5208, Matthew Sottek, Intel).
+ 134. Fix HW Cursor handling in vmware driver (#5193, Jeremy, VMWare).
+ 133. YUV handling updates for v4l module. Can now handle multiple formats
+      and find common format for both videocard and kernel.(#5196, Gerd Knorr).
+ 132. Savage driver updates (#5203, Tim Roberts).
+ 131. Drop the indirect buffer after ScreenInit, fixes corruption and
+      kernel error messages. (#5199, Michel Dänzer).
+ 130. Add Polygon support to Render extension (Carl Worth, Keith Packard)
+ 129. Add Intel i845G 2D support to the i8x0 driver, DRI is disabled. 
+      (#A.1062, Graeme Fisher, 2D3D).
+ 128. Fix RGB/BGR inversion problem and screen blanking in the glint
+      driver (Alan Hourihane).
+ 127. Add MIT-SCREEN-SAVER extension docs (Alan Coopersmith).
+ 126. Fix problems opening /dev/fb0 in fbdevhw layer (#5229, Michel Dänzer).
+ 125. Update the apm driver (#5227, Loic Grenie).
+ 124. Update the Japanese localization of XDarwin (Toshimitsu Tanaka).
+ 123. Symbol table cleanup, leaving xf86GetPointerScreenFuncs() as the only
+      common/xf86Cursor.c entry available to modules (Marc La France).
+ 122. Fix VidMode-generated mode switches by making them go through (almost)
+      the same code path as keyboard-generated mode switches (Marc La France).
+ 121. Allow AGP apertures to overlap with other BIOS-assigned PCI resources
+      (Marc La France).
+ 120. Indent'd most of xterm's C code (Thomas Dickey).
+ 119. Major Radeon driver code cleanup (Kevin Martin).
+ 118. Radeon Xv fixes and video key support added (Keith Packard).
+ 117. DPMS support for DFP/LCD and second head added for Radeon (Hui Yu@ATI).
+ 116. Option to disable line acceleration added since Radeon only has 14 bits
+      for lines and clipping.  This will be changed to an XAA option for 14
+      bit support in the future (Hui Yu@ATI, Kevin Martin).
+ 115. Radeon DDC and DFP handling improvements (Hui Yu@ATI).
+ 114. Fixes for DRI lockup problems with Radeon 7500/VE and the AMD 761
+      chipset (Hui Yu@ATI).
+ 113. Radeon PLL routines rewritten with ATOMIC_UPDATE enabled (Hui Yu@ATI).
+ 112. Clone mode added to Radeon driver (not yet functional and disabled
+      by default) (Hui Yu@ATI, Kevin Martin).
+ 111. Fix usage of BuildBinTop in Cygwin/XFree86 (#5223, Harold Hunt).
+ 110. Implement WarpCursor for Cygwin/XFree86, and use GetProcAddress
+      instead of relying on ddraw.dll (#5220-#5222, Harold Hunt).
+ 109. Fix bug that prevented the vesa driver from accessing VGA CRTC registers
+      (Marc La France).
+ 108. New pre-processor files for expat, fontconfig and rename of
+      OSmesa-def.cpp to OSMesa-def.cpp (#5215-#5218, Alexander Gottwald).
+ 107. Rework ati, atimisc, r128 and radeon module versioning (Marc La France).
+ 106. Code clean up for the original Rage LT (Marc La France).
+ 105. An attempt at disabling display switches while the server is running on
+      an LT Pro or Mobility M1 (Marc La France).
+ 104. Make atimisc, r128 and radeon modules register the symbols they reference
+      at module load time, rather than PreInit() (Marc La France).
+ 103. Fix rounding error in Mach64 DSP calculation (Marc La France).
+ 102. Convert xmh to ANSI C (Thomas Dickey).
+ 101. Xterm patch #166 (Thomas Dickey).
+ 100. Fix keyboard beeps on Cygwin/XFree86 (#5211, Harold Hunt).
+  99. Fixed i810 crash on vt switch due to call to Sync() while switched away
+      (Andris Pavenis).
+  98. Fixed MGAG550 HW Cursor (Laure-Amelie Couturie).
+  97. Added Xv support to neomagic driver (Shigehiro Nomura).
+  96. Implemented cross compile environment (Egbert Eich).
+  95. Added AMD x86-64 architecture support (Egbert Eich).
+  94. Fixed memory leaks in xkb code (Egbert Eich).
+  93. Fixed several memory leaks in the config file parser and initialization
+      routines (Egbert Eich).
+  92. Added CardBus bridge support (Egbert Eich).
+  91. Fixed strdup() define in glx (Egbert Eich).
+  90. Extended xf86misc extension to support changing the mouse device
+      (Egbert Eich).
+  89. Replaced strdup() in xf86Configure.c with xalloc()/strcpy() to avoid
+      conflicts when using internal malloc (Egbert Eich).
+  88. Extended memory debugging: Added signal handler to trigger a memory
+      debugger dump on SIGUSR2 when compiled with memleak support
+      (Egbert Eich).
+  87. Set vtSema to FALSE when suspended by APM to catch calls to 2D accel
+      functions (Egbert Eich).
+  86. Implemented mouse protocol detection by analyzing data stream
+      (Egbert Eich).
+  85. Added PnP mouse detection for PS/2, ImPS/2 and older MS serial mice
+      (Egbert Eich).
+  84. Fixed gamma correction code for Trident 9397 (Alan Hourihane).
+  83. Fixed C&T driver to avoid initialization of video in non-linear mode
+      (Egbert Eich).
+  82. Changed C&T driver to allow video even if acceleration is disabled
+      (Egbert Eich).
+  81. Attempt to implement a more consistent handling of HW cursor in C&T
+      driver (Egbert Eich).
+  80. Fixed MGA driver to make HALlib work with VESA framebuffer modes
+      (Egbert Eich).
+  79. Reworked Rendition driver (Egbert Eich).
+  78. S3 Virge driver: added minimal gap between SyncStart and HDisplay to
+      avoid video lockups (Egbert Eich).
+  77. Fixed memory leaks in S3 Savage driver (Egbert Eich).
+  76. Modified several drivers to do int10 initialization using the
+      VBE functions instead of calling int10 directly (Egbert Eich).
+  75. Fixed video support and mode initialization in Silicon Motion driver,
+      removed wait for v-retrace (Egbert Eich).
+  74. Misc fixes to SiS driver (Thomas Winischhofer).
+  73. Added support for 1400x1050 screen in Trident driver (Egbert Eich).
+  72. Fixed several video issues for Trident CyberBladeXP chips (Egbert Eich).
+  71. Added probe for Tseng ISA chips (Egbert Eich).
+  70. Added 'KGAUniversal' option to generic vga driver which changes handling
+      left overscan to work also on chips with C&T core (ie all C&T and Intel
+      graphics chips) (Egbert Eich).
+  69. Modified int10 code to map area between V_BIOS and SYS_BIOS instead of
+      copying it. Copying causes problems if legacy devices map MMIO
+      registers there (Egbert Eich).
+  68. Implemented an extended int10 init function to allow passing flags
+      (Egbert Eich).
+  67. Implemented optional handling of BIOS video mode scratch area in int10
+      code (Egbert Eich).
+  66. Again modified MTRR range splitting (Egbert Eich).
+  65. Added funtions to VBE to save and restore a video mode (Egbert Eich).
+  64. Added missing commas to symbols/us_intl (Hans Lunsing).
+  63. Added Ungherese (qwerty) support (Koblinger Egmont).
+  62. Added Euro symbol for hungarian kbd layout (Koblinger Egmont).
+  61. Build with libcurses on Darwin for forward compatibility
+      (Jordan Hubbard).
+  60. Add Trident CyberBladeXP acceleration (Alan Hourihane).
+  59. Major XDarwin rootless mode rewrite:
+       - Use Carbon to draw directly to windows' backing buffers, rather
+         than "triple" buffering with Core Graphics.
+       - Reorganized Xserver/hw/darwin directory structure to separate out
+         legacy support for Mac OS X 10.0.x.
+      (Torrey T. Lyons and Greg Parker).
+  58. Fix RGB/BGR inversion problem on Permedia3 chips (Alan Hourihane).
+  57. Fix server link problem that shows up on ppc (#5205, Guido Guenther).
+  56. Restore effect of option "NoSilkenMouse" (Marc La France).
+  55. Fix some nForce graphics regressions caused by recent flat panel and
+      Mac updates to the nv driver (Mark Vojkovich).
+  54. Recognise the "Absolute" keyword that was documented in the
+      XF86Config man page (David Dawes).
+  53. Fix the man page information about Absolute screen positioning in
+      the ServerLayout section (David Dawes).
+  52. SunOS changes to xedit's lisp interpreter (Marc La France).
+  51. Support the Ti 3026 ramdac with 3DLabs Permedia found on some
+      AccelStar boards (Alan Hourihane).
+  50. Move int10 softbooting furthur up in the glint driver to post
+      much earlier (Alan Hourihane).
+  49. Fix bug that sometimes caused makedepend to forget #define'd symbols
+      (Marc La France).
+  48. MIT-SHM updates (Roberto Zunino, Matthieu Herrb).
+  47. Import Mesa-4.0.1, and resync with the DRI trunk which is now based
+      on this (Keith Whitwell, Brian Paul, Alan Hourihane, David Dawes).
+  46. Mga driver updates:
+       - Don't try dual-head mode with the G400 unless the mga_hal module
+         is loaded.
+       - Distinguish between the G400 and G450 when showing the chipset in
+         the log.
+       - Update the mga man page for supported hardware and dual-head
+         support.  Futher updates are needed to document all of the
+         drivers's options.
+      (David Dawes).
+  45. Add -Wundef when compiling the tree with GCC >= 2.8 (Marc La France).
+  44. Macintosh flat panel fix in the "nv" driver (Mark Vojkovich).
+  43. XDarwin fixes and improvements for full screen Quartz mode:
+       - Pull full screen specific code out of generic Quartz support.
+       - Install new colormaps correctly with PseudoColor.
+       - Release the screen immediately when closing down.
+       - Do not try to release the screen when closing down in rootless mode.
+      (Torrey T. Lyons).
+  42. Reimplement Xft library on top of new fontconfig library (Keith Packard).
+  41. Resync with the final Mesa-3.4.x-based DRI trunk.
+  40. Add support for wscons bell (Jason Wright).
+  39. Fix IBM-reported bug that could cause PCI bus lockouts with second
+      generation integrated Mach64 controllers (Marc La France).
+  38. Rework ATI driver's registration of symbols with the loader
+      (Marc La France).
+  37. In the ATI driver, add option "CrtDisplay" to force CRT display in a
+      dual display situation (Marc La France).
+  36. In the ATI driver, rename option "CrtScreen" to "NoPanelDisplay", keeping
+      "CrtScreen" as a private option for compatibility (Marc La France).
+  35. Document X_NOT_IMPLEMENTED (Marc La France).
+  34. NetBSD teeny OS version handling improvement in imake (#5176,
+      Matthias Scheler).
+  33. Build I2C support before building drivers (Marc La France).
+  32. Fix a problem related to reserving the overlay key in the default
+      colormap in 24+8 mode.  This caused some clients using the 8-bit
+      visuals to fail (David Dawes).
+  31. [SECURITY] Zlib error handling fix (Mark Adler).
+  30. Put back XDarwin's byte-ordering fix for reading keymappings on
+      Darwin x86 that was inadvertently dropped (Rob Braun).
+  29. Fix Big Endian hardware cursor bug on GeForce3 (Mark Vojkovich).
+  28. Experimental flat panel support in the "nv" driver.  GeForce2 Go
+      should work now (Mark Vojkovich).
+  27. XDarwinStartup improvements:
+       - Auto-detect proper mode to run XDarwin.
+       - Find XDarwin.app with Launch Services.
+       - Add XDarwinStartup man page.
+      (Torrey T. Lyons).
+  26. Localize XDarwin credits in French (Olivier Verdier) and Portuguese
+      (Fabr’cio L. de Castro).
+  25. Turn off XFree86-Misc and VidMode extensions for XDarwin
+      (Torrey T. Lyons).
+  24. Localize a few missing strings in XDarwin preferences (Torrey T. Lyons).
+  23. GeForce4 support (Mark Vojkovich).
+  22. Add IA-64 460GX PCI IDs (Marc La France).
+  21. Some vesa driver updates:
+       - Use the common layer's mode validation functions, which gives
+         mode selection behaviour more consistent with other drivers.
+       - Don't force the depth 24 framebuffer bpp.  Instead check what
+         framebuffer layouts are supported by VBE, and and choose the
+         layout appropriately.
+       - fb handles 24/32 fb/pixmap layout conversion, so don't use
+         the xf24_32bpp module.
+       - shadow + fb at depth 4 needs the bpp set to 8.
+      (David Dawes).
+  20. Fix some misleading messages about why modes aren't available
+      (David Dawes).
+  19. Fix for `hostname` issue on Linux (Marc La France).
+  18. Fix startx script for ksh (Phillip B. Bruce).
+  17. Fix Emulate3Buttons for wsmouse protocol on NetBSD and OpenBSD
+      (Matthieu Herrb).
+  16. Add Portuguese localization of XDarwin front end
+      (Fabr’cio L. de Castro).
+  15. Fix mouse Protocol "Auto" for SunOS (Marc La France).
+  14. Relocate all driver low memory accesses (atimisc module not yet done)
+      (Marc La France).
+  13. Make driver I/O relocatable (atimisc, s3, sis and tseng not yet done)
+      (Marc La France).
+  12. PCI domain changes for SunOS/SPARC64 (Marc La France).
+  11. PCI domain changes for Linux/SPARC64 (#4653, David S. Miller,
+      Marc La France).
+  10. Temporary workaround for IA-64 (Marc La France).
+   9. Fix SIGSEGV when printing modes that have no modifiers (Marc La France).
+   8. Revert the ATI driver's composite sync default to off (Marc La France).
+   7. Add a note to the messages that get printed when a signal is caught
+      during initialization (which includes X -configure) that reported
+      unresolved symbols might not be the reason for the server aborting
+      (David Dawes).
+   6. Fix symbol registration in some drivers, which reduces the number of
+      symbols reported as "unresolved" when 'X -configure' crashes
+      (David Dawes).
+   5. Fill in names for BIOS modes in the vesa driver's mode pool that weren't
+      otherwise assigned names (David Dawes).
+   4. Fix an unresolved symbol in libGLU.so that shows up when building it
+      with gcc-3 (David Dawes).
+   3. Fix invalid code caused by a memcpy() macro being split by a directive
+      (#5150, Sami Farin).
+   2. Fix incorrect symbol prefixing with Xlib's i18n modules on Solaris
+      (Keith Packard, David Dawes).
+   1. Don't try to print mode names when the name is NULL (David Dawes).
+
 XFree86 4.2.0 (18 January 2002)
  690. Workaround for hardware bug that prevents older ATI 3D Rage adapters from
       being assigned to XF86Config device sections (Marc La France).
@@ -60,8 +927,8 @@ XFree86 4.1.99.6 (14 January 2002)
       Juliusz Chroboczek).
  656. Fix unresolved symbol and loader symbol registration problems in the
       i810 driver that were introduced with the i830 support (David Dawes,
-      Abraham vd Merwe).   
- 655. Fix sparklies problem for other Trident *BladeXP chipsets 
+      Abraham vd Merwe).
+ 655. Fix sparklies problem for other Trident *BladeXP chipsets
       (Alan Hourihane).
  654. In XDarwin IOKit mode, ignore screens that can not provide the requested
       size, depth, or refresh rate instead of generating a fatal error
@@ -192,7 +1059,7 @@ XFree86 4.1.99.3 (19 December 2001)
  588. Fix the SiS drm driver (#5084, Torsten Duwe).
  588. Fix Trident driver pitch values when accelerator is in use, applies
       to Image and Blade series chips (Alan Hourihane).
- 586. Minor bugfix to SiS driver, restructured VT switching code 
+ 586. Minor bugfix to SiS driver, restructured VT switching code
       (Egbert Eich).
  585. Attempt to fix flickering in 24bpp on Trident CyberBladeXPAi1
       (Egbert Eich).
@@ -280,23 +1147,23 @@ XFree86 4.1.99.2 (12 December 2001)
       Xvideo window for the trident driver (Geoffrey Hausheer, Alan Hourihane).
  542. Fixed xkb to avoid setting of AccessXTimeout to 0 (Egbert Eich).
  541. Added option to sync the logfile after every line written (Egbert Eich).
- 540. Improved APM handling: 
+ 540. Improved APM handling:
       - Added disable of Input Handlers.
       - Added support for undo on failed APM requests.
       - Set vtSema to false (Egbert Eich).
  539. Improved detection of primary device especially for non-PC platforms
       (Egbert Eich).
- 538. Silicon Motion driver Fixes: 
+ 538. Silicon Motion driver Fixes:
       - Removed separate loading of int10 code.
       - Added reset of graphics engine on EnterVT (Egbert Eich).
  537. Set flag ROP_NEEDS_SOURCE for CPUToScreenColorExpand for all
       S3 Savage chips (Egbert Eich).
- 536. SiS driver: 
+ 536. SiS driver:
       - Added fix to restore fbdev mode properly on VT switch/exit.
       - Improved LCD handling on SiS 630.
-      - fixed screen blanking in SiS driver to properly blank LCDs 
+      - fixed screen blanking in SiS driver to properly blank LCDs
         (Egbert Eich).
- 535. Trident driver: 
+ 535. Trident driver:
       - Fixed screen centering for 640x480 Modes.
       - Fixed video playback for BladeAi1.
       - Fixed hotkey internal/external switching for XPm8/16.
@@ -382,7 +1249,7 @@ XFree86 4.1.99.2 (12 December 2001)
  490. Don't interfere with ATI panel support when using DDC information for
       monitor tolerance defaults (Marc La France).
  489. Add Dutch localization of XDarwin help file (Paul Edens).
- 488. Add stub functions needed by libGL to libXThrStubs. Link libGL against 
+ 488. Add stub functions needed by libGL to libXThrStubs. Link libGL against
       libXthrStubs on systems that build it. (#4997, Matthieu Herrb).
  487. Fix building and loading of I18N modules by Xlib on NetBSD and OpenBSD
       (#5049, Matthieu Herrb).
@@ -434,7 +1301,7 @@ XFree86 4.1.99.2 (12 December 2001)
  459. Fix buffer problems used by xrdb to build command line, noticed on
       systems with a large amount of visuals (#5016, Alan Coopersmith).
  458. Fix bug regarding signal handling in x11perf by inserting an abort
-      test after each run (#5015, Mark W. Snitily, from X11R6.6). 
+      test after each run (#5015, Mark W. Snitily, from X11R6.6).
  457. Add improved diagnostic messages and error checking to libXfont
       which is used by bdftopcf command (#5014, Chris Bare, from X11R6.6).
  456. Fix advertised surfaces for the i810 Motion Compensation driver and
@@ -443,7 +1310,7 @@ XFree86 4.1.99.2 (12 December 2001)
       fbdevhw layer (#5004, Michel Dänzer).
  454. Add Rage128 Pro PP detection to ati driver (#5025, Alfred Perlstein,
       Mike Harris).
- 453. Add CyberBladeXPAi1 recognition to the trident driver (#A.658, 
+ 453. Add CyberBladeXPAi1 recognition to the trident driver (#A.658,
       Jani Jaakkola).
  452. Fix typo in PCI bus scanning that caused a hang when there was more than
       one PCI bus (#A.652, Uwe Dannowski).
@@ -555,7 +1422,7 @@ XFree86 4.1.99.2 (12 December 2001)
  374. Cygwin/XFree86 cleanups and fixes (#4992, #4993, #4999 Harold Hunt).
  373. Fix i830 VT switching problems which hang the ring buffer (#4987,
       #4989, Abraham vd Merwe).
- 372. fix a format string problem in lbxproxy, apparently not exploitable 
+ 372. fix a format string problem in lbxproxy, apparently not exploitable
       (r0gue@vertarmy.org,  Matthieu Herrb).
  371. Fix disappearing cursor in XDarwin rootless mode by falling back to
       system cursor for cursors bigger than 16x16 (Torrey T. Lyons).
@@ -564,9 +1431,9 @@ XFree86 4.1.99.2 (12 December 2001)
  368. Fix calculation of DPI when Xinerama in use (#4986, Andrew C Aitchison).
  367. Update XDarwin preferences GUI to match current features
       (Torrey T. Lyons).
- 366. Xkb fixes for international keyboards (Matthieu Herrb). 
- 365. Add client side sparc64 support for NetBSD and OpenBSD (Eduardo Horvath, 
-      Matthieu Herrb). 
+ 366. Xkb fixes for international keyboards (Matthieu Herrb).
+ 365. Add client side sparc64 support for NetBSD and OpenBSD (Eduardo Horvath,
+      Matthieu Herrb).
  364. Allow xkbcomp to be used in a cross-compile environment (Alan Hourihane).
  363. Update documention for the SiS driver, the Options file
       (Ademar de Souza Reis Jr.).
@@ -583,7 +1450,7 @@ XFree86 4.1.99.2 (12 December 2001)
  356. Add CaseSensitiveFileSystem definition, which defaults to YES, except
       on Darwin, Cygwin, and OS/2. Fix another case problem spotted by
       NAKAHASHI Ichiro (Torrey T. Lyons).
- 355. Enable Vendor specific FatalError for Cygwin/XFree86 and create 
+ 355. Enable Vendor specific FatalError for Cygwin/XFree86 and create
       the Xserver as a windows executable (#4967, Harold Hunt).
  354. Add i830 2D and DRI driver (#A.604, VA Linux Systems, 2D3D).
  353. Use the -no-cpp-precomp compiler option on Darwin, rather than the
@@ -591,19 +1458,19 @@ XFree86 4.1.99.2 (12 December 2001)
  352. Reverting patch #340, fixing type (Egbert Eich).
  351. Fix rotation in fbdev driver (#4958, #4959, Michel Dänzer).
  350. Resync with DRI CVS trunk (DRI Project).
- 349. Move ati driver out of DevelDrivers on PPC platforms (#4952, 
+ 349. Move ati driver out of DevelDrivers on PPC platforms (#4952,
       Michel Dänzer).
- 348. SECURITY: set default value of authComplain resource in xdm to true. 
-      This closes a hole where anyone can connect to the X server if 
+ 348. SECURITY: set default value of authComplain resource in xdm to true.
+      This closes a hole where anyone can connect to the X server if
       the xdm auth dir doesn't exist (Galen Hancock).
  347. SECURITY: don't let a non-root user halt the machine by having X
       send SIGUSR1 to init (Thomas Moestl).
  346. Changed int10 module to stub on Sparc (Egbert Eich).
  345. Added hyperpen driver (Roland Jansen et. al.).
  344. Fixed alignments of x86emu-structures for AXP (Jay Estabrook).
- 343. Fixed XLoadQueryFont() and XLoadFont() to support locales 
+ 343. Fixed XLoadQueryFont() and XLoadFont() to support locales
       (required for Euro support) (Markus Kuhn).
- 342. Modified XtCvtStringToFont() to match any ISO8859 instead of 
+ 342. Modified XtCvtStringToFont() to match any ISO8859 instead of
       latin1 as fallback. Required for Euro Support (Markus Kuhn).
  341. Added acute to compose key list for iso8859-15 (Markus Kuhn).
  340. Modified XV Xinerama support to recognize adaptors if screen 0
@@ -620,7 +1487,7 @@ XFree86 4.1.99.2 (12 December 2001)
         is enabled.
       - added FP_mode flag to C&T driver which allows to override the detected
         state of the flat panel (Egbert Eich).
-      - fixed driver to act appropriately if the BIOS switches to the 
+      - fixed driver to act appropriately if the BIOS switches to the
         external monitor it detects when doing DDC.
       - Set IOBase correctly for MMIO when detection 65545 PCI.
       - fixed text screen restauration on 69030 (Egbert Eich).
@@ -631,14 +1498,14 @@ XFree86 4.1.99.2 (12 December 2001)
       - added double buffering to video support.
       - fixed register settings to prevent flickering during video playback.
        (Egbert Eich).
- 334. Fixed bug in C&T driver that caused interlaced mode not to work 
+ 334. Fixed bug in C&T driver that caused interlaced mode not to work
       (Claus Hulstrøm).
  333. Added full MMIO support for C&T 69030 chips (Gregg H. Burman).
  332. Fixed MMIO accel code in Cirrus Alpine driver, got PIO accel code to
       work (Egbert Eich).
  331. Fixed fbdev to obtain 24 bit framebuffer format from the kernel, added
       more failure messages to fbdev driver (Egbert Eich).
- 330. Added calls to vbeFree() to rendition, savage, silicon motion, 
+ 330. Added calls to vbeFree() to rendition, savage, silicon motion,
       i740 and i810 driver (Egbert Eich).
  329. Modified MGA driver for new Sparse allocation sceme (Jay Estabrook).
  328. Modified handling of sparse addresses on AXP: The code now no longer
@@ -650,23 +1517,23 @@ XFree86 4.1.99.2 (12 December 2001)
  325. Disabled accel functions that cause lockups on certain neomagic
       systems by default. They can be reenabled by setting the option
       "StrangeLockups" to "no" (Egbert Eich).
- 324. Did a further fix on ScreenToScreenCopy() for Neomagic 2200 
+ 324. Did a further fix on ScreenToScreenCopy() for Neomagic 2200
       (Egbert Eich).
  323. Added experimental support for Toshiba Libretto. This can be enabled
       by the option "DisplayHeight480" (Egbert Eich).
- 322. Fixed clipping in Savage driver, update to version 1.1.1.19 
+ 322. Fixed clipping in Savage driver, update to version 1.1.1.19
       (Tim Roberts).
  321. fixed calls to BLTSync() on SiS driver (Egbert Eich).
  320. Fixed Mono8x8PatternFill(): Moving SETROPFG behind SETROPBG did the
       trick (Egbert Eich).
- 319. Setting 24 bpp pximap flags correctly in SiS driver dependening 
+ 319. Setting 24 bpp pximap flags correctly in SiS driver dependening
       on chipset (Egbert Eich).
  318. Setting depth and bpp of framebuffer correctly for suncg14 and sunleo
       driver (Thorsten Kukuk).
  317. Tseng driver not longer ignores results of TsengDoMemLimit() which
-      tests for certain restrictions on the usable framebuffer size 
+      tests for certain restrictions on the usable framebuffer size
       (Egbert Eich).
- 316. Vesa driver: adding calls to vbeFree() before exiting PreInit(). 
+ 316. Vesa driver: adding calls to vbeFree() before exiting PreInit().
       Reinit vbe in ScreenInit() (Egbert Eich).
  315. Adding int10 initialization to generic vga driver (Egbert Eich).
  314. Modified generic vga driver to use shadow fb for vga16 on AXP.
@@ -676,19 +1543,19 @@ XFree86 4.1.99.2 (12 December 2001)
       (Egbert Eich).
  312. Removing message output from xf86WcmPlug() which causes -configure
       to core dump (Egbert Eich).
- 311. Modified int10 Pci code to be able to use new version of 
+ 311. Modified int10 Pci code to be able to use new version of
       xf86ReadPciBIOS() (Egbert Eich).
  310. Modified int10 int1A handler to return valid when an unimplemented int10
       call is encountered. This allows fallback to system BIOS (Egbert Eich).
  309. Modified xf86ReadPciBIOS() to check for valid i386 PC signature.
-      Added functions xf86GetAvailablePciBIOSTypes() and 
-      xf86ReadPciBIOSByType() to obtain available PCI BIOS types and 
+      Added functions xf86GetAvailablePciBIOSTypes() and
+      xf86ReadPciBIOSByType() to obtain available PCI BIOS types and
       retrieve a certain BIOS by type (Egbert Eich).
  308. Reversed bogus patch 1050 of version 4.0.2. The graphics engine will
       *never* be called after receiving an APM suspend and before receiving
       an APM resume. If the neomagic locks up on resume this has a different
       reason (Egbert Eich).
- 307. Change  real/effective user ID to 0/0 before calling modprobe in 
+ 307. Change  real/effective user ID to 0/0 before calling modprobe in
       xf86LoadKernelModule() on Linux so user can also load drm modules. Fixed
       PATH environment variable to /sbin (Stefan Dirsch, Egbert Eich).
  306. Removed disable/enable interrupt code on ia64 as interrupts cannot
@@ -704,28 +1571,28 @@ XFree86 4.1.99.2 (12 December 2001)
  300. Fixed core dump in twm if no locales are present (Egbert Eich).
  299. Modified xterm app default to use LFD fontnames instead of old type
       (Michael Schroeder).
- 298. Add a f.startwm function to twm to start another manager. 
+ 298. Add a f.startwm function to twm to start another manager.
       (Matthieu Herrb).
- 297. Disable MIT-SHM in Xnest, caused a segfault (Matthieu Herrb). 
+ 297. Disable MIT-SHM in Xnest, caused a segfault (Matthieu Herrb).
  296. Update wskbd keyboard protocol handling for OpenBSD/macppc
       (Matthieu Herrb).
  295. Fix problems starting XDarwin from the Finder and pasting with
       multi-button mouse emulation (Torrey T. Lyons).
  294. S3 driver updates. Restore console for 964 with Ti3025 and Trio64, and
       support for Aurora64V+ (#4953, Ani Joshi).
- 293. Fix USB Keyboard access when no PS/2 controller present 
+ 293. Fix USB Keyboard access when no PS/2 controller present
       (#4948, Pontus Lidman).
- 292. Add i810 XvMC (Motion Compensation) driver (#4946, #4964, #4966, 
+ 292. Add i810 XvMC (Motion Compensation) driver (#4946, #4964, #4966,
       Matthew Sottek, Intel).
  291. When using XKB and LEDs are switched on/off by external application
       the keyboard module doesn't change phisycal LEDs state immediately
       (#4951, Ivan Pascal).
  290. Clean up Cygwin/XFree86 keyboard files (#4949 Harold Hunt).
  289. Add Matrox G550 support (#4947, Luugi Marson, Matrox).
- 288. Remove SuperProbe.man definition for manual page 
+ 288. Remove SuperProbe.man definition for manual page
       (#4944, Ishikawa Mutsumi).
  287. Ark driver updates (#4943, Ani Joshi).
- 286. Fix xterm when XIM is disabled - caused a segfault 
+ 286. Fix xterm when XIM is disabled - caused a segfault
       (#4942, Tomohiro Kubota).
  285. Add Big Endian support (PowerPC) to radeon driver (#4934, Ani Joshi).
  284. Fix support for legacy Windows TrueType fonts in Big5 encoding
@@ -755,7 +1622,7 @@ XFree86 4.1.99.2 (12 December 2001)
  272. Rework XDarwin front end to start X clients in the user's normal
       environment and fix issues while quitting (Torrey T. Lyons).
  271. SECURITY: fix glyph clipping for large origin (Keith Packard).
-      Reported to be remotly exploitable through konqueror or netscape 
+      Reported to be remotly exploitable through konqueror or netscape
       by Georgi Guninski.
  270. Fix setting of memPhysBase in a few drivers (#4937, Gerd Knorr).
  269. Finish merging freetype-2-0-4 into trunk by resolving conflicts. This
@@ -787,8 +1654,8 @@ XFree86 4.1.99.2 (12 December 2001)
  256. Add entry to initialise framebuffer manager by area (allowing for a
       possible extra partial scanline) and make it print all largest areas
       (Marc La France).
- 255. Make xdm use BSD authentification on OpenBSD and use setproctitle() 
-      instead of home grown version where available (enabled on 
+ 255. Make xdm use BSD authentification on OpenBSD and use setproctitle()
+      instead of home grown version where available (enabled on
       OpenBSD and NetBSD only) (Matthieu Herrb).
  254. Make -configure generate the DisplaySize from the acquired DDC
       information (#4897, Andrew C Aitchison).
@@ -962,7 +1829,7 @@ XFree86 4.1.99.1 (20 August 2001)
       (Marc La France).
  162. Make imake pass its -W* flags to cpp (Marc La France).
  161. More accomodations for newer GCC's (Mike A. Harris).
- 160. Remove a CYGWIN define from Xserver/include/windowstr.h 
+ 160. Remove a CYGWIN define from Xserver/include/windowstr.h
       (#4832, Harold Hunt).
  159. Fix a casting problem which causes bdftopcf to write corrupted
       fonts on buffer boundaries (#A.522, Jakub Bogusz).
@@ -1035,7 +1902,7 @@ XFree86 4.1.99.1 (20 August 2001)
  118. Add MagicTouch driver (A.482, Mauro Ziliani)
  117. Fix side effect in XFree86 of the recent changes to libxf86config
       (A.486, Knuts Andy).
- 116. Define Xutf8LookupString in X11-def.cpp for Cygwin/XFree86 
+ 116. Define Xutf8LookupString in X11-def.cpp for Cygwin/XFree86
       (#4790, Suhaib Siddiqi).
  115. Turn on RandR build for Cygwin/XFree86 (#4789, Harold Hunt).
  114. Import of Gregory Parker's rootless code for Mac OS X. The code has
@@ -1083,16 +1950,16 @@ XFree86 4.1.99.1 (20 August 2001)
       (splite at purdue.edu).
   91. Fix glide driver that causes -configure to fail for all drivers
       (Alan Hourihane).
-  90. Don't define SVR4 on Cygwin/XFree86 (#4751, Suhaib Siddiqi,  
+  90. Don't define SVR4 on Cygwin/XFree86 (#4751, Suhaib Siddiqi,
       Alan Hourihane).
   89. Don't override system commands specified in host.def on Cygwin/XFree86
       (#4753, Alexander Gottwald).
-  88. Fix cursor problem in server respawn's on Cygwin/XFree86 
+  88. Fix cursor problem in server respawn's on Cygwin/XFree86
       (#4750, Harold Hunt).
-  87. Fix typo definition of CplusplusCmd in cygwin.cf 
+  87. Fix typo definition of CplusplusCmd in cygwin.cf
       (#4752, Alexander Gottwald).
   86. Fix makedepend for use on Cygwin/XFree86.
-      Use makedepend on Cygwin/XFree86. 
+      Use makedepend on Cygwin/XFree86.
       Fix SharedDepLibraryTarget so that build dependencies are correct,
       this fixes libGLU's build problem (Alan Hourihane).
   85. Don't define MKSTEMP on Cygwin/XFree86 (#4725, Harold Hunt).
@@ -1111,7 +1978,7 @@ XFree86 4.1.99.1 (20 August 2001)
       flags. (#4743, Harold Hunt).
   75. Fix some build issues on Cygwin/XFree86 (#4736, #4737, Suhaib Siddiqi).
   74. Some Cygwin/XFree86 cleanups (#4735, Harold Hunt).
-  73. Fix XAA's incorrect acceleration of X-Render's repeated sources and 
+  73. Fix XAA's incorrect acceleration of X-Render's repeated sources and
       masks (Mark Vojkovich).
   72. Disable PCI resource conflict checking for Linux/Alpha (Jay Estabrook).
   71. Fix Linux xf86GetPciSizeFromOS() parsing when the kernel is 64 bit
@@ -1290,13 +2157,13 @@ XFree86 4.0.99.900 (18 May 2001)
       (#4654, Harold Hunt).
  536. Add an option to the SiS driver to turn off Xvideo support
       (Ademar de Souza Reis Jr.)
- 535. Fix FreeType bug, use MAXFONTNAMELEN (#4652, Janusz Gorycki, 
+ 535. Fix FreeType bug, use MAXFONTNAMELEN (#4652, Janusz Gorycki,
       Juliusz Chroboczek).
  534. Fix hw/vfb for compilation on Cygwin/XFree86 (#4655, Harold Hunt).
  533. Fix some Sparc platform issues with Pci resources and the glint
       driver (#4641-4641,4644-4648 David S. Miller).
  532. Update glide, imstt, newport, rendition, suncg14, suncg3, suncg6,
-      sunleo, suntcx, vga and vmware to use fb and support Render 
+      sunleo, suntcx, vga and vmware to use fb and support Render
       (Keith Packard).
  531. XDarwin fixes:
        - Turn off building non-functional RENDER support.
@@ -1305,14 +2172,14 @@ XFree86 4.0.99.900 (18 May 2001)
          switching from Aqua.
       (Torrey Lyons).
  530. Update freetype2 bits to 2.0.2 version (Keith Packard).
- 529. Re-fix the Trident Video scaler support for Blade series chips 
+ 529. Re-fix the Trident Video scaler support for Blade series chips
       (Alan Hourihane).
  528. Fixed lbx to handle endian swapping without core dump (Egbert Eich).
  527. Fixed MTRR region splitting (Egbert Eich).
  526. Cleaned up option handling in int10 code (Egbert Eich).
- 525. Added options to specify the Video BIOS to use for POSTing a 
-      chipset (Egbert Eich). 
- 524. Trident driver: added call to BIOS to enable unstretched mode when 
+ 525. Added options to specify the Video BIOS to use for POSTing a
+      chipset (Egbert Eich).
+ 524. Trident driver: added call to BIOS to enable unstretched mode when
       display is stretched. This should make the option "CyberShadow"
       obsolete. (Egbert Eich).
  523. Attempt to fix video Support on Trident driver (Egbert Eich).
@@ -1326,17 +2193,17 @@ XFree86 4.0.99.900 (18 May 2001)
  518. Cleanded up DDC code in mga driver (Egbert Eich).
  517. Fixed KGA handling in i740 driver (Egbert Eich).
  516. Converted i740 and Silicon Motion drivers to fb (Egbert Eich).
- 515. Added calls to vbeFree() or xf86FreeInt10() to C&T, glint, 
-      mga, neomagic, nv, s3v, tdfx and trident drivers to clean up 
+ 515. Added calls to vbeFree() or xf86FreeInt10() to C&T, glint,
+      mga, neomagic, nv, s3v, tdfx and trident drivers to clean up
       shared memory segments (Egbert Eich).
  514. Reworked video support in C&T driver, cleaned up block handler
       (Egbert Eich).
- 513. C&T driver: introduced a delay when setting the cursor image for 
+ 513. C&T driver: introduced a delay when setting the cursor image for
       the first time after a mode change (Egbert Eich).
  512. Fixed R128CCE_RESET in r128 driver to do a reset only when dri
       is enabled (Egbert Eich).
  511. Rewrote readPciBIOS() and getValidBIOSBase() (Egbert Eich).
- 510. Fixed xf86Info structure in xf86Globals.c to match prototype 
+ 510. Fixed xf86Info structure in xf86Globals.c to match prototype
       (Egbert Eich).
  509. -
  508. Fix XDarwin install problems with DESTDIR handling and with soft links
@@ -1346,7 +2213,7 @@ XFree86 4.0.99.900 (18 May 2001)
       later (#A.401, #A.402, #A.403, Rainer Orth).
  505. Add Croatian keyboard for xkbcomp from Slovenian keyboard layout
       (#A.405, Vlatko Kosturjak).
- 504. Fix XvQueryAdaptors when there is no adaptors found 
+ 504. Fix XvQueryAdaptors when there is no adaptors found
       (#A.394, Jamie Strachan).
  503. Remove a stray INCLUDES in Xmuu/Imakefile when snprintf isn't used.
       Set the Permedia2 DAC Mask to 0xFF.
@@ -1842,13 +2709,13 @@ XFree86 4.0.99.2 (6 April 2001)
       in their -f flag (Marc La France).
  274. Bump the video and input driver ABI minor numbers.
  273. Add xf86SetRealOption() (Huver).
- 272. Change Xdarwin do that it processes all pending events instead of 
+ 272. Change Xdarwin do that it processes all pending events instead of
       just the oldest one on ProcessInputEvents() call ,
       Quit Xdarwin cleanly, wether from the Xserve or from Cocoa front end,
-      Fix a case typp which cases the Xdarwin server not to start if 
-      installed on a case sensitive file system like UFS. 
-      (#4504, #4507, #45011, Gregory Parker, Torrey T. Lyons). 
- 271. Move Section DRI/Endsection into the DRI function to be consistant with 
+      Fix a case typp which cases the Xdarwin server not to start if
+      installed on a case sensitive file system like UFS.
+      (#4504, #4507, #45011, Gregory Parker, Torrey T. Lyons).
+ 271. Move Section DRI/Endsection into the DRI function to be consistant with
       all of the other sections. (Quentin Neill)
  270. Made xf4bpp code moer 64bit clean (still doesn't work on Alphas)
       (Egbert Eich).
@@ -1896,11 +2763,11 @@ XFree86 4.0.99.2 (6 April 2001)
  245. Add support to splitting WC MTRR regions on Linux when the regions is
       not aligned on a size boudary (#A.238, _Usul John Obscurant).
  244. Add Acecad support to the "summa" input driver (#A.237, Arpad Gereoffy).
- 243. Don't try to map 64K blit window aperture on older trident chips 
+ 243. Don't try to map 64K blit window aperture on older trident chips
       (Alan Hourihane).
  242. V4L driver cleanups and Xineramification (#4502, Gerd Knorr).
  241. Make the X server and the Mac OS X front end run in a single process.
-      Other build fixes for Darwin (#4500, #4501, the XonX team). 
+      Other build fixes for Darwin (#4500, #4501, the XonX team).
  240. Don't build xf86config under BuildServersOnly (Marc La France).
  239. Potential fix for DGA apps that set colourmaps the normal way rather than
       through DGA (Mark Vojkovich, Marc La France, Pontus Lidman).
@@ -1909,7 +2776,7 @@ XFree86 4.0.99.2 (6 April 2001)
  236. Plug kernel security hole in Linux int10 (Marc La France).
  235. Fix Xnest build for newest gcc versions (Marc La France).
  234. Fix typo in Xv Xinerama support (Gerd Knorr).
- 233. Fix a problem with multi-thread support on OpenBSD (released OpenBSD 
+ 233. Fix a problem with multi-thread support on OpenBSD (released OpenBSD
       versions don't have getpwuid_r) (Matthieu Herrb)
  232. Allow to compile on OpenBSD-current which has completly removed PCVT
       from its installation. (Matthieu Herrb)
@@ -2004,11 +2871,11 @@ XFree86 4.0.99.1 (19 February 2001)
       (Egbert Eich).
  199. Modified memory debugger script to retieve backtrace information
       with an unmodified version of gdb (Egbert Eich).
- 198. Modified memory debugger to print out backtrace of call where 
-      a referenced freed pointer was once allocated (Egbert Eich). 
+ 198. Modified memory debugger to print out backtrace of call where
+      a referenced freed pointer was once allocated (Egbert Eich).
  197. Several more fixes for memory leaks and several "referenced freed"
-      to keep memory debugger quiet (Egbert Eich). 
- 196. Fixed "referenced freed" memory debugger message in xf8_24bpp code 
+      to keep memory debugger quiet (Egbert Eich).
+ 196. Fixed "referenced freed" memory debugger message in xf8_24bpp code
       (Egbert Eich).
  195. Add a new rule for building DRI (client) modules, so that only the
       relevant symbols are exported (#4454, Red Hat).
@@ -2017,16 +2884,16 @@ XFree86 4.0.99.1 (19 February 2001)
       it when leaving SETUP state (Egbert Eich).
  192. Add type of option argument as comment to config file.
       (xf86cfg might need some fixing) (Egbert Eich).
-      (Hopefully) fixed reordering of chips so primary comes first 
+      (Hopefully) fixed reordering of chips so primary comes first
       (Egbert Eich).
- 191. Fixed bug that caused server to crash when a DGA private colormap 
-      was freed as miSprite still had a pointer to this colormap 
+ 191. Fixed bug that caused server to crash when a DGA private colormap
+      was freed as miSprite still had a pointer to this colormap
       (Egbert Eich).
  190. Fixed savage driver for altered vbe functionality (Egbert Eich).
- 189. Moved bulk of generic VBE functionality from VESA driver into 
+ 189. Moved bulk of generic VBE functionality from VESA driver into
       the vbe module (Egbert Eich).
  188. Fixed some bugs in vesa driver (Egbert Eich).
- 187. Fixed memleaks in parser code as well as several referenced freed 
+ 187. Fixed memleaks in parser code as well as several referenced freed
       pointers which pollute output of memory debugger and obsucre debugging
       (Egbert Eich).
  186. Fixed ChangeWindowAttributes() in cfb8_16 code (Egbert Eich).
@@ -2034,7 +2901,7 @@ XFree86 4.0.99.1 (19 February 2001)
       os-level code (Egbert Eich).
  184. Added option to int10 softbooter to POST even primary device.
  183. Fixed memory leak in linux int10 code (Egbert Eich).
- 182. Modified vm86 trap code not to fail on a #LOCK prefix byte 
+ 182. Modified vm86 trap code not to fail on a #LOCK prefix byte
       (Egbert Eich).
  181. Fixed memory leak in posix_tty.c (Egbert Eich).
  180. Added support to generic driver to POST even primary devices
@@ -2045,8 +2912,8 @@ XFree86 4.0.99.1 (19 February 2001)
  177. Fixed problems with Xv code in C&T driver (Egbert Eich).
  176. Fixed a vertical and horizontal offsets on HiQV chips due to
       non-"standard" handling of H/VBlankEnd registers (Egbert Eich).
- 175. Removed code that sets a chipset into graphics mode when 
-      saving/restoring fonts in standard vga code. This causes problems 
+ 175. Removed code that sets a chipset into graphics mode when
+      saving/restoring fonts in standard vga code. This causes problems
       on some trident chipsets (Egbert Eich). [EXPERIMENTAL!]
  174. Moved KGA code that handles the H/VBlankEnd code that overscans remain
       invisible to separate functions. This way drivers have better control
@@ -2056,7 +2923,7 @@ XFree86 4.0.99.1 (19 February 2001)
       (Egbert Eich).
  171. Added option to swap heads on a matrox G400 dual head (Stefan Dirsch).
  170. Added handling of broken planemask support on different models of
-      matrox G100 cards (Egbert Eich). 
+      matrox G100 cards (Egbert Eich).
  169. Fixed minor memory leak in ati driver (Egbert Eich).
  168. Fixed resource registration in TDFX driver (Egbert Eich).
  167. Set new modelines for Trident LCD modes (Egbert Eich).
@@ -2069,13 +2936,13 @@ XFree86 4.0.99.1 (19 February 2001)
  160. Attempt to fix various other issues on rendition - driver remains
       to be broken though (Egbert Eich)!
  159. Fixed false linear size for NeoMagic 2380 (Egbert Eich).
- 158. Modified calulation of aperture size in NeoMagic driver to use the 
+ 158. Modified calulation of aperture size in NeoMagic driver to use the
       available video memory instead of the map size (Egbert Eich).
- 157. Added a delay to prevent rare cases of lockups when starting 
+ 157. Added a delay to prevent rare cases of lockups when starting
       X on NeoMagic 2160 (Miles Lane).
  156. Added DGA to Cirrus driver (Egbert Eich).
  155. Missing symbols added to Cirrus driver (Egbert Eich).
- 154. Fixed acceleration on Alpine (Cirrus) driver. PIO and MMIO versions of 
+ 154. Fixed acceleration on Alpine (Cirrus) driver. PIO and MMIO versions of
       the accelerator driver now support the same functionality (Egbert Eich).
  153. Removed unneededed call to xfree() in ddc code (Egbert Eich).
  152. -
@@ -2179,7 +3046,7 @@ XFree86 4.0.99.1 (19 February 2001)
       (#4413, Frido Garritsen).
  113. Change the Thai charset and locale description to a form agreed to
       by some Thai developers (#4412, Chanop Silpa-Anan).
- 112. [SECURITY] Fix temp files vulnerabilites in xman on systems with 
+ 112. [SECURITY] Fix temp files vulnerabilites in xman on systems with
       mkstemp(). (Matthieu Herrb).
  111. Major improvement to the Xmaster UI on Mac OS X. (#4447, XonX team).
  110. 8 bit DAC support for the NVIDIA Riva-128 (Mark Vojkovich).
@@ -2205,7 +3072,7 @@ XFree86 4.0.99.1 (19 February 2001)
 	- Fix pm2v/pm3 text restoration problems.
 	- Re-arranged structure to accomodate multi-chips per screen.
 	- Removed dualmx files and incorporated changes into standalone versions
-	- Allow -configure to only configure VGA based Glint chips, works 
+	- Allow -configure to only configure VGA based Glint chips, works
 	  around multichip boards (for now).
       (Alan Hourihane).
  100. Add XaaNoWriteBitmap and XaaNoWritePixmap options to XAA (Alan Hourihane).
@@ -2221,7 +3088,7 @@ XFree86 4.0.99.1 (19 February 2001)
   91. Rework the memory detection code for Permedia3, now correctly detects
       boards which aren't 32MB (Alan Hourihane).
   90. Write ScanlineCPUToScreen, ScanlineImageWrite functions for Permedia3
-      which write directly to the FIFO, and remove obsolete functions 
+      which write directly to the FIFO, and remove obsolete functions
       (Alan Hourihane).
   89. Fix ordering of writes in pm2v/pm3 ramdac functions in the glint driver,
       thus fixing the R/B inversion problems (Jay Estabrook).
@@ -2231,8 +3098,8 @@ XFree86 4.0.99.1 (19 February 2001)
       from that single set of values (David Dawes).
   86. [SECURITY] Fix temp vulnerabilities in Xaw/MultiSrc.c using the technique
       in patch #4279 (Branden Robinson). Fix temp file vulnerability in
-      gccmakedep based on report from Alan Cox. Fix temp file vulnerability 
-      in Imake.rules, InstallManPageAliases (Matthieu Herrb). 
+      gccmakedep based on report from Alan Cox. Fix temp file vulnerability
+      in Imake.rules, InstallManPageAliases (Matthieu Herrb).
   85. Support vertical sub-pixel glyph rasterization in Xft
       (Keith Packard)
   84. Allow xf86ClaimPciSlot to be called with a NULL GDevPtr, as it was
@@ -2296,11 +3163,11 @@ XFree86 4.0.99.1 (19 February 2001)
   60. Change identification of Trident 8400(CyberBlade/i7) so that it is not
       a Cyber chipset (integrated Desktop version) (Alan Hourihane).
   59. Use the wsmouse protocol in XFree86 -configure if wsmouse is available
-      (Matthieu Herrb, lha at stacken.kth.se). 
+      (Matthieu Herrb, lha at stacken.kth.se).
   58. Sync Xdarwin with XonX version (#4428 Torrey T. Lyons):
       - add a working WarpCursor
       - add 15 bit pixel depth to the Quartz mode.
-  57. New version of Xmaster, a Mac OS X application that controls the 
+  57. New version of Xmaster, a Mac OS X application that controls the
       X server (#4427, Torrey T. Lyons, Andreas Monitzer).
   56. Add external CRT support for the Rage 128 Mobility (Kevin Martin
       and ATI).
@@ -2334,13 +3201,13 @@ XFree86 4.0.99.1 (19 February 2001)
   50. Add compressed man page functionality to the rules in Imake.rules,
       so it should be usable on most platforms (David Dawes).
   49. Make acceleration work on the Trident Cyber9388 (Alan Hourihane).
-  48. - Various small changes to accomodate Mac OS X support and fix a 
-        problem people were having with uninitialized globals in X 
+  48. - Various small changes to accomodate Mac OS X support and fix a
+        problem people were having with uninitialized globals in X
         libraries,
       - Allow XFree86 to run on Mac OS X as a full screen client of
         CoreGraphics,
-      - Add a Mac OS X application that controls the X server and feeds it 
-        events when running on Mac OS X. Currently must be built by 
+      - Add a Mac OS X application that controls the X server and feeds it
+        events when running on Mac OS X. Currently must be built by
         ProjectBuilder (#4409, #4410, #4411, Torrey T. Lyons).
   47. Fix Mach64 Mono 8x8 Pattern acceleration (Marc La France).
   46. Experiment with setting the server's "vendor release" value from
@@ -2398,7 +3265,7 @@ XFree86 4.0.99.1 (19 February 2001)
   23. Switch savage driver to fb (+Render), correct maxHValue (Keith Packard).
   22. Add font property caching in Xft (Keith Packard).
   21. Xterm patch #150 (Thomas Dickey).
-  20. Fix 24/8 Overlay support on Permedia2v and Permedia3 chipsets 
+  20. Fix 24/8 Overlay support on Permedia2v and Permedia3 chipsets
       (Alan Hourihane).
   19. Add CyberStretch option to the trident driver for Cyber chipsets that
       allows Graphics modes to stretch to the full display (Alan Hourihane).
@@ -2415,7 +3282,7 @@ XFree86 4.0.99.1 (19 February 2001)
   12. Enable ImageWrites on Rage128 and Radeon (Alan Hourihane).
   11. Add DRIMoveBuffersHelper function to prevent code duplication in
       the drivers (Mark Vojkovich).
-  10. Bug fixes for endianness problems in Permedia3 driver 
+  10. Bug fixes for endianness problems in Permedia3 driver
       (#4404, Sven Luther).
    9. Add Appian Jeronimo 4x8Mb (PM2v) support to the glint driver
       (Alan Hourihane).
@@ -2499,7 +3366,7 @@ XFree86 4.0.1Zb (14 December 2000)
       is selected during boot up (#4377, Frido Garritsen).
 1181. Install and RELNOTES updates for Darwin (#4375, 4376, Torrey T. Lyons).
 1180. s3virge patch to get Xft/Xrender working (#4374, Kevin Brosius).
-1179. Improve aperture driver related error messages on OpenBSD 
+1179. Improve aperture driver related error messages on OpenBSD
       (Matthieu Herrb).
 1178. Workaround for IA-64 loader bug (Marc La France).
 1177. Fix recognition of valid depth/fbbpp combinations in ATI driver
@@ -2600,7 +3467,7 @@ XFree86 4.0.1Z (8 December 2000)
 1133. Change xfs to drop privs after daemonising so that the pid file can
       be written (#4346, Frederic Lepied).
 1132. Miscellaneous fixups to the trident driver (Alan Hourihane).
-1131. Add Xv support to the trident driver. Works for Blade and Image series 
+1131. Add Xv support to the trident driver. Works for Blade and Image series
       chips, but zooming currently doesn't work on Image series.
       (Alan Hourihane).
 1130. Don't perform a software reset on the Graphics Engine for Trident
@@ -2634,7 +3501,7 @@ XFree86 4.0.1Z (8 December 2000)
 1114. Changed name of server binary to call by xf86cfg back to "XFree86
       (Egbert Eich).
 1113. Modified handling of memory alloctaion in TDFX driver (Egbert Eich).
-1112. Attempt to fix the 'UseModes' directive in the Monitor section 
+1112. Attempt to fix the 'UseModes' directive in the Monitor section
       (Egbert Eich).
 1111. Added debugging output for BIOS base address search (Egbert Eich).
 1110. Changed neomagic driver to treat disable stretching for each mode
@@ -2750,7 +3617,7 @@ XFree86 4.0.1h (4 December 2000)
       a zero keycode keypress event is received (#4322, HIBINO Kei).
 1072. NetBSD doesn't have perl in its default install (Matthieu Herrb).
 1071. Add Xft support to xditview with #ifdefs (Keith Packard)
-1070. Add a MIT-MAGIC-COOKIE-1 generator to startx for NetBSD 1.5 and OpenBSD 
+1070. Add a MIT-MAGIC-COOKIE-1 generator to startx for NetBSD 1.5 and OpenBSD
       and FreeBSD and make mkcookie support more generic (Matthieu Herrb).
 1069. Update OpenBSD and NetBSD docs (Matthieu Herrb).
 1068. Clean up r128_video.c again (Marc La France).
@@ -2933,7 +3800,7 @@ XFree86 4.0.1g (29 November 2000)
       when the -authfile command line flag isn't given (#4250,
       Branden Robinson).
  979. Add Debian-specific settings to linux.cf (#4249, Branden Robinson).
- 978. Rename Trident Cyber9540 to CyberBlade/e4 and make appropriate 
+ 978. Rename Trident Cyber9540 to CyberBlade/e4 and make appropriate
       changes in driver (Alan Hourihane).
  977. Fix Trident Cyber series to only detect SDRAM (Alan Hourihane).
  976. Make xf86SoundKbdBell() available to modules (for citron driver)
@@ -2944,7 +3811,7 @@ XFree86 4.0.1g (29 November 2000)
  973. Fix int10 debugging and reading in all segments between 0x0C0000 and
       0x0F0000 (Marc La France).
  972. Fix typo in imake.c (Marc La France).
- 971. Turn off SGRAM optimization for Trident Blade chips, causes some 
+ 971. Turn off SGRAM optimization for Trident Blade chips, causes some
       problems. (Alan Hourihane).
  970. Ignore various ".stab.*" sections for Solaris (Marc La France).
  969. Fix ENXIO errors on Linux BIOS retrievals by removing restriction on
@@ -3087,16 +3954,16 @@ XFree86 4.0.1e (6 November 2000)
  898. xf86cfg has a new option for a server path (Egbert Eich).
  897. xf86cfg can now handle more than one command line argument (Egbert Eich).
  895. Added a delay to dac code in neomagic driver (Egbert Eich).
- 894. Changed shadowfb to use delayed updates in neomagic 
+ 894. Changed shadowfb to use delayed updates in neomagic
        driver (Egbert Eich).
  893. Rewrote ddc code in nv driver (Egbert Eich).
  892. Rewrote ddc code in neomagic driver (Egbert Eich).
- 891. Fixed problems with enter/leave/closeScreen in nv 
+ 891. Fixed problems with enter/leave/closeScreen in nv
        driver (Egbert Eich).
  890. Fixed a bug in the fixed modelines in trident driver (Egbert Eich).
- 889. Added reinitialization of blitter on enterVT in trident 
+ 889. Added reinitialization of blitter on enterVT in trident
        driver (Egbert Eich).
- 888. Fixed a typo which caused wrong register to be set in trident 
+ 888. Fixed a typo which caused wrong register to be set in trident
        driver (Egbert Eich).
  887. Added loader symbol handling to tseng driver (Egbert Eich).
  886. Changed tseng driver to use fb instead of cfb (Egbert Eich).
@@ -3106,7 +3973,7 @@ XFree86 4.0.1e (6 November 2000)
  882. Added render extension support to nv driver (Egbert Eich).
  881. Modified helper_mem.c to map everything between video bios and
        system bios on PC-like platforms (Egbert Eich).
- 880. Modified Linux mapVidMem() to map memory on page boundaries 
+ 880. Modified Linux mapVidMem() to map memory on page boundaries
        (Egbert Eich).
  879. Changed BIOS_SIZE (Sys BIOS) from 0x10000 to 0xffff to make
        int10 work un DGUX (Takis Psarogiannakopoulos).
@@ -3379,7 +4246,7 @@ XFree86 4.0.1d (27 October 2000)
  727. Added missing symbols to mga driver (Stefan Dirsch).
  726. Fixed a ia64 loader problem that caused SIGV when PLT was present
       (Andreas Schwab).
- 725. Fixed ia64 build rules (Andreas Schwab).     
+ 725. Fixed ia64 build rules (Andreas Schwab).
  724. Fix DGA library to only swap events for DGA 2.0 X servers
  723. Fix locale parsing code in Xlib and Xt (Matthieu Herrb)
  722. Fix X Test Suite to work on 800x600 screens (Keith Packard)
@@ -3404,7 +4271,7 @@ XFree86 4.0.1d (27 October 2000)
       - Set correct virtual desktop size limits for 2160 and older chips.
       - Preliminary man page.
       - Enable burst modes by default.
-      - Accelerate ImageWrite support for 2097/2160.  
+      - Accelerate ImageWrite support for 2097/2160.
  713. Fix some depth 32 problems in XAA (Mark Vojkovich).
  712. Add Silken Mouse to Rage 128 driver (Alan Hourihane).
  711. Resync DRI code/drivers with the DRI CVS (VA Linux).
@@ -3423,7 +4290,7 @@ XFree86 4.0.1d (27 October 2000)
  609. Fixed Macintosh keyboard layouts (Olaf Hering).
  608. Fixed build when BuildServer defined NO (Egbert Eich).
  607. Fixes for C&T 69030 (David Bateman).
- 606. Fix for locale setting in Xlib and Xt using getlocale() 
+ 606. Fix for locale setting in Xlib and Xt using getlocale()
       from glibc5 (Egbert Eich).
  605. Added handling of i5/686 and k6 compiler defines to Imake.cf
       (Philipp Thomas).
@@ -3433,25 +4300,25 @@ XFree86 4.0.1d (27 October 2000)
  601. Rudimentary S390 support (Ruediger Oertel, Bernhard Kaindl).
  600. Enabled support for compressed xpm-files (Stefan Dirsch).
  599. Added support for Czech querty keyboard (Jan Holesovsky).
-      Some fixes for ia64 (). 
+      Some fixes for ia64 ().
  598. Added CPU to Screen Color expansion to Neomagic driver (Egbert Eich).
  597. Added support for hotkey display output switch for Neomagic
       driver (Egbert Eich).
  596. Add "xvinfo" client for querying Xv adaptors (Mark Vojkovich).
  595. Fix DGA support in the i810 driver (Mark Vojkovich).
- 594. Enlarge the i810 pixmap cache and have the YUV overlay use that memory 
+ 594. Enlarge the i810 pixmap cache and have the YUV overlay use that memory
       rather than allocate dedicated memory for overlay data (Mark Vojkovich).
  593. Add/fix support for the Rage 128 Mobility chips (M3/M4) (Kevin Martin).
- 592. Fix RegisterResources for multiple heads in glint driver 
+ 592. Fix RegisterResources for multiple heads in glint driver
       (#4143, Berend Ozceri).
  591. Update Permedia3's hw cursor to match the Permedia2v's they are
       the same (Alan Hourihane).
  590. Fix glint driver to use colorKey rather than fixed value (Alan Hourihane).
  589. Add ScreenToScreenCopies for Permedia3 (Alan Hourihane).
  588. Add SilkenMouse support to the i810 driver (Mark Vojkovich).
- 587. Disable DRI acceleration in depth 15 on the i810 because it doesn't 
+ 587. Disable DRI acceleration in depth 15 on the i810 because it doesn't
       work (Mark Vojkovich).
- 586. Fix some ordering problems in the I810ScreenInit that broke the 
+ 586. Fix some ordering problems in the I810ScreenInit that broke the
       software cursor and backing store (Mark Vojkovich).
  585. Convert the i810 driver from cfb to fb (Mark Vojkovich).
  584. Fix some depth/bpp confusion in the i810 driver.  Depth 15 works now
@@ -3463,7 +4330,7 @@ XFree86 4.0.1d (27 October 2000)
  579. Set $(SHELL) to '/bin/sh -e' on Linux to allow builds/installs stop
       immediately on errors as on other platforms (Brandon Robinson).
  578. Update i810 driver for -configure to work (Alan Hourihane).
- 577. Have Xv silently ignore client requests with zero sized primitives 
+ 577. Have Xv silently ignore client requests with zero sized primitives
       (Mark Vojkovich).
  576. Disable gamma correction and DirectColor visuals on the i810 because
       they don't work (Mark Vojkovich).
@@ -3477,7 +4344,7 @@ XFree86 4.0.1d (27 October 2000)
  570. IA-64 changes resulting from a source cross-check with Alpha support
       for 64-bit dependencies (Marc La France).
  569. Fix in ATI drivber for DPMS support on panels (Marc La France).
- 568. I810 bugs fixes and enhancements relating to Xv (#4121, 4117, 4123, 
+ 568. I810 bugs fixes and enhancements relating to Xv (#4121, 4117, 4123,
       4128, Jonathan Bian).
 
 XFree86 4.0.1c (28 August 2000)
@@ -3538,7 +4405,7 @@ XFree86 4.0.1c (28 August 2000)
  530. Use $(CC) instead of $(LD) when building modules (Bill Nottingham).
  529. When building with MakeDllModules, generate both dynamic and static
       libraries (Bill Nottingham, Marc La France).
- 528. Fix detection problem with ramdac for Glint Permedia1's 
+ 528. Fix detection problem with ramdac for Glint Permedia1's
       (Alan Hourihane).
  527. Fix minor symbol resoltion problem in dlopen() loader (Marc La France).
  526. Alpha changes that fell out of RadHat's IA-64 changes (Marc La France).
@@ -3623,7 +4490,7 @@ XFree86 4.0.1b (11 August 2000)
       - Implement a compilation option that produces an MMIO-only version of
         the driver.  Intended for non-Intel architectures.  See the driver's
         Imakefile for details.
- 491. fixed handling of backwards compatibility in xvmode (Egbert Eich). 
+ 491. fixed handling of backwards compatibility in xvmode (Egbert Eich).
  490. fixed changing mouse protocol with xf86misc extensions (Egbert Eich).
  489. added code to sanitize uninitialized PCI config space
       base addresses (Egbert Eich).
@@ -3646,7 +4513,7 @@ XFree86 4.0.1b (11 August 2000)
  480. fixed a fg/bg color problem in SiS driver (Egbert Eich).
  479. attempt to address some problems with Cyber LCD chipsets in
       Trident driver (Egbert Eich).
- 478. tseng driver: Implemented correct MMIO handling (Egbert Eich). 
+ 478. tseng driver: Implemented correct MMIO handling (Egbert Eich).
  477. tseng driver: made accel driver multi screen capable (Egbert Eich).
  476. fixed vgaHW driver to use forground color for readability
       test of pallette registers. This prevents annoying flashing
@@ -3725,8 +4592,8 @@ XFree86 4.0.1a (2 August 2000)
  433. For IA64, compile everything, except PEX, that is also compiled for IA32
       (Marc La France).
  432. Fix Cyrix driver for -configure (Alan Hourihane).
- 431. Fix Glint PM3 memory detect when only 1MB of videoram (Alan Hourihane). 
- 430. Fix DAC colour problem and blank out issue in glint driver 
+ 431. Fix Glint PM3 memory detect when only 1MB of videoram (Alan Hourihane).
+ 430. Fix DAC colour problem and blank out issue in glint driver
       (Alan Hourihane).
  429. Add missing clock values to the trident driver (Alan Hourihane).
  428. Fix Glint driver's SaveScreen function (#4057, Michel Danzer).
@@ -3754,7 +4621,7 @@ XFree86 4.0.1 (1 July 2000)
  415. Doc updates (Georgina Economou).
  414. Fix some palette and fbdev problems, and add a missing break to the
       video memory type detection code for the r128 (#4043, Benjamin
-      Herrenschmidt). 
+      Herrenschmidt).
 
 XFree86 4.0Z (30 June 2000)
  413. README updates (Georgina Economou).
@@ -3792,9 +4659,9 @@ XFree86 4.0Z (30 June 2000)
  398. Disable SilkenMouse for the s3virge GX2 to avoid some lockup problems
       (#4039, Kevin Brosius).
  397. Some mga DRI updates to improve stability (Jeff Hartmann).
- 396. Fix some DRI offscreen memory calculations in the Matrox driver 
+ 396. Fix some DRI offscreen memory calculations in the Matrox driver
       (Mark Vojkovich).
- 395. IA64 workarounds - should compile and run right out of the box now 
+ 395. IA64 workarounds - should compile and run right out of the box now
       (Mark Vojkovich).
  394. LBX, X-TrueType and Xnest warning fixes (Marc La France).
  393. Remove unused xf86MapDisplay() and xf86UnMapDisplay() os-support entry
@@ -3846,7 +4713,7 @@ XFree86 4.0f (23 June 2000)
       MX (but they're commented out for the MX because it hasn't been tested
       yet) (#4027, Kevin Brosius).
  373. Fixes for lib/GL Imakefiles (Marc La France).
- 372. Update DRI drivers sunffb,mga,i810,glint,r128,tdfx to check for 
+ 372. Update DRI drivers sunffb,mga,i810,glint,r128,tdfx to check for
       DRIQueryVersion, overcomes an older libdri issue (Alan Hourihane).
  371. Change tdfx driver to use fb instead of cfb (Alan Hourihane).
  370. Make using libpthread optional for OpenBSD 2.7.
@@ -4122,7 +4989,7 @@ XFree86 4.0c (13 June 2000)
  233. Separate offscreen memory manager API from implementation to facilitate
       driver replacement of the default manager (Mark Vojkovich).
  232. Add Option "TexturedVideo" to have the Matrox driver optionally use
-      YUV textures instead of the video overlay for XvImage support 
+      YUV textures instead of the video overlay for XvImage support
       (Mark Vojkovich).
  232. Add Xv functions for allocating/freeing XvVideoAdaptorRecs to shield
       drivers from structure size changes (Mark Vojkovich).
@@ -4143,7 +5010,7 @@ XFree86 4.0c (13 June 2000)
       directly to avoid problems with certain notebook bioses (Egbert Eich).
  223. Fixed mouse driver to flush pending button press events on
       protocol change (Egbert Eich).
- 222. Fixed DDC support and sync flags handling in trident driver 
+ 222. Fixed DDC support and sync flags handling in trident driver
       (Egbert Eich).
  221. Added PAM support to xdm, ANSIfied prototypes (Werner Fink).
  220. Added ServerFlag to force the use of OS PCI config space
@@ -4159,7 +5026,7 @@ XFree86 4.0c (13 June 2000)
  215. Fix a typo in the glint driver (#3943, Michael Schimek).
  214. Fix multithread bug in Xlib big font support (Mark Vojkovich).
  213. Fix a window class initialization problem in Xinerama (Mark Vojkovich).
- 212. Fix some multithreading related problems in the Xv client library 
+ 212. Fix some multithreading related problems in the Xv client library
       (Mark Vojkovich).
 
 XFree86 4.0b (23 May 2000)
@@ -4242,7 +5109,7 @@ XFree86 4.0b (23 May 2000)
       (#3895, Andrew Aitchison).
  164. Fix a window unmapping bug in the mioverlay code (Mark Vojkovich).
  163. Attempt to improve memory detection reliability in the Matrox driver
-      (Mark Vojkovich). 
+      (Mark Vojkovich).
  162. Fix possible SEGV in generic int10 module (Marc La France).
  161. Fix *BSD aperture driver to allow for int10 (Bernd Ernesti,
       Marc La France).
@@ -4290,7 +5157,7 @@ XFree86 4.0b (23 May 2000)
  135. Fixed CyberShadow option in Trident driver (Egbert Eich).
  134. Fix bug where the cursor is not put back after a failed DGA mode
       initialization attempt (Mark Vojkovich).
- 133. Add a missing symbol "AllocateColormapPrivateIndex" (Mark Vojkovich). 
+ 133. Add a missing symbol "AllocateColormapPrivateIndex" (Mark Vojkovich).
  132. Remove Intel 440BX-specific resources from os-support layer
       (Marc La France).
  131. Change ATI driver to mark VGA resources as unused in operating state when
@@ -4327,7 +5194,7 @@ XFree86 4.0b (23 May 2000)
       Changed int10 code to always map/allocate entire 1Meg. (Egbert Eich)
  109. Let int10 code try harder to locate a video bios to work
       around some system bios bugs. (Holger Veit, Egbert Eich)
- 108. Modified fbdevProbe() to return the name string representing 
+ 108. Modified fbdevProbe() to return the name string representing
       the chipset. (Egbert Eich)
  107. Minor fixes to i810 driver (Egbert Eich)
  106. Fixed format of float numbers in C&T driver. (Jens Taprogge)
@@ -4385,7 +5252,7 @@ XFree86 4.0a (6 April 2000)
   78. Fix an infinite loop problem that can show up in makedepend (#3838, A.10,
       Jeremy Buhler).
   77. Fix Overlay support in the TI ramdac module (Alan Hourihane).
-  76. Fix mixup between TVP3026/3030 ramdacs in the ramdac module 
+  76. Fix mixup between TVP3026/3030 ramdacs in the ramdac module
       (Alan Hourihane).
   75. Increase usage of ReadPixmap within XAA (Mark Vojkovich).
   74. Allow the v4l driver to use offscreen YUV surfaces exported by the
@@ -4494,7 +5361,7 @@ XFree86 4.0a (6 April 2000)
   24. Fix some man page formatting problems that show up on some platforms
       (David Dawes).
   23. Fix an 8+24 bug that occured when shared memory pixmaps were used as
-      tiles (Mark Vojkovich). 
+      tiles (Mark Vojkovich).
   22. Support for the Trident CyberBlade/DSTN/i1 (Alan Hourihane).
   21. Fix Xinerama problems that occured when screen zero was not at (0,0)
       (Mark Vojkovich).
@@ -5058,13 +5925,13 @@ XFree86 3.9.17d (9 February 2000)
       keycodes file (David Dawes).
 3683. Allow the passing of all extended keycodes, which makes it possible
       to access keys on "Internet" keyboards (David Dawes).
-3682. Added support for saving/restoring access state during 
+3682. Added support for saving/restoring access state during
       asynchronous events. Added code to make xf86EnableAccess()
       atomic for asynchronous events. (Egbert Eich)
 3681. Modified xf86EnterServerState() to avoid any unnecessary
       disabling of resources during state transition. (Egbert Eich)
 3680. Added function callback registration. Drivers can register
-      callback functions to be notified of the start/end of a 
+      callback functions to be notified of the start/end of a
       resource transition. (Egbert Eich)
 3679. Added support for OS specific Pci address windows. (Egbert Eich)
 3678. Added more debug traps to xalloc.c. Added support to peek/poke
@@ -5079,7 +5946,7 @@ XFree86 3.9.17d (9 February 2000)
 3674. Modified mapping of V_RAM in int10/generic.c. (Egbert Eich)
 3673. Updated INT10.HOWTO. (Egbert Eich)
 3672. Added support for VBE DDC read out to s3v driver. (Egbert Eich)
-3671. Added xf86SetDDCProperties() to glint, chips, neomagic, s3v 
+3671. Added xf86SetDDCProperties() to glint, chips, neomagic, s3v
       and r128 driver. (Egbert Eich)
 3670. Fixed problems with virtual screen size != real screen size
       when using shadow fb in mga driver. (Egbert Eich)
@@ -5108,7 +5975,7 @@ XFree86 3.9.17d (9 February 2000)
       (Egbert Eich)
 3655. Fixed xf86HWCurs.c to handle 32-bit cursors on 64-bit machines
       correctly. (Egbert Eich)
-3654. Added rotate support to neomagic, s3v, chips and cirrus 
+3654. Added rotate support to neomagic, s3v, chips and cirrus
       driver (Egbert Eich)
 3653. Added shadow fb support to s3v and cirrus driver (Egbert Eich)
 3652. Fixed sig11 problem after server reset caused by the new
@@ -5319,14 +6186,14 @@ XFree86 3.9.17a (21 January 2000)
 3534. Fix for various compilation glitches (Marc La France).
 3533. Fix some Segmentation faults with NULL pointers in xf86Config.c
       (Alan Hourihane).
-3532. Update some drivers to respect the PROBE_DETECT flag and update 
+3532. Update some drivers to respect the PROBE_DETECT flag and update
       xf86DoProbe to print out the supported chipset list (Alan Hourihane).
 3531. Update Trident driver to fix Clock source for 9440 chips and allow
       linear framebuffer mapping for nommio (Alan Hourihane).
 3530. Fix fb for module compiling and ifdef fbcmap for now (Alan Hourihane).
 3529. Add Cyber9397 and Cyber9397DVD PCI ID detection to trident driver
       (Alan Hourihane).
-3528. Fix Multiple MX RegisterResources with RAC in glint 
+3528. Fix Multiple MX RegisterResources with RAC in glint
       driver (Alan Hourihane).
 3527. Update loader for Xinerama changes (Alan Hourihane).
 3526. Massive Xinerama rewrite (Mark Vojkovich).
@@ -5334,7 +6201,7 @@ XFree86 3.9.17a (21 January 2000)
       - Remove broken Xinerama code from the multibuf extension.
       - Add support for shared memory pixmaps.
       - Lessen Xinerama's impact on DIX.
-3525. Point and arc acceleration improvements for the NVIDIA driver 
+3525. Point and arc acceleration improvements for the NVIDIA driver
       (Mark Vojkovich).
 3524. MGA acceleration modifications to prevent pci retries during
       color expansions (Mark Vojkovich).
@@ -5433,7 +6300,7 @@ XFree86 3.9.16f (15 December 1999)
       Xprint (#3432, Thomas Dickey).
 3363. Add proper clock checking for VidMode extension, add SDK fixes for
       missing files, add SilkenMouse for C&T driver (#3424, David Bateman).
-3362. Sync v4l and glint drivers with the new Xv changes (Mark Vojkovich). 
+3362. Sync v4l and glint drivers with the new Xv changes (Mark Vojkovich).
 3361. Add XvImage support to the MGA driver - G200/400 only (Mark Vojkovich).
 3360. Xv changes/additions (Mark Vojkovich)
       - XvImage support in the Xv DDX, DIX, client libs and header files.
@@ -5450,7 +6317,7 @@ XFree86 3.9.16f (15 December 1999)
 XFree86 3.9.16e (5 December 1999)
 3355. Fix a problem with the bitmap font module (#3421, Matthieu Herrb).
 3354. Misc. bug/typo fixes. (Egbert Eich)
-3353. Fixed scanpci to generate better output on Alphas (Harald Koenig, 
+3353. Fixed scanpci to generate better output on Alphas (Harald Koenig,
       Egbert Eich)
 3352. Added initial VESA VBE support. This includes initialization
       and DDC. (Egbert Eich)
@@ -5462,7 +6329,7 @@ XFree86 3.9.16e (5 December 1999)
 3348. Added a function to check if any resource needs to share memory.
       Required for DGA. (Egbert Eich)
 3347. Added copyright messages to int10 code. Fixed int10 code to
-      run on Alphas. 
+      run on Alphas.
 3346. Changed some byte and word access to MMIO registers in drivers
       to use MMIO_READ/WRITE8/16(). Made attempt to make some drivers
       64 bit (and Alpha!) clean: s3virge, chips, gling, neomagic.
@@ -5471,8 +6338,8 @@ XFree86 3.9.16e (5 December 1999)
 3344. Cleanups in the C&T driver. (Egbert Eich)
 3343. Clearified meaning of VIDMEM_MMIO and VIDMEM_MMIO_32BIT. (Egbert Eich)
 3342. Added support for host-PCI bridges. (Egbert Eich)
-3341. Changed policy for removing resource overlaps. 
-      Removed a bug in findIntersect() (xf86Bus.c). 
+3341. Changed policy for removing resource overlaps.
+      Removed a bug in findIntersect() (xf86Bus.c).
       Added function that enables/disables all resources of a given
       screen. Added a config file option to set overlap removal
       aggressiveness.(Egbert Eich)
@@ -5499,13 +6366,13 @@ XFree86 3.9.16d (19 November 1999)
       output or both. Add support for Graphire models. Change wacom init
       phase to use new Xoff option (#3391, Frederic Lepied).
 3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver
-      to match an already existing option in the Dynapro driver. Add a Focus 
+      to match an already existing option in the Dynapro driver. Add a Focus
       class capability to the elographics driver (#3395, Patrick Lecoanet).
 3325. Update mouse rate handling (#3388, Harald Koenig).
 3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang).
 3323. Add FBDev and ShadowFB support to glint driver. Add new option
       "NoWriteBitmap" (#3383, Michel Daenzer).
-3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up 
+3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up
       Trio3D/Savage3D detection (#3382,3384 Harald Koenig).
 3321. Add new framebuffer code and tiny X DDX architecture (#3379,
       Keith Packard).
@@ -5536,7 +6403,7 @@ XFree86 3.9.16d (19 November 1999)
 3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller).
 3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC
       (#3338, Michael Rohleder).
-3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, 
+3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336,
       Henrik Harmsen)
 3297. Xterm patch #119 (#3335, Thomas Dickey).
 3296. ATI LCD changes to add interlaced mode support and near-final rework of
@@ -5545,7 +6412,7 @@ XFree86 3.9.16d (19 November 1999)
       so they can be displayed by xf86PrintModes() (Marc La France).
 3294. Add sync polarities to VESA modes (Marc La France).
 3293. Fix VESA mode typos and some warnings (Marc La France).
-3292. Add GeForce/Quadro support to the NVIDIA driver (Chas Inman, 
+3292. Add GeForce/Quadro support to the NVIDIA driver (Chas Inman,
       Mark Vojkovich).
 3291. Fix a DGA colormap problem (Mark Vojkovich).
 3290. Disable the Double-Buffer extension in Xinerama mode since it
@@ -5577,7 +6444,7 @@ XFree86 3.9.16d (19 November 1999)
 3276. NVIDIA driver changes (Mark Vojkovich):
       - Improved shadowfb support (screen rotation).
       - Improved acceleration (color expansion, lines).
-      - Fixed some rendering correctness issues. 
+      - Fixed some rendering correctness issues.
       - Full DGA 2.0 support including changing depth on the fly.
 3275. Make usage of hardware clipping in XAA more consistent (Mark Vojkovich).
 3274. Limit MGA driver to using 16 Meg of ram to workaround some hardware
@@ -6042,7 +6909,7 @@ XFree86 3.9.15a (1 August 1999)
 2931. Add SuperProbe for NetBSD 1.4 wscons (#3083, Matthias Drochner).
 2930. Fix button and modifier key state problems in DGA (#3082,
       Mark Vojkovich).
-2929. Avoid a possible segmentation fault in "xsm" which, for example, 
+2929. Avoid a possible segmentation fault in "xsm" which, for example,
       occurs local hostname can't be resolved (#3073, Matthias Scheler).
 2928. ATI driver updates, including:
         - Add preliminary panel support.
@@ -7262,7 +8129,7 @@ XFree86 3.9Pc (2 March 1999)
       Brown).
 
 XFree86 3.9Pb (20 February 1999)
-2265. Allow YaccCmd to be overridden in host.def (#2474-2476, 
+2265. Allow YaccCmd to be overridden in host.def (#2474-2476,
       Christopher Sekiya).
 2264. Implement null overscans in VGA, minor fixups to VGA generic
       default mode, re-add #ifndef's in VGA generic driver erroneously
@@ -7280,7 +8147,7 @@ XFree86 3.9Pa (14 February 1999)
 2257. Correct some typos/grammatical problems with the DESIGN doc (Ivan Bach).
 2256. Fix a crash when PciAccInfo isn't initialized (#2468, Alan Hourihane).
 2255. Add SiS530 detection to the SiS driver. Clock programming,
-      acceleration and hw cursor are not implemented, yet (Dirk Hohndel). 
+      acceleration and hw cursor are not implemented, yet (Dirk Hohndel).
 2254. Fix some bugs related to hardware clipping of spans. XAA
       WideLine speedups when hardware clipping is available (#2467
       Mark Vojkovich).
@@ -7291,10 +8158,10 @@ XFree86 3.9Pa (14 February 1999)
       base needs more work (Dirk Hohndel).
 2251. Remove obsolete xf86[GS]etDefaultColorVisualClass() and fix some
       small typos and comments; make type of BIOS, Memory and I/O
-      bases consistent (#2460,2465 Marc LaFrance). 
+      bases consistent (#2460,2465 Marc LaFrance).
 2250. Add ScanlineCPUToScreen for TX/MX and older Permedia chipsets
-      for when PCI retries are not enabled (#2459,2461,2462,2463 
-      Alan Hourihane). 
+      for when PCI retries are not enabled (#2459,2461,2462,2463
+      Alan Hourihane).
 2249. Add 24/8 overlay support for 3Dlabs chipsets and switch to MMIO
       for vga access (#2459, Alan Hourihane).
 2248. Add 24/8 overlay support to IBM526 and IBM640 ramdacs, fix IBM640 hw
@@ -8158,7 +9025,7 @@ XFree86 3.9Nc (29 August 1998)
       problems that can show up when using more than 4MB.
 1788. Fix an extraneous pixel drawn for some H/V two point lines with
       a Millennium I (Mark Vojkovich).
-1787. Make the BuildLinuxDoc* symbols default to YES when HasSgmlFmt is YES 
+1787. Make the BuildLinuxDoc* symbols default to YES when HasSgmlFmt is YES
       (Marc La France).
 1786. Add a resize function to the offscreen memory manager (#1937,
       Mark Vojkovich).
@@ -8176,7 +9043,7 @@ XFree86 3.9Nc (29 August 1998)
         - add configure test to infer if xterm should be installed setuid
           based on previously installed xterm (reported by Stephen Marley).
         - integrate/extend patch by Jason Bacon to implement quasi-continuous
-          mouse reporting. 
+          mouse reporting.
         - correct control sequences transmitted by function keys F1 to F4
           when sunFunctionKeys resource is true (it was still using the
           VT100 control sequences).
@@ -8403,7 +9270,7 @@ XFree86 3.9Aj (04 July 1998)
       m68k's XF68_FBDev to use backing store low-level functions to
       save/restore the screen during VT switches. Minor fixup to loader
       message. (#1719, Marc La France).
-1688. Fixes for 24bpp and 32bpp on Matrox Millenium II. This fixes the 
+1688. Fixes for 24bpp and 32bpp on Matrox Millenium II. This fixes the
       horizontal stripe for modes using > 4MB (#1715,1716, Doug Merritt).
 1687. Fix build problems on LynxOS and enable keyboard LEDs on LynxOS 2.5.1
       (1712, Thomas Mueller).
@@ -8425,7 +9292,7 @@ XFree86 3.9Ai (05 June 1998)
 1679. Fix hw cursor on CT65555 and fix loader problem (#1688,1689 Nozomi Ytow).
 1678. Fix freeing of names when removing modes (#1685, Matthieu Herrb).
 1677. Enable ImageWrite in 24 bpp for C&T HiQV (#1684,1687 Nozomi Ytow).
-1676. Fix unknown symbol type 1e message in a.out loader (#1683, 
+1676. Fix unknown symbol type 1e message in a.out loader (#1683,
       Matthieu Herrb).
 1675. xterm patches 75 and 76. Fix for print-window function, minor cleanups,
       lots of fixes from other people (see xterm.log.html) (#1681,1682,
@@ -8436,7 +9303,7 @@ XFree86 3.9Ai (05 June 1998)
 1673. Change PIC code to print names of ALL devices capable of displaying
       video. Return pointer to the last card instead of the first (#1662,
       Dejan Ilic).
-1672. Add skeleton driver for Tritech Pyramid 3D (#1661, Dejan Ilic, 
+1672. Add skeleton driver for Tritech Pyramid 3D (#1661, Dejan Ilic,
       Mark Vojkovich).
 1671. Check additional pci bus in scanpci (Robin Cutshaw).
 
@@ -8519,7 +9386,7 @@ XFree86 3.9Af (28 March 1998)
       some of the warnings produced by gcc by default. Resync ATI driver with
       the version found in XFree86 3.3.2. Fix loader bug in dealing with XAA.
       (#1614, Marc La France).
-1630. Don't abort a static server if the Driver statement in the Device 
+1630. Don't abort a static server if the Driver statement in the Device
       section is missing (#1613, Kazutaka Yokota).
 1629. Fix typo in #1606 and improve printing of mouse related messages
       (#1613, Kazutaka Yokota).
@@ -8554,12 +9421,12 @@ XFree86 3.9Ae (22 March 1998)
       documentation nits. correct the problem in xterm with utmp by removing
       the reset of setuid/setgid before the main event loop (#1525,1571,1599,
       Thomas Dickey).
-1616. Change s3/svga from using 8x8 pattern fills to 8x8 color expand fills. 
+1616. Change s3/svga from using 8x8 pattern fills to 8x8 color expand fills.
       Add support for S3's type planar 8x8 pattern fills to XAA. Add support
       for S3's planar 8x8 fills to the XAA stippled trapezoid stuff
       (#1594,1595,1596,1597, Mark Vojkovich).
 1615. Ensure the correct message for lines at startup (#1591, Alan Hourihane).
-1614. Fix XAA to allow vertical lines using TwoPointLine (#1590, 
+1614. Fix XAA to allow vertical lines using TwoPointLine (#1590,
       Alan Hourihane).
 1613. Change the xf86orect.c code to always use a hardware filled rect rather
       than a software one when drawing vertical lines (#1589, Mark Vojkovich).
@@ -8570,10 +9437,10 @@ XFree86 3.9Ae (22 March 1998)
       twopoint line problems with XAA dashed lines. Make sure we alway check
       for one rect situations when using XAA polygon code (#1575,1576,1577,
       1578,1579,1580,1581, Mark Vojkovich).
-1611. Add new MGA acceleration, including image writes and 8x8 pattern trap 
-      fills. Go back to two point lines. Add solid filled span replacement. 
-      Make PCI retries off for mga by default (need Option "pci_retry" to turn 
-      them on).  Make hardware cursor work better in doublescan modes.  And 
+1611. Add new MGA acceleration, including image writes and 8x8 pattern trap
+      fills. Go back to two point lines. Add solid filled span replacement.
+      Make PCI retries off for mga by default (need Option "pci_retry" to turn
+      them on).  Make hardware cursor work better in doublescan modes.  And
       turn hw cursor on by default (#1582,1583,1592 Mark Vojkovich).
 1610. Removes assumption that we have a Trapezoid function (#1573,
       Alan Hourihane).
@@ -8602,10 +9469,10 @@ XFree86 3.9Ae (22 March 1998)
       Remove dependence on TimingTab. Include VGA DAC registers in verbose
       output. Skip sparse I/O probes when PCI configuration space indicates a
       device has registered a block I/O base. Virtual X rounding adjustments
-      for packed modes. Documentation updates (#1430, Marc La France). 
+      for packed modes. Documentation updates (#1430, Marc La France).
 1601. Clean up ScrnInfo, make vgaCloseScreen call the framebuffer's
       CloseScreen() function, determine more pricely whether the virtual
-      resolution fits in video memory, minor optimization of cfb's 
+      resolution fits in video memory, minor optimization of cfb's
       ImageGlyphBlt entry (#1428,1429, Marc La France).
 1600. Fix typo in mga.h (#1418, Tim Rowley).
 1599. Fix some baserom/_baserom confusion (#1407, Gary Barton/Concurrent).
@@ -8618,7 +9485,7 @@ XFree86 3.9Ae (22 March 1998)
 1593. Build fixes to loader directory (#1388, Alan Hourihane).
 1592. Some Link Kit fixes (#1384, David Bateman).
 1591. Add zoom initialization and fix blits on T2R (Robin Cutshaw).
-1590. Add support for several new mice, including Kensington ThinkingMouse, 
+1590. Add support for several new mice, including Kensington ThinkingMouse,
       ALPS GlidePoint, Genius NetScroll, Genius NetMouse, Genius NetMouse,
       ASCII MieMouse, Logitech MouseMan+, Logitech FirstMouse+ (#1380,
       Kazutaka Yokota).
@@ -8637,7 +9504,7 @@ XFree86 3.9Ad (25 January 1998)
 1590. Reinstate Xserver/hw/ibm for reference purposes.
 1589. Cirrus and vga256 driver changes to support the PowerPC machines.
       (1357, Gary Barton/Concurrent).
-1588. Organize xf86_ansic.h/xf86_libc.h/xf86_OSlib.h, and de-mangle xf86* 
+1588. Organize xf86_ansic.h/xf86_libc.h/xf86_OSlib.h, and de-mangle xf86*
       libc calls. Move Probe routine to the beginning of the ScrnInfoRec to
       match the vgaVideoChipRec. Make the mach32, mach64, mach8, i128, and
       ibm8514 servers loadable. Use one global byte_reversed array. When
@@ -8664,7 +9531,7 @@ XFree86 3.9Ad (25 January 1998)
       Kevin Martin).
 1579. Fix 16bpp for the Permedia 2 (#1373, Alan Hourihane).
 1578. Fix DPMS for Trident cards (#1372, Alan Hourihane).
-1577. Add Option "no_pci_retry" to option code and the MGA driver (#1370,1371, 
+1577. Add Option "no_pci_retry" to option code and the MGA driver (#1370,1371,
       Mark Vojkovich).
 1576. Add back CyberCont that was removed from Trident driver in 3.9Ac by
       mistake (#1369, Alan Hourihane).
@@ -8672,7 +9539,7 @@ XFree86 3.9Ad (25 January 1998)
       of bad alignment (#1368, Mark Vojkovich).
 1574. xterm updates (#1366,1378 Thomas Dickey) including:
       - change the terminfo entry so that rs1 does a hard reset
-      - modify treatment of hard reset by the xterm program to reset the saved 
+      - modify treatment of hard reset by the xterm program to reset the saved
         lines
       - correct hard reset by also resetting user-defined keys.
       - change the way highlihting is implemented
@@ -8783,7 +9650,7 @@ XFree86 3.9Aa (20 December 1997)
       newer chips. Support for AGP RagePro cards. Block write mode for
       RagePro chips. 1600x1200 mode support for VT and newer chips. Use the
       auxilliary register aperture on chips that support it. Use 16MB memory
-      aperture on PCI Mach64s with integrated controllers. 
+      aperture on PCI Mach64s with integrated controllers.
       (#1288, Kevin Martin).
 1519. New code for the glint server. Preliminary support for the Permedia 2
       hardware cursor. Preliminary support for panning the display with
@@ -8791,7 +9658,7 @@ XFree86 3.9Aa (20 December 1997)
       Cleanup of glint_init.c. Fix DGA when using software cursor. Addition
       of code to not save VGA state if the VGA core is disabled.
       (#1285,1286,1287, Alan Hourihane).
-1518. Fix the "invalid depth" problem with packed 24 (#1284, Andrew Aitchison). 
+1518. Fix the "invalid depth" problem with packed 24 (#1284, Andrew Aitchison).
 1517. Fixes to finish keyboard layout (Johan Myreen).
 
 XFree86 3.9z (14 December 1997)
@@ -8800,7 +9667,7 @@ XFree86 3.9z (14 December 1997)
       to test the first 8MB, only (#1280, Mark Vojkovich).
 1515. Fix XF86Setup to create a (symbolic) link of /usr/X11R6/bin/X when it
       doesn't exist (#1279, Matthieu Herrb).
-1514. Fix solid trap/rect fill bugain the mga server for the Millennium II 
+1514. Fix solid trap/rect fill bugain the mga server for the Millennium II
       that was hurting performance severely (#1277, Mark Vojkovich).
 1513. Reenable BitBlt accelerations for Millennium II (#1271, Mark Montague).
 1512. Fix mmap memory leak in IGS driver. ARM32/NetBSD specific fix for
@@ -8858,7 +9725,7 @@ XFree86 3.9y (6 December 1997)
        mistake from the s3/svga acceleration code (#1237, Mark Vojkovich).
 1478. Switch the MGA driver over to XAA Hardware Cursor. Only support for
       TVP3026 is included (#1236,1239, Mark Vojkovich).
-1477. Add delayed syncing abd faster arcs ub 8bpp to mga driver (#1235, 
+1477. Add delayed syncing abd faster arcs ub 8bpp to mga driver (#1235,
       Mark Vojkovich).
 1476. Fix another SIGSEGV in xterm, where wrong assumptions about the type of
       widget passed to an action handler were made (#1234, Thomas Dickey,
@@ -8867,7 +9734,7 @@ XFree86 3.9y (6 December 1997)
       pixels to the possible width of the cursor (#1232, Bryan Feir).
 1474. Remove vga256/vgainit (#1231, Mark La France).
 1473. Fix a namespace collision in Mach8 server (#1230, Mark La France).
-1472. Fix SIGSEGV when some internal xterm buffers overflowed (#1228, 
+1472. Fix SIGSEGV when some internal xterm buffers overflowed (#1228,
       Thomas Dickey).
 1471. Fix HiQV version of ImageWrite in the C&T driver (#1222,1223,
       David Bateman).
@@ -8878,7 +9745,7 @@ XFree86 3.9y (6 December 1997)
       (#1215, Koen Gadeyne).
 1467. Complete initial support for Permedia 2 and add some acceleration for it
       (Alan Hourihane).
-1466. Some more code for supporting the IBM RGB640 in the glint server 
+1466. Some more code for supporting the IBM RGB640 in the glint server
       (Dirk Hohndel).
 
 XFree86 3.9x (23 November 1997)
@@ -8904,7 +9771,7 @@ XFree86 3.9x (23 November 1997)
       Alan Hourihane).
 1452. Cleanups and preliminary support for the Trident 3DImage975 and
       3DImage985 (#1206, Alan Hourihane).
-1451. Add stipple acceleration to the tseng driver (#1192, Koen Gadeyne, 
+1451. Add stipple acceleration to the tseng driver (#1192, Koen Gadeyne,
       Mark Vojkovich).
 1450. Add better text acceleration to the tseng driver (#1190, Koen Gadeyne).
 1449. Fix HiQV image writes (#1191, David Bateman).
@@ -8992,9 +9859,9 @@ XFree86 3.9w (16 November 1997)
 1395. Fix references to LINE_MAX in Xos_r.h (#1182, Sekhar Makkapati).
 
 XFree86 3.9v (9 November 1997)
-1394. Add unrolled text code for the 9 pixel width fonts (#1147, 
+1394. Add unrolled text code for the 9 pixel width fonts (#1147,
       Mark Vojkovich).
-1393. Fix planemask/transparency problems in tseng driver (#1146, 
+1393. Fix planemask/transparency problems in tseng driver (#1146,
       Harald Nordgard Hansen).
 1392. Add Fire GL 3000 option for glint server (#1139, Bart van den Broek).
 1391. Remove unnecessary ARM32 code (#1138, Katrina Maffey).
@@ -9019,12 +9886,12 @@ XFree86 3.9v (9 November 1997)
 1378. Fix a problem with setting the maximum clock value on s3 cards at depths
       other than 8bpp (#1123, Steve Forsythe).
 1377. Fix dashed lines for matrox driver (#1122, Radek Kapitan).
-1376. Use correct arguments to xf86ImageWrite when uploading cursor image to 
+1376. Use correct arguments to xf86ImageWrite when uploading cursor image to
       videoram. Units of pixels instead of bytes (#1120, Mark Vojkovich).
 1375. Fix s3/svga cursor location computation error (#1119, Mark Vojkovich).
 1374. Improve GC validation code in XAA (#1117,1118,1121, Mark Vojkovich,
       David Bateman).
-1373. Add accelerated color expansion for all color depths and for all 
+1373. Add accelerated color expansion for all color depths and for all
       W32-style chips (#1116, Koen Gadeyne).
 1372. Add Warpnext/Warpprev to twm (#1114, Benjamin Gras).
 1371. One more fix to restore changes to variable types made in change 1347.
@@ -9039,8 +9906,8 @@ XFree86 3.9u (1 November 1997)
 1367. Compile fixes for ARM32/NetBSD (#1099, Katrina Maffey).
 1366. Change mga to use bresenham lines instead of two point (#1098,
       Radek Kapitan).
-1365. Add mga stipple code so that it is 256K pixels barrier sensible and 
-      even faster than current XAA stipple code (#1097, Mark Vojkovich, 
+1365. Add mga stipple code so that it is 256K pixels barrier sensible and
+      even faster than current XAA stipple code (#1097, Mark Vojkovich,
       Radek Kapitan).
 1364. Move C&T hw cursor into XAA. Re-enable ImageWrite on C&T. Rewrite 32bpp
       HiQV code (should be almost usable) (#1096, David Bateman).
@@ -9048,12 +9915,12 @@ XFree86 3.9u (1 November 1997)
       setting (#1095, George Krajcsovits).
 1362. Changes to XAA hw cursor code to better support switching between hw
       and sw cursor (#1094, David Bateman).
-1361. Fix incorrect parenthesis placement caused by hand-applying part of 
+1361. Fix incorrect parenthesis placement caused by hand-applying part of
       change 1347 (#1092, Mark Vojkovich).
 1360. Resync PC98 Imakefiles (#1091, Takaaki Nomura).
 1359. Build fix for PANIX (#1090, Takaaki Nomura).
-1358. Fix a duplicate inclusion of <sys/termio.h> on ISC inside xterm/screen.c 
-      and update the help text for xterm to correspond with the appropriate 
+1358. Fix a duplicate inclusion of <sys/termio.h> on ISC inside xterm/screen.c
+      and update the help text for xterm to correspond with the appropriate
       commandline switches (#1089, Michael Rohleder).
 1357. Fix some incorrect type modifications in change 1347 (#1087,1088
       Alan Hourihane, Michael Rohleder).
@@ -9103,21 +9970,21 @@ XFree86 3.9t (26 October 1997)
       Extension and XF86Setup (#1063,1064, Takaaki Nomura, Joe Moss).
 1328. Add Scanline ImageWrite support to XAA (#1062, Alan Hourihane).
 1327. Missing Millennium II AGP fixes (#1058, Brian Wainscott).
-1326. XAA hw cursor fix. Delay cursor restoration until after the saved screen 
+1326. XAA hw cursor fix. Delay cursor restoration until after the saved screen
       is restored (#1057, Mark Vojkovich).
 1325. Fix server to print the clock scale instead of effective clocks when
       using a clockchip (#1056, Krajcsovits Gyorgy).
 1324. Correct eraser/stylus detection in wacom driver (#1055, Frederic Lepied).
 1323. Fixes for APM driver. HW lines/HW clipping. ROP support. Text accel now
-      uses PAD_DWORD. Bugfix for WaitForFifo() (lost serial interrupts) and 
-      ApmSync() (various errors). HW cursor now uses XAA interface. Combined 
+      uses PAD_DWORD. Bugfix for WaitForFifo() (lost serial interrupts) and
+      ApmSync() (various errors). HW cursor now uses XAA interface. Combined
       write for many registers (x+y in one longword etc.) (#1054, Henrik
       Harmsen).
 1322. xterm fixes. Correct a minor placement problem with the right scrollbar.
       Implement a new set of control sequences for switching between the
       normal and alternate VT100 screens. Implement the alternate-screen menu
       entry (#1053, Thomas Dickey).
-1321. Add some reasonable limit for when a trapezoid fill is used rather than 
+1321. Add some reasonable limit for when a trapezoid fill is used rather than
       using spans (#1051, Mark Vojkovich).
 1320. Add bindist description files for an OpenBSD/sparc binary distribution
       (#1045, Todd Fries).
@@ -9135,15 +10002,15 @@ XFree86 3.9s (15 October 1997)
       right-scrollbar to xterm (#1037, Thomas Dickey, Michael Rohleder).
 1312. Add GD7555 to vgaPCI.h and fix XF98_SVGA (#1036, Shuichi Ueno).
 1311. Fix a bug with Qword pad support in ImageWrite (#1033, Mark Vojkovich).
-1310. Fix mystique driver and build problem on SVR4.0 (#1029, Takaaki Nomura, 
+1310. Fix mystique driver and build problem on SVR4.0 (#1029, Takaaki Nomura,
       Isao Ohishi).
 1309. Fix SuperProbe to correctly detect memory on the Trident 9685 (#1023,
       Alan Hourihane).
-1308. Add hardware clipping and transparency for the trident chips that 
+1308. Add hardware clipping and transparency for the trident chips that
       support it. Partially implement the 'set_mclk' option, not yet
       complete, remove the tgui_mclk_66 option, clean up the TV output for
       9685 boards. Documentation updates (#1022, Alan Hourihane).
-1307. Add accelerated ImageWrite and a WriteBitmap replacement to the tseng 
+1307. Add accelerated ImageWrite and a WriteBitmap replacement to the tseng
       driver (#1021, Mark Vojkovich, Koen Gadeyne).
 1306. Documentation update for tseng driver (#1020, Koen Gadeyne).
 1305. Clear disallowed flags in Options bitmap (#1019, Alan Hourihane).
@@ -9181,7 +10048,7 @@ XFree86 3.9r (30 September 1997)
       cursors need to be implemented/verified. S3 builtin curser seems
       to work in 8bpp, but fails in other depths (#992, Mark Vojkovich).
 1283. Some fixes for Unixware 2.1.2 (#989, Steve Forsythe).
-1282. Fix the remaining line drawing problems for the CL-GD5428 and CL-GD754x 
+1282. Fix the remaining line drawing problems for the CL-GD5428 and CL-GD754x
       chips (#985, Corin Anderson).
 1281. Fix build problem (982, Takaaki Nomura).
 1280. Add more acceleration for Permedia (this is partly producing drawing
@@ -9198,20 +10065,20 @@ XFree86 3.9q (19 September 1997)
 1274. Add XF98_SVGA server, update XF98Conf.cpp, VideoBoard98, fix mga driver
       for PC98 (#980,981, Michio "Karl" Jinbo, Shuichirou Urata).
 1273. Some fixes to glint server (Helmut Fahrion, Stefan Dirsch, Dirk Hohndel).
-1272. Fix for glint_dump_regs and disable accelerated lines for glint 
+1272. Fix for glint_dump_regs and disable accelerated lines for glint
       (Stefan Dirsch).
-1271. Add XAA hw cursor support and update trident and glint drivers to use it 
+1271. Add XAA hw cursor support and update trident and glint drivers to use it
       (#973-976,979, Alan Hourihane).
-1270. Several fixes to xterm: fix redraw errors after font changes or resizes, 
+1270. Several fixes to xterm: fix redraw errors after font changes or resizes,
       add sunKeyboard resource, correct fg/bg test in the control sequence
       that replies with the current SGR settings ((#972, Thomas Dickey).
-1269. Several fixes to the xterm standalone configure script (#972, 
+1269. Several fixes to the xterm standalone configure script (#972,
       Thomas Dickey).
 1268. Fix to pointer movement constraints (#968, Stuart Anderson).
 
 XFree86 3.9p (15 September 1997)
 1267. Disable Image Write for HiQV chips in C&T driver (#966, David Bateman).
-1266. Add stipple accelerated functions through the ScanlineScreenToScreen 
+1266. Add stipple accelerated functions through the ScanlineScreenToScreen
       function (#965, Alan Hourihane).
 1255. Add ImageWrite support for the Laguna chips in cirrus driver (#964,
       Corin Anderson).
@@ -9221,7 +10088,7 @@ XFree86 3.9p (15 September 1997)
 1251. Fix Linux-axp xdm build problem.
 1250. Fix stripping of extension from module names (so that it works OK
       when there is a '.' in the module directory pathname).
-1249. Fix some problems in the trident driver with the 9685 programmable clock 
+1249. Fix some problems in the trident driver with the 9685 programmable clock
       and disable the GE when too little memory is available (#950,
       Alan Hourihane).
 1248. Fix build problem with non gcc compilers (#948,949, Takaaki Nomura,
@@ -9232,7 +10099,7 @@ XFree86 3.9p (15 September 1997)
 1245. Fix saving video memory for glint server (Helmut Fahrion).
 
 XFree86 3.9o (9 September 1997)
-1244. Yet another fix for the problems around installing xkbcomp 
+1244. Yet another fix for the problems around installing xkbcomp
       (Michael Rohleder, David Dawes, Dirk Hohndel).
 1243. Add more acceleration for 500TX to glint server (Alan Hourihane).
 1242. Add initial acceleration for Permedia to glint server (Dirk Hohndel).
@@ -9250,8 +10117,8 @@ XFree86 3.9o (9 September 1997)
 1235. Fix 24bpp XAA NonTE image text with RGB_EQUAL (#942, David Bateman).
 1234. Fix BIOS layout issues in matrox drivers. This might make Millennium
       Rev 3 cards work (#941, Andrew van der Stock).
-1233. Improve the performance of the 24bpp fills on the 6554x machines and 
-      hopefully implements a solid fill at 32bpp for the 6555x machines 
+1233. Improve the performance of the 24bpp fills on the 6554x machines and
+      hopefully implements a solid fill at 32bpp for the 6555x machines
       (untested). Some cosmetic changes (#940,944, David Bateman).
 1232. Turn off CPU_TRANSFER_BASE_FIXED in SVGA/S3 driver (#939, Mark Vojkovich).
 1231. Add the correct Enable/DisableIO Ports back into the glint driver (#938,
@@ -9265,11 +10132,11 @@ XFree86 3.9o (9 September 1997)
 1227. Fix MClk limits for matrox driver (#931, Andrew van der Stock).
 1226. Fix build problem on Solaris (#929, Matthieu Herrb).
 1225. Add DacSpeed to C&T driver (#930, David Bateman).
-1224. Disable acceleration for IMA bus chips in tseng driver (#928, 
+1224. Disable acceleration for IMA bus chips in tseng driver (#928,
       David Bateman)
 1223. Turn Record extension into module and fix problems in XInput joystick
       module (#927,933, Matthieu Herrb).
-1222. Add support for the ch8398 and ch8398a clockchips to the tseng driver 
+1222. Add support for the ch8398 and ch8398a clockchips to the tseng driver
       (#913,914 Gyorgy Krajcsovits).
 
 XFree86 3.9n (26 August 1997)
@@ -9279,13 +10146,13 @@ XFree86 3.9n (26 August 1997)
       cards with IMA bus. Modify linear memory code (#910, Koen Gadeyne).
 1218. Fix locale in R6.3, Fix PC98 XKB, Remove xf86ClearIOPortList() and
       xf86AddIOPorts() from PEGC driver (#908, Takaaki Nomura, Isao Ohishi).
-1217. Remove xf86ClearIOPortList() and xf86AddIOPorts() (#907,909 
+1217. Remove xf86ClearIOPortList() and xf86AddIOPorts() (#907,909
       Matthieu Herrb).
 1216. Add ET6100 support to tseng driver (#906, Koen Gadeyne).
 1215. Add wide lines to XAA (#904, Mark Vojkovich).
 1214. Add Chrontel8391CalcClock function (#903, Gyorgy Krajcsovits).
 1213. Fix output of hex numbers in chip revision (#902, Dejan Ilic).
-1212. Add accelerated Bresenham lines to tseng driver at 8bpp (#901, 
+1212. Add accelerated Bresenham lines to tseng driver at 8bpp (#901,
       Koen Gadeyne).
 1211. Xlib: XIMStringConversionRetrival should be XIMStringConversionRetrieval
       (#905, Kaleb Keithley).
@@ -9297,7 +10164,7 @@ XFree86 3.9n (26 August 1997)
 1206. Fix SPARCcompiler CCompilerMajorVersion (#896, Kaleb Keithley).
 1205. Parse junk from export lists better (#895, Kaleb Keithley).
 1204. Removes some dead or unused code in os-support (#893,  Matthieu Herrb).
-1203. Remove xf86tmpnam() from libc_wrapper and rewrites xf86tmpfile() to 
+1203. Remove xf86tmpnam() from libc_wrapper and rewrites xf86tmpfile() to
       use tmpfile() (#892,  Matthieu Herrb).
 1202. Add a separate README.OpenBSD for 3.9 (#890, Matthieu Herrb).
 1201. Move most common extensions into a module (#889, Matthieu Herrb).
@@ -9311,7 +10178,7 @@ XFree86 3.9n (26 August 1997)
 1196. Bring the 3.3.1 Trident fixes into 3.9 (#882, Alan Hourihane).
 1195. Add incomplete Rendition detection code to SuperProbe (Dirk Hohndel).
 1194. Add Rendition detection to PCI code (#881, Marc Langenbach, Dirk Hohndel).
-1193. Fix to only build *.dir file for xkbcomp on make install (#880, 
+1193. Fix to only build *.dir file for xkbcomp on make install (#880,
       Michael Rohleder).
 1192. Add ImageWrites for s3/svga (#879, Mark Vojkovich).
 1191. Rename dashed pattern flags (#878, Mark Vojkovich).
@@ -9385,30 +10252,30 @@ XFree86 3.9k (29 July 1997)
 1154. Add code to fine tune memory access on ET6000 boards and cleanup some
       W32 specific code that would write to illegal registers on ET6000 cards
       (#818, Harald Nordgard Hansen).
-1153. Ensure accelerator CRTC registers are unlocked before writing them and 
+1153. Ensure accelerator CRTC registers are unlocked before writing them and
       horizontal & vertical syncs are not disabled on mode switches (#817,
       Marc La France).
-1152. Change xsetroot -mod option to count pixels from left to right within 
-      each 16-pixel slice, instead of right to left (#817, Marc La France). 
-1151. Cleanup declarations for xf86Verbose, xf86ProbeOnly & xf86ProbeFailed, 
-      make VGABase XF86Config option recognized by more servers, HSkew wasn't 
-      being dealt with correctly in matching modes to clocks, fixup default 
+1152. Change xsetroot -mod option to count pixels from left to right within
+      each 16-pixel slice, instead of right to left (#817, Marc La France).
+1151. Cleanup declarations for xf86Verbose, xf86ProbeOnly & xf86ProbeFailed,
+      make VGABase XF86Config option recognized by more servers, HSkew wasn't
+      being dealt with correctly in matching modes to clocks, fixup default
       mode for the generic VGA driver (#817, Marc La France).
 1150. Fix a few bugs in ATI driver, break it up in multiple files, add
       support for Mach64 accelerator CTRC, which now is used by default, and
-      generic VGA (untested) (#817, Marc La France). 
+      generic VGA (untested) (#817, Marc La France).
 1149. Fix build problem on Solaris (#810, Dirk Hohndel).
 1148. Re-enable LEFT_EDGE_CLIPPING_NEGATIVE for the HiQV chips and tidy up the
       ScreenToScreenColorExpand stuff (#808, David Bateman).
 1147. Enable the sw_cursor option and add support for the no_accel option (#806,
       Joe Moss).
 1146. Avoid source overruns in xf86DrawStippleScanline() and remove the
-      restrictions on TRIPLE_BITS_24BPP, LEFT_EDGE_CLIPPING 
+      restrictions on TRIPLE_BITS_24BPP, LEFT_EDGE_CLIPPING
       and LEFT_EDGE_CLIPPING_NEGATIVE_X (#805, David Bateman).
 1145. Allow keywords with underscores in XF86Setup (#802, Harald Koenig).
 1144. Explicitly enable hsync and vsync on Mach64 boards (#799, Marc La France).
 1143. Small fix for norwegian keyboard in xkb (#797, Harald Nordgard Hansen).
-1142. Add 32bpp to HiQV driver and get CopyArea and Solid Fills accelerated 
+1142. Add 32bpp to HiQV driver and get CopyArea and Solid Fills accelerated
       in 32bpp (#790,796, David Bateman).
 1141. Fix clock calculation on HiQV chips (#783, David Bateman).
 1140. Fix hardware clipping and get closer to a working 8x8pattern color expand
@@ -9417,7 +10284,7 @@ XFree86 3.9k (29 July 1997)
 1138. Change how patterns are packed for LINE_PATTERN_MSBFIRST_INCREASING
       (#779, Mark Vojkovich).
 1137. SVGA/S3 acceleration improvements (#778, Mark Vojkovich).
-1136. Fix xclock problem that shows up on Cirrus 542x chips 
+1136. Fix xclock problem that shows up on Cirrus 542x chips
       (#777, Corin Anderson).
 1135. Small fix for C&T driver (#775,776 David Bateman).
 1134. Merge missing ViRGE code from 3.3* into 3.9* (#773, Harald Koenig).
@@ -9427,12 +10294,12 @@ XFree86 3.9k (29 July 1997)
 1130. Make XF86Setup's keyword matching the same as the Xservers (ie,
       ignore '_', ' ', '\t' in keywords).
 1129. Tseng documentation update (#800, 803, Koen Gadeyne).
-1128. Update to imake's auto GCC PostIncDir detection for OpenBSD 
+1128. Update to imake's auto GCC PostIncDir detection for OpenBSD
       (#794, Matthieu Herrb).
 1127. Fix I128 problems (#792, 809, Robin Cutshaw).
 1126. Fix some errors in the symbols/th XKB file (Poonlap Veeratanabutr).
 1125. Don't use EXTRA_DEFINES in Xserver/xkb/Imakefile (#786, Kaleb Keithley).
-1124. Alternate way of fixing the "./" problem in Imake.rules 
+1124. Alternate way of fixing the "./" problem in Imake.rules
       (#785, Kaleb Keithley).
 1123. Install full path in dynamic libraries for SCO (#782, J. Kean Johnston).
 1122. Fix remaining problems with SCO OpenServer 5 support (#772,
@@ -9472,7 +10339,7 @@ XFree86 3.9j (12 July 1997)
 1099. Add handling for AST onboard Mach32 card (#754, Bryan Feir).
 1098. Fix a problem in Imake.rules that shows up when using Motif.rules.
 1097. Fix MGA lockup on SVR4.0.
-1096. Add missing for Japanese "small TSU" character to the XKB 
+1096. Add missing for Japanese "small TSU" character to the XKB
       symbols/jp file (#751, Shigehiko Sasaki).
 1095. Fix ET4000/W32i acceleration at 16 and 24bpp, and accelerate colour
       expansion at 16bpp and 24bpp for the W32p (#747, Koen Gadeyne).
@@ -9567,21 +10434,21 @@ XFree86 3.9h (30 June 1997)
       MHz on AT3D, various bugfixes and cleanups (#702, Henrik Harmsen).
 1045. Fix problems with displaying card READMEs in XF86Setup (#701, Dirk
       Hohndel).
-1044. Add left-edge clipping to s3_newmmio. There's bug in both the scanline 
-      screen->screen and CPU->screen stipple fallback routines though.  Both 
-      break certain patterns and the screen->screen bug is worse than the 
+1044. Add left-edge clipping to s3_newmmio. There's bug in both the scanline
+      screen->screen and CPU->screen stipple fallback routines though.  Both
+      break certain patterns and the screen->screen bug is worse than the
       CPU->screen one (#694, Mark Vojkovich).
-1043. Enables the XInput modules from 3.2 to be loaded as modules in 
+1043. Enables the XInput modules from 3.2 to be loaded as modules in
       XF86_LOADER (#693, Matthieu Herrb).
 1042. Add code to have XAA check to see if a stipple can be reduced to an 8x8
-      pattern before banishing it from the pixmap cache on account of it's 
+      pattern before banishing it from the pixmap cache on account of it's
       size (#692, Mark Vojkovich).
 1041. Fix CapNotLast problem in dashed line code (#686, Mark Vojkovich).
 1040. Add stippled fill fallback for SVGA/S3 if the pixmap cache is too small
       (#685, Mark Vojkovich)
-1039. Fix for xf86initac,c so that drivers can specify their own WriteBitmap 
+1039. Fix for xf86initac,c so that drivers can specify their own WriteBitmap
       functions and fallbacks for non-cachable stippled fills. This also
-      allows usage of both CPU->screen and scanline screen->screen color 
+      allows usage of both CPU->screen and scanline screen->screen color
       expansion instead of one or the other (#684, Mark Vojkovich).
 1038. Some Xlib fixes (#687-690, 695-699, Kaleb Keithley).
 1037. XKB updates (#674, 675, 709, Kaleb Keithley).
@@ -9657,7 +10524,7 @@ XFree86 3.9e (15 June 1997)
       Marc Aurele La France).
 1004. Fix duplicate target in drivers/s3/Imakefile (#658, Robin Cutshaw).
 1003. Fix some Xprt problems (#655-657, Kevin Samborn).
-1002. Fix some DPMS problems, including problems when the DPMS timeouts  
+1002. Fix some DPMS problems, including problems when the DPMS timeouts
       are smaller than the screensaver cycle time, and problems with the
       various DPMS setting not being re-initialised at server reset.
 1001. Fix an InfoRec initialisation problem in xfree68/fbdev (#652,
@@ -9930,7 +10797,7 @@ XFree86 3.9c (3 June 1997)
  834. Add detection of other variants of the Cyber9385 to the trident
       driver and SuperProbe (Arthur Tateishi and Alan Hourihane).
  833. Change the SVGA server to tell DGA clients that the memory available
-      is InfoRec.videoRam rather than ChipLinearSize (which is often 
+      is InfoRec.videoRam rather than ChipLinearSize (which is often
       too large).
  832. Cards db updates (#511, Harm Hanemaayer).
  831. Fix LynxOS inconsistent TERMCAP use by xterm and resize ($504,
@@ -10083,7 +10950,7 @@ XFree86 3.9b (4 May 1997)
         lib/X11: When doing XSetICValues and IMS returns ERROR, library core
           dump (#358).
  749. Clean up the GLX for the static-linked servers (#351, Henry Worth).
- 748. Fix SCO Open Server build problem (#348, J. Kean Johnston). 
+ 748. Fix SCO Open Server build problem (#348, J. Kean Johnston).
  747. Add an option to allow VClk1 to be used as the programmable clock
       with C&T 65550 and 65554 chips (#346 Daniel Bischof, Andreas Heitmann
       and Thomas Landgraf).
@@ -10192,7 +11059,7 @@ XFree86 3.9a (17 April 1997)
  691. Fix NonTE fonts in XAA (#292,309 David Bateman).
  690. Disable XAA matchcommon logic to fix problem with grayed out fonts
       (#291, David Bateman).
- 689. Fix sis driver for 8x8 color expand pattern fill pattern flags and XAA's  
+ 689. Fix sis driver for 8x8 color expand pattern fill pattern flags and XAA's
       new synching policy (#290, Xavier Ducoin).
  688. LynxOS updates (#289, Thomas Mueller).
  687. Enable 1bpp and 4bpp for the chips driver (#288, David Bateman).
@@ -10213,7 +11080,7 @@ XFree86 3.2At (14 April 1997)
       Tseng's recommendations (=much lower than we had before). fix a BUG in
       the ET4000 "standard set-of-clocks" code. Use ChipClockScaleFactor.
       (#282, Koen Gadeyne).
- 680. Fix and re-enable 8x8 pattern color expansion (!=24bpp) for Alpine cards 
+ 680. Fix and re-enable 8x8 pattern color expansion (!=24bpp) for Alpine cards
       Fix CPUToScreen color expansion for 24bpp mode, fix determining the BG
       color in 24bpp color expansion routines (#281,285, Corin Anderson).
  679. Various Cirrus fixes and additions. Fix HAVE_546X() macro for Laguna
@@ -10229,15 +11096,15 @@ XFree86 3.2At (14 April 1997)
  676. Fix loader under SVR4.0.4 (lstat,fstat,mknod)(#277, Richard Coley).
  675. Speedups for dashed lines in SVGA/S3 (#276, Mark Vojkovich).
  674. Allow building Xnest with BuildServersOnly (#275, Marc Aurele La France).
- 673. Fix vga16 and banked vga2 without also breaking either of the loader or 
+ 673. Fix vga16 and banked vga2 without also breaking either of the loader or
       static servers. Remove obsolete directories and other extraneous junk.
-      Remove mi's dependence on mfb. LoaderFixups is no longer needed. Add 
+      Remove mi's dependence on mfb. LoaderFixups is no longer needed. Add
       xf86InitViewport to the symbol table. Combine vga2/mfb & vga2/mfb.banked.
       (#274 Marc Aurele La France).
  672. More layout cleanups in matrox driver (#273, Radek Kapitan).
  671. Fix LinkKit to build loader (#272, Takaaki Nomura).
  670. Fix some Alpha problems (#270, Robin Cutshaw).
- 669. Add MemClk field to all drivers (#270,271 Robin Cutshaw, Sebastien 
+ 669. Add MemClk field to all drivers (#270,271 Robin Cutshaw, Sebastien
       Marineau).
  668. Fix server crashes in C&T driver caused by delayed syncing (#269, David
       Bateman).
@@ -10254,11 +11121,11 @@ XFree86 3.2At (14 April 1997)
 
 XFree86 3.2As (09 April 1997)
  658. Several fixes and enhancements for the cirrus driver. Fix the crash that
-      showed up in 3.2A with MMIO on some chips at 16bpp. Enable the 8x8 
-      pattern fill code for different chips. Reorganize the BitBLT feature 
-      checks in the accelerated driver, and make it compatible with the new 
-      delayed syncing in XAA.Fix the > 85 MHz dot clock mode on the 
-      CL-GD5436/46. Detect all DRAM configurations that are possible on the 
+      showed up in 3.2A with MMIO on some chips at 16bpp. Enable the 8x8
+      pattern fill code for different chips. Reorganize the BitBLT feature
+      checks in the accelerated driver, and make it compatible with the new
+      delayed syncing in XAA.Fix the > 85 MHz dot clock mode on the
+      CL-GD5436/46. Detect all DRAM configurations that are possible on the
       CL-GD5446. Add code to handle the 7555 (no detection).
       (#258, Harm Hanemaayer).
  657. Fix Bresenham line bug in trident/9440 driver (#257, Alan Hourihane).
@@ -10268,11 +11135,11 @@ XFree86 3.2As (09 April 1997)
  655. Add mga dashed lines (#255, Andrew Vanderstock).
  654. Add more flexible way of loading and initializing extensions (#253,
       Matthieu Herrb).
- 653. Fix bugs in the S3V server concerning rectfill with scan line width of 
+ 653. Fix bugs in the S3V server concerning rectfill with scan line width of
       2048 and with lines (#251,252, Harald Koenig).
  652. Add option "set_memclk" (#249, Sebastien Marineau).
  651. Fix hangs in svga/s3v server, fix some bugs, add planemask support to
-      most accelerated primitives and start accelerated lines (#249, Sebastien 
+      most accelerated primitives and start accelerated lines (#249, Sebastien
       Marineau).
  650. Fix XAA to force ROP to GXcopy for XDrawImageString (#249, Sebastien
       Marineau).
@@ -10286,8 +11153,8 @@ XFree86 3.2As (09 April 1997)
  644. Add dashed line support for XAA (#242,244, Mark Vojkovich).
  643. Fix some fill problems in S3V server (#241, Harald Koenig).
  642. Several fixes to C&T driver that rearrange code in XAA FillRect code to
-      work around bug in HW cursor, add ImageWrite function, use the 8x8 
-      pattern where possible to simulate a planemask, add preliminary support 
+      work around bug in HW cursor, add ImageWrite function, use the 8x8
+      pattern where possible to simulate a planemask, add preliminary support
       for vga2 and vga16 and temporary fix for Syncing problems in new XAA code
       (#239, David Bateman).
  641. Further LinkKit changes (#238, Takaaki Nomura).
@@ -10321,7 +11188,7 @@ XFree86 3.2Ar (28 March 1997)
       Make LinkKit use the same default CCOPTIONS as the main build.
       Remove redundancy in svr4.cf (#215, Marc Aurele La France).
  619. Add newer ATI chipsets to SuperProbe (#214, Marc Aurele La France).
- 618. Fix color expansion and pixmap cache in trident driver (#212,213, 
+ 618. Fix color expansion and pixmap cache in trident driver (#212,213,
       Alan Hourihane).
  617. Change XAA to delay syncing (#211, Mark Vojkovich).
  616. Fix OS/2 naming problem in Xserver Imakefile and XAA 8x8 pattern
@@ -10332,7 +11199,7 @@ XFree86 3.2Ar (28 March 1997)
       Harald Koenig).
  612. Fix building XF98_EGC (#207, Takaaki Nomura).
  611. Add ImageWrite to s3/svga and prepare driver for upcoming XAA changes;
-      the s3/svga server no longer does cursor blocking, users of Xqueue 
+      the s3/svga server no longer does cursor blocking, users of Xqueue
       might have to use the Option "sw_cursor" (#206, Mark Vojkovich).
  610. Fix 8 bit DAC handling in SVGA server (#205, Mark Vojkovich).
  609. Add better support for linear memory on W32i cards (#204, Koen Gadeyne).
@@ -10351,7 +11218,7 @@ XFree86 3.2Ar (28 March 1997)
  599. Fix SuperProbe for W32 chipsets (#191, Koen Gadeyne).
  598. Fix building the static S3 server (#188-190, Harald Koenig).
  597. Fix undefined symbols in the pex5 module (#187, Matthieu Herrb).
- 596. Fix autoloading modules in the S3 server for PC98 (#186,197 Takaaki 
+ 596. Fix autoloading modules in the S3 server for PC98 (#186,197 Takaaki
       Nomura).
 
 XFree86 3.2Aq (23 March 1997)
@@ -10368,7 +11235,7 @@ XFree86 3.2Ap (22 March 1997)
  587. Fixes to blitter and hw cursor handling in C&T driver (#176, David
       Bateman, Egbert Eich).
  586. Add Elsa handling to S3/SVGA and Trio64V2/DX/GX, ViRGE/DX/GX and PLATO/PX
-      to SuperProbe, scanpci, S3, S3V and S3/SVGA servers (#174,175, 
+      to SuperProbe, scanpci, S3, S3V and S3/SVGA servers (#174,175,
       Harald Koenig).
  585. Build fix for Xprt, Xnest and Xvfb (#172, Takaaki Nomura).
 
@@ -10384,7 +11251,7 @@ XFree86 3.2Ao (18 March 1997)
  579. Tseng documentation updates (#165, Koen Gadeyne).
  578. Fix unresolved strlen in PEX and XIE (#164, Takaaki Nomura).
  577. Fix changes of NEC480 to PEGC (#163, Michio "Karl" Jinbo).
- 576. Fix building of XF98_LOADER (#163,169, Michio "Karl" Jinbo, 
+ 576. Fix building of XF98_LOADER (#163,169, Michio "Karl" Jinbo,
       Takaaki Nomura).
  575. Fix building of normal X servers for PC98 (#163, Takaaki Nomura).
  574. Fix building P9000 module (#160, Takaaki Nomura).
@@ -10511,7 +11378,7 @@ XFree86 3.2Ai (25 February 1997)
       used to get the initial ScrnInfoRec; change all modules to follow these
       naming conventions (Dirk Hohndel).
  500. Fix missing fsetpos/fgetpos in ISC (#78, Michael Rohleder).
- 499. Fix elfloader to recognize .data1 and .rodata1 sections 
+ 499. Fix elfloader to recognize .data1 and .rodata1 sections
       (#82, Steve Forsythe).
  498. Add readdir family of functions to libc_wrapper (#81, Holger Veit).
  497. Add crosscompilation support for OS/2 (#81, Holger Veit).
@@ -10554,7 +11421,7 @@ XFree86 3.2Ag (19 February 1997)
  471. Fix problems with ISC and the Mach32 module (#55, Michael Rohleder).
  470. Fix Xnest and Xvfb when DoLoadableServer is YES (Dirk Hohndel).
  469. Clear up multiplex support on 96xx and display error message when
-      requested resolution exceeds available memory with the accelerator 
+      requested resolution exceeds available memory with the accelerator
       engine (#52, Alan Hourihane).
  468. Let Trio64V2 use newmmio driver (#49, Tom Angert).
  467. First cut for ET6000 hardware cursor (#48, Dejan Ilic).
@@ -10579,7 +11446,7 @@ XFree86 3.2Af (17 February 1997)
  454. Start Elf loader for Linux/Alpha; doesn't work, yet (#44, Alan Hourihane).
  453. Hide cursor in S3/SVGA when DGA is active (#43, Mark Vojkovich).
  452. a.out loader for module loading (#42, Matthieu Herrb).
- 451. Extend OS support layer to cover some libc functions and update all 
+ 451. Extend OS support layer to cover some libc functions and update all
       drivers to use the internal functions (Dirk Hohndel).
 
 XFree86 3.2Ae (16 February 1997)
@@ -10605,7 +11472,7 @@ XFree86 3.2Ae (16 February 1997)
       David Bateman).
 
 XFree86 3.2Ad (14 February 1997)
- 434. Merge Metro Link loader code and make all SVGA drivers and S3, S3V 
+ 434. Merge Metro Link loader code and make all SVGA drivers and S3, S3V
       server loadable (Metro Link, Dirk Hohndel).
  433. Avoid installing CVS admin files when doing 'make install' for rstart
       (#25).
@@ -10615,7 +11482,7 @@ XFree86 3.2Ad (14 February 1997)
 XFree86 3.2Ac (12 February 1997)
  430. Fix problem with system #define Control on LynxOS (Thomas Mueller).
  429. FreeBSD 2.2 doesn't need libz (Takaaki Nomura).
- 428. Another attempt at left edge clipping for HiQV chips (still disabled 
+ 428. Another attempt at left edge clipping for HiQV chips (still disabled
       by default) (David Bateman).
  427. DPMS in C&T is now enabled even when no monitor is detect (David Bateman).
  426. Additional fixes for 65530/35 linear addressing (untested) (Egbert Eich).
@@ -10656,7 +11523,7 @@ XFree86 3.2Ab (11 February 1997)
  396. Add memory bandwidth as a concept to the W32 RAMDAC code (Koen Gadeyne).
  395. Move W32/ET6k clock setting functions into tseng_clock.c. This together
       with change 394 breaks the W32 server and the et4000 driver in the
-      VGA2 and VGA16 server (all those are disabled by default for now) 
+      VGA2 and VGA16 server (all those are disabled by default for now)
       (Koen Gadeyne).
  394. Move RAMDAC support from W32 server in SVGA server and added
       accelerated 16/24/32 bpp support for ET4000/W32p (Koen Gadeyne).
@@ -11321,7 +12188,7 @@ XFree86 3.1.2Zb (23 October 1996)
 1058. Chips&Tech doc updates (David Bateman).
 1057. Cards db update for Chips&Tech (David Bateman).
 1056. Some updates to the "supported" contrib clients (Harald Koenig).
-1055. VGADriver doc updates (Stuart Lamble). 
+1055. VGADriver doc updates (Stuart Lamble).
 1054. LynxOS doc updates (Thomas Mueller).
 1053. Fix a problem in mgaFillBoxSolid() (Radoslaw Kapitan).
 1052. Fix a serious probe bug in the MGA driver which causes a crash on
@@ -11502,7 +12369,7 @@ XFree86 3.1.2Gl (10 October 1996)
      (Michio "Karl" Jinbo).
 956. ViRGE/VX update (Harald Koenig).
 955. Add power_saver support to the TGA server (Alan Hourihane).
-954. Some more line/seg updates for S3V (Harald Koenig). 
+954. Some more line/seg updates for S3V (Harald Koenig).
 953. Fix some problems with the previous S3V planemask patch (Harald Koenig).
 952. Add code to read the MGA card information from the BIOS.  This
      allows the RAMDAC type/speed to be determined (Andrew E. Mileski).
@@ -11690,7 +12557,7 @@ XFree86 3.1.2Gd (23 September 1996)
 833. Don't reference uninitialised s3MmioMem in ViRGE server (Harald Koenig
      and Dirk Hohndel).
 832. Don't do S3 bug tests for 928 and earlier (Harald Koenig).
-831. ViRGE fixes, including BITBLT and text clipping (Harald Koenig). 
+831. ViRGE fixes, including BITBLT and text clipping (Harald Koenig).
 830. Updates to the Cards file for Cirrus and Ark (Harm Hanemaayer).
 829. xf86config updates, including 24bpp support, and making "virtual"
      optional (Harm Hanemaayer).
@@ -11986,7 +12853,7 @@ XFree86 3.1.2Ee (11 August 1996)
      enabled (Thomas E. Dickey).
 633. Reduce flickering during resize for ReverseVideo in xterm
      (Thomas E. Dickey).
-632. Fix xterm core dump problem on IRIX 5.2 (Thomas E. Dickey). 
+632. Fix xterm core dump problem on IRIX 5.2 (Thomas E. Dickey).
 631. Update scanpci to detect the #9 I128 series II (Robin Cutshaw).
 630. Preliminary Mach32 ramdac support updates (Bryan Feir).
 629. Document new xterm control sequences (Thomas E. Dickey).
@@ -14024,7 +14891,7 @@ XFree86 3.0Fb (23 September 1994)
 356. Enable 32bpp for Ti3025+964.
 355. Change font cache and pixmap expansion allocation policy for S3
      server.  This allows better performance when there isn't much
-     offscreen memory available (Hans Nasten). 
+     offscreen memory available (Hans Nasten).
 354. Fix for banked ImageFill for bpp>8 (Hans Nasten).
 353. Updates to XF86_Accel man page.
 352. Remove references to 'Xconfig' in source code.
@@ -14238,7 +15105,7 @@ XFree86 3.0Df (31 August 1994)
 210. P9000 updates.  Includes updates to sysconfig code, Orchid and PCI
      support now enabled by default (Erik Nygren).
 209. SuperProbe and ModeDB updates (David Wexelblat).
-208. Support for the S3 805i and 16-bit RAMDACS (including ATT20C498, 
+208. Support for the S3 805i and 16-bit RAMDACS (including ATT20C498,
      STG1700, SDAC) (Bernhard Bender).
 207. Support for the S3 SDAC with S3 864 (Bernhard Bender).
 206. Basic support for ET4000W32 chipsets in the VGA servers.  Includes
@@ -14555,4 +15422,4 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2144 2002/01/18 20:09:22 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2354 2002/10/22 02:44:25 dawes Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/Domain.note b/xc/programs/Xserver/hw/xfree86/Domain.note
new file mode 100644
index 000000000..3db2aefae
--- /dev/null
+++ b/xc/programs/Xserver/hw/xfree86/Domain.note
@@ -0,0 +1,159 @@
+The purpose of the changes described here is to implement a more general
+framework for multi-head on systems with more than one host-to-PCI bridge.
+The changes also implement a basic port of XFree86 to SPARC Solaris.
+
+These changes are derived from David S. Miller's submission #4653 to the
+patch list.  David Andrew of Sun Microsystems was also kind enough to
+arrange for a hardware loan for development of these changes.
+
+These changes are known to work on several SPARC SunOS and UltraSPARC
+Linux configurations.  Linux kernel work is in progress to port these
+changes to Linux/PowerPC.
+
+Several loose ends still need to be addressed before these changes can be
+considered stable.  The bulk of this note is devoted to enumerating what
+remains to be done, along with other notes, broken down into various broad
+categories.
+
+SPARC SunOS (aka Solaris)
+-------------------------
+- An overview of this XFree86 port is available in README.Solaris.
+- The keyboard map code in hw/xfree86/os-support/sunos/sun_kbdEv.c needs
+  to be extended to handle more than only the sun5 keyboard I targeted it
+  for.  Even for the sun5, the map is incomplete as several keys are not
+  mapped.  What is there is just barely usable.
+- On exit, the server will zero out /dev/fb, but that might not be the
+  right thing to do for all primary adapters.  This does however
+  appear to emulate the behaviour of Sun's commercial servers.  It also
+  eliminates the need for output drivers to save and restore video memory
+  contents.  (They still need to save/restore the mode timing however.)
+  This also chimes into a long-standing XFree86 policy to not save/restore
+  video memory contents if the mode on entry is found to be non-VGA, a
+  policy several existing drivers comply with.
+- The SBUS drivers (sunbw2, suncg14, suncg3, suncg6, sunffb, sunleo and
+  suntcx), the common layer's SBUS code and the fbdev driver have all
+  only been compile tested.  There are likely to be Linux'isms within
+  them that remain to be dealt with.
+- It still needs to be verified whether or not this work adversely
+  affected support for ix86 Solaris.
+
+UltraSPARC Linux
+----------------
+- Although this code can be compiled using any Linux/SPARC64 kernel, it
+  can only run successfully using 2.4.12 or later.
+- I haven't had time to sufficiently dig into XKB to properly configure it
+  for sun5 keyboards.  Given XFree86 on Linux/SPARC has been around for a
+  while, it's likely someone has already done this, and I'd appreciate
+  receiving a copy of a working XF86Config input section.
+
+PowerPC Linux
+-------------
+- As mentioned above, kernel work is in progress to port this PCI scheme
+  to Linux/PowerPC.
+- Aside from kernel work, the inX() and outX() definitions in compiler.h
+  will need to be changed to do something akin to their SPARC definitions,
+  i.e. consider their port argument to be a virtual address.
+
+Other Linux ports to multi-domain architectures
+-----------------------------------------------
+- Comments in os-support/bus/linuxPci.c document the kernel interface
+  required to port these changes.  In short, Linux ports, such as Alpha
+  and mips, should follow SPARC and PowerPC's lead in providing support to
+  mmap() PCI devices through their /proc/bus/pci pseudo-files and to treat
+  such requests for host bridges as requests to mmap() space provided by
+  these bridges.
+
+Other OS's
+----------
+- In the right hands, either linuxPci.c or sparcPci.c can be used as a
+  guide for what would need to be done to port this scheme to other OS's.
+  Perhaps the largest difference between the two (in terms of interface to
+  the common layer) is that the SunOS port includes internally generated
+  domain numbers in PCITAG's, whereas the Linux port doesn't need to.  The
+  remainder of the PCI code (which is OS-independent) can handle either
+  scheme.
+- Required entry points are xf86GetPciDomain(), xf86MapDomainMemory(),
+  xf86MapDomainIO() and xf86ReadDomainMemory().  Replacements for
+  xf86BusAccWindowsFromOS(), xf86PciBusAccWindowsFromOS() and
+  xf86AccResFromOS() might also be required.
+- Development of these changes has detected the fact that the XFree86 port
+  to the PowerMax OS is broken, and has been for some time, i.e. since
+  shortly after its introduction, back in the 3.9* days.
+
+SPARC PCI (OS-independent)
+--------------------------
+- The "Simba" PCI-to-PCI bridge used in SPARC's does not implement VGA
+  routing, as defined in the PCI specs.  Fortunately, OpenPROM seems to
+  always route VGA resources to the bus with PCI connectors, but this also
+  causes the common layer to not mark any PCI adapter as primary.
+
+Multiple PCI domains (architecture- and OS-independent)
+-------------------------------------------------------
+- This implementation assumes every host-to-PCI bridge provides access to
+  a separate PCI domain.  Each such domain provides three different
+  "address" spaces:  PCI configuration, I/O and memory.  The
+  implementation can also deal with situations where more than one PCI
+  domain share (different subsets of) the same PCI configuration space.  I
+  have unconfirmed information that suggests it might be necessary to also
+  allow the sharing of PCI memory spaces.
+- This implementation also assumes the CPU's physical address space
+  includes the entirety of each domain's I/O and memory spaces.  I know
+  this'll need to be changed to deal with the so-called UniNorth bridge,
+  found on PowerPC's, which allows access to only a subset of the memory
+  space behind it.
+- Ideally, the common layer should mark as primary up to one PCI adapter
+  per domain.  This has yet to be done.
+- Something needs to be done about PCI master aborts on primary buses.
+  For details on this, see my long-winded diatribe in sparcPci.c, and
+  related comments in linuxPci.c.  Suffice it to say here that I see the
+  eventual implementation of host bridge drivers within XFree86 as
+  unavoidable at this point.
+- DGA is broken on multi-domain platforms.  The information passed to the
+  client to locate the framebuffer still needs to be revised.  The best way
+  to deal with this is to change all drivers' OpenFramebuffer() function to
+  call a common layer routine to set the device name and displacements to be
+  returned to the DGA client.
+
+Output drivers
+--------------
+Most drivers currently used on ix86 need(ed) source code changes.
+- Calls to xf86ReadBIOS() and xf86MapVidMem() were replaced with calls to
+  xf86ReadDomainMemory() and xf86MapDomainMemory() respectively.  Except
+  for the "ati" and "atimisc" modules, this has already been done.
+- All ix86-style I/O port numbers need to be declared as an IOADDRESS, a
+  type defined in xf86Pci.h as "unsigned long".  Such port numbers also
+  need to be offset by a displacement which is also defined as an
+  IOADDRESS.  Before a driver's PreInit() is called, the common layer
+  makes this displacement available in ScrnInfoRec.domainIOBase.  For
+  single-domain architectures, such as ix86, domainIOBase will always be
+  zero.  Current use of vgaHWRec.PIOOffset has also been adjusted
+  accordingly.  Some drivers have been changed to keep a copy of this
+  displacement in their private structure.  Internally, an IOADDRESS is
+  actually a pointer that has been recasted to an unsigned long, but the
+  common layer "hides" this fact from the driver ABI, which means that I/O
+  port numbers, as seen by drivers, remain as integers rather than
+  addresses.  Aside from the ati and atimisc modules, s3, sis and tseng
+  are the only modules left whose I/O still needs to be converted (I've
+  temporarily run out of steam).
+- Note that these conversions are not necessarily sufficient to produce
+  drivers that will work on any given multi-domain architecture.  A driver
+  that, for example, had endianness problems, still does.  But, at least,
+  these conversions, along with the supporting common layer changes, make
+  PCI drivers more widely amenable to porting.
+- rdinx(), wrinx(), modinx(), testrg(), testinx() and testinx2() are not
+  given enough information to allow for the relocation of their I/O.  They
+  are consequently being deleted.  The apm and ark drivers, the only
+  remaining callers of the first three, have been changed to use local
+  definitions instead.  The last three (test*()) were already unused.
+- As a temporary measure, these changes completely disable ISA-style
+  probing on SPARC's and PowerPC's.  This means that driver calls to
+  xf86MatchIsaInstances(), while still valid, will always return detection
+  failure on SPARC's and PowerPC's.  This will be dealt with when a more
+  general master abort handling scheme is implemented.
+- I need to make a decision about the master abort issues mentionned above
+  before I can convert the "ati" and "atimisc" modules.  Consequently,
+  these modules still need to be compiled with -DAVOID_CPIO on
+  multi-domain architectures, and support for Mach64 variants as
+  non-primary heads is not yet available.
+
+$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/Imakefile b/xc/programs/Xserver/hw/xfree86/Imakefile
index e9e1a99fe..42f602fa5 100644
--- a/xc/programs/Xserver/hw/xfree86/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/Imakefile
@@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/12 1996/12/16 12:31:46 rws $
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.79 2001/10/29 16:51:55 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.80 2002/02/11 14:38:58 tsi Exp $
 
 #include <Server.tmpl>
 #define IHaveSubdirs
@@ -87,10 +87,10 @@ DRIVERSDK = sdk
 XF86CFGDIRS = xf86cfg xf86config
 #endif
 
-SUBDIRS = os-support common $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
+SUBDIRS = os-support common $(I2CDIR) $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
-	  $(RACDIR) $(I2CDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) parser \
+	  $(RACDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) parser \
           scanpci doc dummylib $(XF86CFGDIRS) $(XF86SETUPDIR) etc \
           $(DRIVERSDK) $(XF8_32WIDDIR)
 
diff --git a/xc/programs/Xserver/hw/xfree86/Options b/xc/programs/Xserver/hw/xfree86/Options
index 6f7b019a0..d6b347e86 100644
--- a/xc/programs/Xserver/hw/xfree86/Options
+++ b/xc/programs/Xserver/hw/xfree86/Options
@@ -24,7 +24,7 @@
 !! dealings in this Software without prior written authorization from the
 !! XFree86 Project.
 !!
-!! $XFree86: xc/programs/Xserver/hw/xfree86/Options,v 1.8 2001/12/17 20:52:29 dawes Exp $
+!! $XFree86: xc/programs/Xserver/hw/xfree86/Options,v 1.9 2002/06/04 23:04:48 dawes Exp $
 
 !! XAA options
 xaa.XaaNoCPUToScreenColorExpandFill:\
@@ -266,6 +266,11 @@ r128.UseFBDev:\
 Enable or disable use of on OS-specific fb interface (and is not supported \
 on all OSs). See fbdevhw(4) for further information. Default: off.
 
+r128.DMAForXv:\
+Try or don't try to use DMA for Xv image transfers. This will reduce CPU \
+usage when playing big videos like DVDs, but may cause instabilities. \
+Default: off.
+
 !! NeoMagic options
 
 neo.StrangeLockups:\
diff --git a/xc/programs/Xserver/hw/xfree86/Registry b/xc/programs/Xserver/hw/xfree86/Registry
index c6dfe6c1a..39bdaf1be 100644
--- a/xc/programs/Xserver/hw/xfree86/Registry
+++ b/xc/programs/Xserver/hw/xfree86/Registry
@@ -6,34 +6,113 @@ maintained here.
 
 Each module is required to have a unique name.  Registered names are:
 
+GLcore
+acecad
+afb
+apm
+ark
 ati
+atimisc
 bitmap
+bt8xx
+calcomp
 cfb
 cfb16
 cfb24
 cfb32
 chips
+cirrus
+citron
+cyrix
 dbe
 ddc
+digitaledge
+dmc
+dri
+drm
+dynapro
+elo2300
+elographics
 extmod
+fb
+fbdev
+fbdevhw
+fi12x6
+freetype
 glide
 glint
+glx
+hyperpen
+i128
 i2c
+i740
+i810
+imstt
+int10
+joystick
+keyboard
+layer
+magellan
+magictouch
 mfb
 mga
+microtouch
+mouse
+msp34xx
+mutouch
+neomagic
+newport
+nv
+pcidata
+penmount
 pex5
+r128
+radeon
 rac
 ramdac
+record
+rendition
+s3
+s3virge
+savage
+scanpci
+shadow
+shadowfb
+siliconmotion
+sis
+spaceorb
 speedo
+summa
+sunbw2
+suncg14
+suncg3
+suncg6
+sunffb
+sunleo
+suntcx
+tdfx
+tga
+trident
 tseng
 type1
+v4l
+vbe
+vesa
 vga
 vgahw
 vmware
+void
+wacom
 xaa
 xf1bpp
+xf24_32bpp
 xf4bpp
+xf8_16bpp
+xf8_32bpp
+xf8_32wid
 xie
+xtrap
+xtt
 
 2. External Module Object Symbols.
 
@@ -42,12 +121,15 @@ its externally visible symbols. They should be unique without regard to
 case.  Registered prefixes are:
 
 ati
+bt8xx
 cfb
 chips
+fi12x6
 glide
 glint
 mfb
 mga
+msp34xx
 neo
 permedia
 tseng
@@ -185,7 +267,8 @@ Vtime                     I     I    Tty VTIME
 BlockWrite                B     V    Enable/disable block write
 ColorKey                  I     V    Set the color key for overlay modes
 CompositeSync             B     V    Composite sync
-CRTScreen                 B     V    Display on CRT, not LCD
+CRTDisplay                B     V    Force display on CRT, not LCD
+CRTScreen                 B     V    Display on CRT, not LCD (Obsolete)
 EarlyRasPrecharge         O     V    Early RAS pre-charge
 FastDRAM                  O     V    Fast DRAM
 FifoAggressive            O     V    Aggressive FIFO setting
@@ -214,6 +297,7 @@ MemCfg1                   I     V    ??
 MemCfg2                   I     V    ??
 MGASDRAM                  B     V    Mga card has SDRAM
 MMIO                      B     V    Enable/disable memory mapped I/O
+MMIOCache                 B     V    Enable/Disable MMIO cache
 MuxThreshold              I     V    Multiplexing threshold (kHz)
 NoAccel                   B     V    Disable/enable acceleration
 NoClockChip               B     V    ??
@@ -223,9 +307,11 @@ OverclockMem              B     V    Enable memory overclocking
 Overlay                   A     V    Enable multi-depth/overlay.  An optional
                                      string "M,N" may be specified, where
                                      M, N are the depths.
+PanelDisplay              B     V    Force display on LCD
 PciBurst                  B     V    Enable/disable PCI burst mode
 PciRetry                  B     V    Enable/disable PCI retries
 ProbeClocks               B     V    Force probe for non-programmable clocks
+ReferenceClock            Q     V    Clock generator reference frequency
 RGBbits                   I     V    Number of significant bits per rgb
 Rotate                    S     V    Rotate the virtual display (CW or CCW)
 SetLCDClk                 Q     V    Set LCD clock (MHz)
@@ -320,4 +406,4 @@ and underscores removed.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.17 2001/04/05 19:29:41 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/XF86Config.man b/xc/programs/Xserver/hw/xfree86/XF86Config.man
index ef784a927..5626c72e2 100644
--- a/xc/programs/Xserver/hw/xfree86/XF86Config.man
+++ b/xc/programs/Xserver/hw/xfree86/XF86Config.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.man,v 1.6 2001/08/15 16:25:21 paulo Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.man,v 1.10 2002/10/12 16:06:43 herrb Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH XF86Config __filemansuffix__ __vendorversion__
@@ -13,19 +13,19 @@ following places when the server is started as a normal user:
 .PP
 .RS 4
 .nf
-.RI /etc/X11/ <cmdline>
-.RI __projectroot__/etc/X11/ <cmdline>
-.RB /etc/X11/ $XF86CONFIG
-.RB __projectroot__/etc/X11/ $XF86CONFIG
-/etc/X11/XF86Config-4
-/etc/X11/XF86Config
-/etc/XF86Config
-.RI __projectroot__/etc/X11/XF86Config. <hostname>
-__projectroot__/etc/X11/XF86Config-4
-__projectroot__/etc/X11/XF86Config
-.RI __projectroot__/lib/X11/XF86Config. <hostname>
-__projectroot__/lib/X11/XF86Config-4
-__projectroot__/lib/X11/XF86Config
+.IR /etc/X11/ <cmdline>
+.IR __projectroot__/etc/X11/ <cmdline>
+.IB /etc/X11/ $XF86CONFIG
+.IB __projectroot__/etc/X11/ $XF86CONFIG
+.I /etc/X11/XF86Config-4
+.I /etc/X11/XF86Config
+.I /etc/XF86Config
+.IR __projectroot__/etc/X11/XF86Config. <hostname>
+.I __projectroot__/etc/X11/XF86Config-4
+.I __projectroot__/etc/X11/XF86Config
+.IR __projectroot__/lib/X11/XF86Config. <hostname>
+.I __projectroot__/lib/X11/XF86Config-4
+.I __projectroot__/lib/X11/XF86Config
 .fi
 .RE
 .PP
@@ -38,29 +38,29 @@ command line option,
 is the relative path (with no ".." components) specified by that
 environment variable, and
 .I <hostname>
-is the machines hostname as reported by gethostname(3).
+is the machine's hostname as reported by gethostname(3).
 .PP
 When the X server is started by the "root" user, the config file search
 locations are as follows:
 .PP
 .RS 4
 .nf
-.I <cmdline>
-.RI /etc/X11/ <cmdline>
-.RI __projectroot__/etc/X11/ <cmdline>
+<cmdline>
+.IR /etc/X11/ <cmdline>
+.IR __projectroot__/etc/X11/ <cmdline>
 .B $XF86CONFIG
-.RB /etc/X11/ $XF86CONFIG
-.RB __projectroot__/etc/X11/ $XF86CONFIG
-.BR $HOME /XF86Config
-/etc/X11/XF86Config-4
-/etc/X11/XF86Config
-/etc/XF86Config
-.RI __projectroot__/etc/X11/XF86Config. <hostname>
-__projectroot__/etc/X11/XF86Config-4
-__projectroot__/etc/X11/XF86Config
-.RI __projectroot__/lib/X11/XF86Config. <hostname>
-__projectroot__/lib/X11/XF86Config-4
-__projectroot__/lib/X11/XF86Config
+.IB /etc/X11/ $XF86CONFIG
+.IB __projectroot__/etc/X11/ $XF86CONFIG
+.BI $HOME /XF86Config
+.I /etc/X11/XF86Config-4
+.I /etc/X11/XF86Config
+.I /etc/XF86Config
+.IR __projectroot__/etc/X11/XF86Config. <hostname>
+.I __projectroot__/etc/X11/XF86Config-4
+.I __projectroot__/etc/X11/XF86Config
+.IR __projectroot__/lib/X11/XF86Config. <hostname>
+.I __projectroot__/lib/X11/XF86Config-4
+.I __projectroot__/lib/X11/XF86Config
 .fi
 .RE
 .PP
@@ -76,7 +76,7 @@ environment variable (absolute or relative),
 is the path specified by that environment variable (usually the home
 directory), and
 .I <hostname>
-is the machines hostname as reported by gethostname(3).
+is the machine's hostname as reported by gethostname(3).
 .PP
 The
 .B XF86Config
@@ -296,12 +296,12 @@ font path elements:
 .PP
 .RS 4
 .nf
-__projectroot__/lib/X11/fonts/misc/
-__projectroot__/lib/X11/fonts/Speedo/
-__projectroot__/lib/X11/fonts/Type1/
-__projectroot__/lib/X11/fonts/CID/
-__projectroot__/lib/X11/fonts/75dpi/
-__projectroot__/lib/X11/fonts/100dpi/
+.I __projectroot__/lib/X11/fonts/misc/
+.I __projectroot__/lib/X11/fonts/Speedo/
+.I __projectroot__/lib/X11/fonts/Type1/
+.I __projectroot__/lib/X11/fonts/CID/
+.I __projectroot__/lib/X11/fonts/75dpi/
+.I __projectroot__/lib/X11/fonts/100dpi/
 .fi
 .RE
 .PP
@@ -309,15 +309,15 @@ The recommended font path contains the following font path elements:
 .PP
 .RS 4
 .nf
-__projectroot__/lib/X11/fonts/local/
-__projectroot__/lib/X11/fonts/misc/
-__projectroot__/lib/X11/fonts/75dpi/:unscaled
-__projectroot__/lib/X11/fonts/100dpi/:unscaled
-__projectroot__/lib/X11/fonts/Type1/
-__projectroot__/lib/X11/fonts/CID/
-__projectroot__/lib/X11/fonts/Speedo/
-__projectroot__/lib/X11/fonts/75dpi/
-__projectroot__/lib/X11/fonts/100dpi/
+.I __projectroot__/lib/X11/fonts/local/
+.I __projectroot__/lib/X11/fonts/misc/
+.I __projectroot__/lib/X11/fonts/75dpi/:unscaled
+.I __projectroot__/lib/X11/fonts/100dpi/:unscaled
+.I __projectroot__/lib/X11/fonts/Type1/
+.I __projectroot__/lib/X11/fonts/CID/
+.I __projectroot__/lib/X11/fonts/Speedo/
+.I __projectroot__/lib/X11/fonts/75dpi/
+.I __projectroot__/lib/X11/fonts/100dpi/
 .fi
 .RE
 .PP
@@ -331,8 +331,13 @@ When this entry is not specified in the config file, the server falls back
 to the compiled-in default RGB path, which is:
 .PP
 .RS 11
-__projectroot__/lib/X11/rgb
+.I __projectroot__/lib/X11/rgb
 .RE
+.PP
+Note that an implicit
+.I .txt
+is added to this path if the server was compiled to use text rather than
+binary format RGB color databases.
 .TP 7
 .BI "ModulePath \*q" path \*q
 sets the search path for loadable X server modules.  This path is a
@@ -367,7 +372,10 @@ still recognised.  Those old style entries are not documented here, and
 using them is discouraged.
 .PP
 .B Options
-specified in this section may be overridden by
+specified in this section (with the exception of the
+.B \*qDefaultServerLayout\*q
+.BR Option )
+may be overridden by
 .B Options
 specified in the active
 .B ServerLayout
@@ -375,6 +383,13 @@ section.  Options with command line equivalents are overridden when their
 command line equivalent is used.  The options recognised by this section
 are:
 .TP 7
+.BI "Option \*qDefaultServerLayout\*q  \*q" layout-id \*q
+This specifies the default
+.B ServerLayout
+section to use in the absence of the
+.B \-layout
+command line option.
+.TP 7
 .BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
 This prevents the X server from trapping a range of unexpected
 fatal signals and exiting cleanly.  Instead, the X server will die
@@ -440,6 +455,10 @@ by a function key
 This prevents the X server trapping the
 keys used for the default VT switch sequence, which means that clients can
 access them.  Default: off.
+.TP 7
+.BI "Option \*qXkbDisable\*q \*q" boolean \*q
+disable/enable the XKEYBOARD extension.  The \-kb command line
+option overrides this config file option.  Default: XKB is enabled.
 .\" The following four options are "undocumented".
 .ig
 .TP 7
@@ -523,7 +542,7 @@ enable or disable XINERAMA extension. Default is disabled.
 .BI "Option \*qAllowDeactivateGrabs\*q \*q" boolean \*q
 This option enables the use of the
 .B Ctrl+Alt+Keypad-Divide
-key sequence to desactivate any active keyboard and mouse grabs.
+key sequence to deactivate any active keyboard and mouse grabs.
 Default: off.
 .TP 7
 .BI "Option \*qAllowClosedownGrabs\*q \*q" boolean \*q
@@ -531,7 +550,7 @@ This option enables the use of the
 .B Ctrl+Alt+Keypad-Multiply
 key sequence to kill clients with an active keyboard or mouse grab as well
 as killing any application that may have locked the server,
-normally using the XGrabServer(3) Xlib function.
+normally using the XGrabServer(__libmansuffix__) Xlib function.
 Default: off.
 .br
 Note that the options
@@ -1236,6 +1255,7 @@ flags may be specified in the
 section.  Some are driver-specific and are described in the driver
 documentation.  Others are driver-independent, and will eventually be
 described here.
+.\" XXX These should really be in an xaa man page.
 .TP 7
 .BI "Option \*qAccel\*q"
 Enables XAA (X Acceleration Architecture), a mechanism that makes video
@@ -1474,6 +1494,7 @@ The visual type available for the depth 1 (monochrome) is
 .TP 7
 .BI "Black  " "red green blue"
 This optional entry allows the "black" colour to be specified.  This
+is only supported at depth 1.  The default is black.
 .TP 7
 .BI "White  " "red green blue"
 This optional entry allows the "white" colour to be specified.  This
@@ -1501,7 +1522,12 @@ it also specifies the relative layout of the heads.  A
 .B ServerLayout
 section is considered "active" if it is referenced by the
 .B \-layout
-command line option.  If that option is not used, the first
+command line option or by an
+.B "Option \*qDefaultServerLayout\*q"
+entry in the
+.B ServerFlags
+section (the former takes precedence over the latter).  If those options are
+not used, the first
 .B ServerLayout
 section found in the config file is considered the active one.  If no
 .B ServerLayout
@@ -1558,11 +1584,17 @@ field describes the way multiple screens are positioned.  There are
 a number of different ways that this information can be provided:
 .RS 7
 .TP 4
+.I  "x y"
+.TP 4
 .BI "Absolute  " "x y"
-This says that the upper left corner's coordinates are
+These both specify that the upper left corner's coordinates are
 .RI ( x , y ).
-If the coordinates are omitted or if no positioning information
-is given, (0,0) is assumed.
+The
+.B Absolute
+keyword is optional.  Some older versions of XFree86 (4.2 and earlier) don't
+recognise the
+.B Absolute
+keyword, so it's safest to just specificy the coorindates without it.
 .TP 4
 .BI "RightOf   \*q" screen-id \*q
 .TP 4
@@ -1573,7 +1605,14 @@ is given, (0,0) is assumed.
 .BI "Below     \*q" screen-id \*q
 .TP 4
 .BI "Relative  \*q" screen-id \*q " x y"
-These give the screen's location relative to another screen.
+These give the screen's location relative to another screen.  The first four
+position the screen immediately to the right, left, above or below the
+other screen.  When positioning to the right or left, the top edges are
+aligned.  When positioning above or below, the left edges are aligned.
+The
+.B Relative
+form specifies the offset of the screen's origin (upper left corner)
+relative to the origin of another screen.
 .RE
 .TP 7
 .BI "InputDevice  \*q" idev-id "\*q \*q" option \*q " ..."
@@ -1588,8 +1627,8 @@ section being referenced.  Multiple
 fields may be specified, each in double quotes.  The options permitted
 here are any that may also be given in the
 .B InputDevice
-sections.  Normally only session-specific input device options would
-be used here.  The most commonly used options are:
+sections.  Normally only session-specific input device options would be
+used here.  The most commonly used options are:
 .PP
 .RS 11
 .nf
@@ -1652,42 +1691,46 @@ For an example of an XF86Config file, see the file installed as
 __projectroot__/lib/X11/XF86Config.eg.
 .fi
 .SH "SEE ALSO"
-X(__miscmansuffix__), Xserver(1), XFree86(1),
-apm(__drivermansuffix__),
-ati(__drivermansuffix__),
-chips(__drivermansuffix__),
-cirrus(__drivermansuffix__),
-cyrix(__drivermansuffix__),
-fbdev(__drivermansuffix__),
-glide(__drivermansuffix__),
-glint(__drivermansuffix__),
-i128(__drivermansuffix__),
-i740(__drivermansuffix__),
-i810(__drivermansuffix__),
-imstt(__drivermansuffix__),
-mga(__drivermansuffix__),
-neomagic(__drivermansuffix__),
-nv(__drivermansuffix__),
-r128(__drivermansuffix__),
-rendition(__drivermansuffix__),
-s3virge(__drivermansuffix__),
-siliconmotion(__drivermansuffix__),
-sis(__drivermansuffix__),
-sunbw2(__drivermansuffix__),
-suncg14(__drivermansuffix__),
-suncg3(__drivermansuffix__),
-suncg6(__drivermansuffix__),
-sunffb(__drivermansuffix__),
-sunleo(__drivermansuffix__),
-suntcx(__drivermansuffix__),
-tdfx(__drivermansuffix__),
-tga(__drivermansuffix__),
-trident(__drivermansuffix__),
-tseng(__drivermansuffix__),
-v4l(__drivermansuffix__),
-vesa(__drivermansuffix__),
-vga(__drivermansuffix__),
-vmware(__drivermansuffix__),
+.IR X(__miscmansuffix__),
+.IR Xserver(1),
+.IR XFree86(1),
+.IR apm(__drivermansuffix__),
+.\" .IR ati(__drivermansuffix__),
+.IR chips(__drivermansuffix__),
+.IR cirrus(__drivermansuffix__),
+.IR cyrix(__drivermansuffix__),
+.IR fbdev(__drivermansuffix__),
+.IR glide(__drivermansuffix__),
+.IR glint(__drivermansuffix__),
+.IR i128(__drivermansuffix__),
+.IR i740(__drivermansuffix__),
+.IR i810(__drivermansuffix__),
+.IR imstt(__drivermansuffix__),
+.IR mga(__drivermansuffix__),
+.IR neomagic(__drivermansuffix__),
+.IR nv(__drivermansuffix__),
+.IR r128(__drivermansuffix__),
+.IR rendition(__drivermansuffix__),
+.IR savage(__drivermansuffix__),
+.IR s3virge(__drivermansuffix__),
+.\" .IR shadowfb(__drivermansuffix__),
+.IR siliconmotion(__drivermansuffix__),
+.IR sis(__drivermansuffix__),
+.IR sunbw2(__drivermansuffix__),
+.IR suncg14(__drivermansuffix__),
+.IR suncg3(__drivermansuffix__),
+.IR suncg6(__drivermansuffix__),
+.IR sunffb(__drivermansuffix__),
+.IR sunleo(__drivermansuffix__),
+.IR suntcx(__drivermansuffix__),
+.IR tdfx(__drivermansuffix__),
+.IR tga(__drivermansuffix__),
+.IR trident(__drivermansuffix__),
+.IR tseng(__drivermansuffix__),
+.IR v4l(__drivermansuffix__),
+.IR vesa(__drivermansuffix__),
+.IR vga(__drivermansuffix__),
+.IR vmware(__drivermansuffix__),
 .br
 README
 .IR <http://www.xfree86.org/current/README.html> ,
diff --git a/xc/programs/Xserver/hw/xfree86/XFree86.man b/xc/programs/Xserver/hw/xfree86/XFree86.man
index e99167211..f8f78e58d 100644
--- a/xc/programs/Xserver/hw/xfree86/XFree86.man
+++ b/xc/programs/Xserver/hw/xfree86/XFree86.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.man,v 3.54 2002/01/17 17:10:37 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.man,v 3.55 2002/10/12 16:06:43 herrb Exp $ 
 .TH XFree86 1 __vendorversion__
 .SH NAME
 XFree86 - X11R6 X server
@@ -77,7 +77,7 @@ To globally override the compiled-in defaults, you should define (and
 export if using \fIsh\fP or \fIksh\fP) \fIXLOCAL\fP globally.  If you
 use \fIstartx/xinit\fP, the definition should be at the top of
 your \fI.xinitrc\fP file.  If you use \fIxdm\fP, the definitions should be
-early on in the \fI<XRoot>/lib/X11/xdm/Xsession\fP script.
+early on in the \fI __projectroot__/lib/X11/xdm/Xsession\fP script.
 .SH OPTIONS
 In addition to the normal server options described in the \fIXserver(1)\fP
 manual page, \fIXFree86\fP accepts the following command line switches:
@@ -368,6 +368,20 @@ This can be disabled with the
 .B DontZoom
 XF86Config(__filemansuffix__) file option.
 .TP 8
+.B Ctrl+Alt+Keypad-Multiply
+Not treated specially by default.  If the
+.B AllowClosedownGrabs
+XF86Config(__filemansuffix__) file option is specified, this key sequence
+kills clients with an active keyboard or mouse grab as well as killing any
+application that may have locked the server, normally using the
+XGrabServer(__libmansuffix__) Xlib function.
+.TP 8
+.B Ctrl+Alt+Keypad-Divide
+Not treated specially by default.  If the
+.B AllowDeactivateGrabs
+XF86Config(__filemansuffix__) file option is specified, this key sequence
+deactivates any active keyboard and mouse grabs.
+.TP 8
 .B Ctrl+Alt+F1...F12
 For BSD and Linux systems with virtual terminal support, these keystroke
 combinations are used to switch to Virtual Console 1 through 12.
diff --git a/xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c b/xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c
index 3d507b012..1c163b2bf 100644
--- a/xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c
+++ b/xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.21 2001/05/25 21:43:16 paulo Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.22 2002/10/08 22:14:03 tsi Exp $ */
 
 /* xf86DDC.c 
  * 
@@ -10,7 +10,9 @@
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
 
+#ifdef XFree86LOADER
 static const OptionInfoRec *DDCAvailableOptions(void *unused);
+#endif
 
 const char *i2cSymbols[] = {
     "xf86CreateI2CDevRec",
@@ -133,12 +135,14 @@ static const OptionInfoRec DDCOptions[] = {
     { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
 };
 
+#ifdef XFree86LOADER
 /*ARGSUSED*/
 static const OptionInfoRec *
 DDCAvailableOptions(void *unused)
 {
     return (DDCOptions);
 }
+#endif
 
 xf86MonPtr 
 xf86DoEDID_DDC1(
diff --git a/xc/programs/Xserver/hw/xfree86/doc/DESIGN b/xc/programs/Xserver/hw/xfree86/doc/DESIGN
index aaa6eceb7..8f6970083 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/DESIGN
+++ b/xc/programs/Xserver/hw/xfree86/doc/DESIGN
@@ -2,7 +2,7 @@
 
                           The XFree86 Project, Inc
 
-                         Last modified 1 August 2001
+                          Last modified 18 May 2002
 
 NOTE: This is a DRAFT document, and the interfaces described here are subject
 to change without notice.
@@ -2109,8 +2109,8 @@ Next, the higher level functions that most drivers would use.
           of options that isn't marked as used.  This is intended
           to show options that the driver hasn't recognised.  It
           would normally be called near the end of the Chip-
-          ScreenInit() function, but only when serverGenera-
-          tion == 1.
+          ScreenInit() function, but only when
+          serverGeneration == 1.
 
      OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int
      token)
@@ -4063,6 +4063,11 @@ improve the consistency of driver behaviour.
 
                     No prefix.
 
+               X_NOT_IMPLEMENTED
+
+                    The message relates to functionality
+                    that is not yet implemented.
+
      xf86MsgVerb(MessageType type, int verb, const char *format, ...)
 
           Like xf86Msg(), but with the verbosity level given
@@ -4821,9 +4826,9 @@ pixel clock values on older hardware.
 
      Bool xf86IsUnblank(int mode)
 
-          Returns FALSE when the screen saver mode specified by
-          mode requires the screen be unblanked, and TRUE other-
-          wise.  The screen saver modes that require blanking are
+          Returns TRUE when the screen saver mode specified by mode
+          requires the screen be unblanked, and FALSE otherwise.
+          The screen saver modes that require blanking are
           SCREEN_SAVER_ON and SCREEN_SAVER_CYCLE, and the screen
           saver modes that require unblanking are SCREEN_SAVER_OFF
           and SCREEN_SAVER_FORCER.  Drivers may call this helper
@@ -6346,7 +6351,7 @@ eScreen() function.
          ZZZFreeRec(xf86Screens[scrnIndex]);
      }
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.47 2002/01/16 20:38:44 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.49 2002/05/18 20:52:22 herrb Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.40 2002/01/16 20:51:01 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.42 2002/05/18 20:58:41 herrb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Imakefile b/xc/programs/Xserver/hw/xfree86/doc/Imakefile
index bd273a769..dca78369c 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/doc/Imakefile
@@ -4,7 +4,7 @@ XCOMM $XConsortium: Imakefile /main/33 1996/10/28 05:12:24 kaleb $
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.79 2001/11/15 18:12:50 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.80 2002/06/03 21:22:08 dawes Exp $
 
 #include <Server.tmpl>
 #include <lnxdoc.rules>
@@ -38,7 +38,7 @@ OSREADMES = \
 	ReadmeFile(OpenBSD)	\
 	/*ReadmeFile(OS2)*/	\
 	/*OS2.Notes*/		\
-	/*ReadmeFile(SCO)*/	\
+	ReadmeFile(SCO)		\
 	/*ReadmeFile(Solaris)*/	\
 	/*ReadmeFile(SOLX86)*/	\
 	/*ReadmeFile(SVR4)*/	\
diff --git a/xc/programs/Xserver/hw/xfree86/doc/README.Solaris b/xc/programs/Xserver/hw/xfree86/doc/README.Solaris
new file mode 100644
index 000000000..eccf3615c
--- /dev/null
+++ b/xc/programs/Xserver/hw/xfree86/doc/README.Solaris
@@ -0,0 +1,222 @@
+                           Information for Solaris
+
+              David Holland, modified by Marc Aurele La France
+
+                               2001 October 01
+
+1.  What is XFree86
+
+XFree86 is a port of X11R6.5.1 that supports several versions of Unix.  It is
+derived from X386 1.2 which was the X server distributed with X11R5.  This
+release consists of many new features and performance improvements as well as
+many bug fixes.  The release is available as a source code distribution, as
+well as binary distributions for many architectures.
+
+The sources for XFree86 are available by anonymous ftp from:
+
+     ftp://ftp.XFree86.org/pub/XFree86/current
+
+Solaris binaries for XFree86 are available for anonymous ftp at the same
+address.  Currently, two binary distributions are available:  one for Solaris
+8 x86, the other for previous Solaris x86 releases.  They are not inter-
+changeable.  No binary distribution is available for Solaris/SPARC as it is
+still under development.
+
+2.  The VT-switching sub-system in Solaris x86
+
+The virtual terminal sub-system is a undocumented, and unsupported feature of
+Solaris x86.  Therefore if you use virtual terminals, you do so at YOUR OWN
+RISK.
+
+Virtual terminals are not available in Solaris SPARC, and their availability
+has been removed in Solaris8 x86.
+
+When available, the virtual terminals of Solaris work basically the same way
+as most other SVR4 VT sub-systems.  However, there are a number of limita-
+tions documented below.
+
+First, if you are running a Solaris 2.4 x86 system, and you want VT's, you
+will have to create the necessary devices first, so become root.
+
+Verify the chanmux device driver's major number is 100:
+
+          # grep -i chanmux /etc/name_to_major
+          chanmux 100
+          #
+
+If the number after 'chanmux' is anything but 100, I would suggest you imme-
+diately abort your attempt to create virtual terminals, and learn to live
+without them.
+
+However, if it is 100, then as root type the following commands to create the
+maximum allowable number of virtual terminals.
+
+          # cd /dev
+          # mknod vt01 c 100 1
+          # mknod vt02 c 100 2
+          # mknod vt03 c 100 3
+          # mknod vt04 c 100 4
+          # mknod vt05 c 100 5
+          # mknod vt06 c 100 6
+          # mknod vt07 c 100 7
+
+There is no need for a reconfiguration boot.
+
+Secondly, for both 2.1, and 2.4 x86 systems, add a few lines to the inittab
+to enable logins on them.
+
+(Note, do NOT make a mistake here, you could lock yourself out of the system)
+
+     --------------------->Snip Snip<-----------------------------------------------
+     v1:234:respawn:/usr/lib/saf/ttymon -g -h -p "`uname -n` VT01 login: " -T AT386 -d /dev/vt01 -l console
+     v2:234:respawn:/usr/lib/saf/ttymon -g -h -p "`uname -n` VT02 login: " -T AT386 -d /dev/vt02 -l console
+     v3:234:respawn:/usr/lib/saf/ttymon -g -h -p "`uname -n` VT03 login: " -T AT386 -d /dev/vt03 -l console
+     v4:234:respawn:/usr/lib/saf/ttymon -g -h -p "`uname -n` VT04 login: " -T AT386 -d /dev/vt04 -l console
+     ---------------------->End Here<-----------------------------------------------
+
+These four lines enable four VT's on Alt-SysReq-F1 through Alt-SysReq-F4.
+
+Then execute the command 'init q' to immediately enable the virtual termi-
+nals.
+
+The keys used for VT switching are as follows:
+
+     Alt-SysReq-F1 through Alt-SysReq-F7 enable VT screens 1-7 respec-
+     tively (if the VT is active).
+
+     Alt-SysReq-n enables the next active VT screen.
+
+     Alt-SysReq-p enables the previous active VT screen.
+
+     Alt-SysReq-h returns to the console.
+
+If you are using virtual terminals, you must leave at least one free for use
+by the Xserver.
+
+Limitations of the virtual terminal sub-system under Solaris x86:
+
+There are only a total of 8 available VT's (7 normal VT's + 1 console) not
+the usual 15.  If you have all 8 allocated, and you attempt to allocate a
+additional VT you will panic the system.  (This bug is worked around in the
+Solaris XFree86 Xserver.)
+
+From a programming stand point, they work pretty much as documented in the
+AT&T Unix System V/386 Release 4 Integrated Software Development Guide, how-
+ever a number of ioctl() calls are broken.
+
+3.  Notes for building XFree86 on Solaris
+
+  1.  Both GCC, and ProWorks are supported by XFree86.  The minimum recom-
+      mended GCC release is 2.7.2.  Some earlier GCC's are known to not work
+      and should be avoided.
+
+      You should also make certain your version of GCC predefines `sun'.  If
+      needed edit /usr/local/lib/gcc-lib/*/*/specs, and modify the *prede-
+      fines: line.
+
+      On SPARCs, regardless of the compiler you use, ensure it generates
+      32-bit binaries.  At this time, 64-bit binaries will probably not work.
+
+  2.  Also on SPARCs, you will need to set BuildXFree86OnSparcSunOS to YES in
+      ~xc/config/cf/host.def.  Otherwise, you can only build the old depre-
+      cated Xsun* servers.
+
+  3.  A Threaded Xlib compiled with GCC has subtle problems.  It'll work 98%
+      of the time, however clients will occasionally exhibit strange hangs.
+      Most notably image viewers such as xv-3.10 exhibit this problem.
+
+      It is recommended that you set ThreadedX in ~xc/config/cf/host.def to
+      NO, if you are using GCC.  ProWorks does not have this problem.
+      Whether this behaviour still exists with newer GCC's has not been veri-
+      fied.
+
+  4.  To build XFree86 with GCC you need gcc and (optionally) c++filt from
+      GNU binutils.  Don't install gas or ld from GNU binutils, use the one
+      provided by Sun.
+
+      You might need to setup a /opt/SUNWspro/bin directory containing sym-
+      bolic links named cc, CC, and c++filt pointing respectively to the
+      actual gcc, g++ and c++filt commands.
+
+  5.  If you are using ProWorks to compile the XFree86 distribution, you need
+      to modify your PATH appropriately so the ProWorks tools are available.
+      Normally, they should be in /opt/SUNWspro/bin
+
+  6.  You MUST put /usr/ccs/bin at the front of your PATH.  There are known
+      problems with some GNU replacements for the utilities found there.  So
+      the /usr/ccs/bin versions of these programs must be found before any
+      possible GNU versions.  (Most notably GNU 'ar' does not work during the
+      build).
+
+4.  Notes for running XFree86 on Solaris
+
+  1.  Depending on the release or architecture of Solaris you are running,
+      you might need to install an OS driver for an aperture device.
+
+      Under Solaris x86 2.5 and later, there's a system driver (/dev/xsvc)
+      that provides this functionality.  It will be detected automatically by
+      the server, so you don't need to install the aperture driver.
+
+      For older Solaris x86 and for Solaris SPARC releases, the source for
+      this driver is included in xc/programs/Xserver/hw/xfree86/etc/apSo-
+      laris.shar of the source distribution.  This file can usually also be
+      found in the /usr/X11R6/lib/X11/etc directory when XFree86 is
+      installed.  Building, and installing the driver is relatively straight
+      forward. Please read its accompanying README file.
+
+  2.  If you have not made the Virtual Terminal devices, you will need to
+      specify the terminal device to run the Xserver on.  The correct device
+      is vt00 so your xinit command would look like so:
+
+                xinit -- vt00
+
+      If you have made the virtual terminal devices you do not need to spec-
+      ify the VT to run the Xserver on.
+
+  3.  For Solaris you will probably want to set your LD_LIBRARY_PATH to
+      /usr/X11R6/lib:/usr/openwin/lib:/usr/dt/lib.  Including /usr/X11R6/lib
+      in your LD_LIBRARY_PATH is probably not necessary, however it doesn't
+      hurt. :)
+
+      Including /usr/openwin/lib in the LD_LIBRARY_PATH is recommended
+      because some Sun supplied binaries were not compiled with LD_RUN_PATH
+      set properly at compile time.
+
+      Motif and CDE applications may require /usr/dt/lib in your
+      LD_LIBRARY_PATH too.
+
+  4.  Xqueue is NOT supported under Solaris.  The includes necessary for
+      Xqueue are available, however the driver does not seem to be in the
+      kernel.  (Go figure)
+
+  5.  If you want to use xdm with Solaris, extract the files from the shar
+      file in /usr/X11R6/lib/X11/etc/XdmConf.svr4 into a temporary directory.
+      The README file tells where the individual files need to be installed.
+      Be sure to read through each file and make any site-specific changes
+      that you need.
+
+5.  Known bugs, and work arounds with Solaris
+
+  1.  The Solaris 2.1 for x86 OpenWindows filemgr does not work against a
+      X11R5 Xserver, it probably will also not work against a X11R6 Xserver.
+      Attempting to 'Drag and Drop' a file causes the filemgr to abort with
+      an 'X error'
+
+      Solaris x86 2.4 does not have this problem.
+
+      There is no known work around.
+
+  2.  The SPARC port is still quite new, so instability is to be expected
+      (and reported!).  It might even have broken some aspects of the x86
+      port.
+
+6.  Bug Notification
+
+Bug reports should be sent to one of the XFree86@XFree86.org,
+Xpert@XFree86.org, or Newbie@XFree86.org (depending on your level of com-
+fort).
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3 2002/01/25 21:55:53 tsi Exp $
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Solaris,v 1.3 2002/01/28 22:24:17 tsi Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/README.ati b/xc/programs/Xserver/hw/xfree86/doc/README.ati
index c0c02cf7f..1754d0b6a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/README.ati
+++ b/xc/programs/Xserver/hw/xfree86/doc/README.ati
@@ -2,7 +2,7 @@
 
                             Marc Aurele La France
 
-                                2001 April 10
+                              2002 February 12
 
                                   Abstract
 
@@ -38,6 +38,10 @@ file.  See the ``XF86Config specifications'' section below for details.
 If none of the above conditions are met, the ATI driver will essentially dis-
 able itself to allow other drivers to examine the system.
 
+Note that I am currently considering removing the driver's support for
+generic VGA.  If you have any concerns about this, please contact me at
+tsi@xfree86.org.
+
 2.  A note on acceleration
 
 The meaning of ``acceleration'', as used in this document, needs to be clari-
@@ -391,9 +395,9 @@ said to be clones of one of the above) might generate non-zero frequencies
 for those that are zero above, or vice-versa.
 
 The order of the clocks is very important, although the driver will reorder
-the clocks if it deems it appropriate to do so.  Mach32 and Mach64 owners
-should note that this order is different than what they would use for previ-
-ous XFree86 accelerated servers.
+the specified clocks if it deems it appropriate to do so.  Mach32 and Mach64
+owners should note that this order is different than what they would use for
+previous XFree86 accelerated servers.
 
 5.6.4  Clocks for non-ATI adapters
 
@@ -403,22 +407,31 @@ clock will typically be 25.175 MHz, but there are exceptions.  You can
 include up to four clock frequencies in your XF86Config to specify the actual
 values used by the adapter.  Any more will be ignored.
 
-5.7  Option ``crt_screen''
+5.7  Option ``nopanel_display''
 
 This specification is only effective when the driver detects that the
 adapter's BIOS has initialised both the digital flat panel and CRT inter-
 faces.  In such a situation, the driver will normally drive both the panel
 and the CRT.  This specification causes the driver to disable the digital
-flat panel and display the screen image on the CRT instead.
+flat panel and display the screen image on the CRT instead, which could
+potentially allow for larger physical resolutions than the panel can handle.
+
+5.8  Option ``crt_display''
 
-5.8  Option ``noaccel''
+This specification is only effective when the driver detects that the
+adapter's BIOS has initialised the digital flat panel interface, but has dis-
+abled the CRT interface.  In such a situation the driver will normally drive
+only the panel.  This specification causes the driver to instead display the
+same image on both the panel and the CRT.
+
+5.9  Option ``noaccel''
 
 By default, the driver will accelerate draw operations if a Mach64 CRTC is
 used to drive the display.  As implemented in this driver, acceleration does
 not require a linear video memory aperture.  This option disables this accel-
 eration.
 
-5.9  Option ``nolinear''
+5.10  Option ``nolinear''
 
 By default, the driver will enable a linear video memory aperture for
 256-colour and higher depth modes if it is also using a Mach64 accelerator
@@ -428,17 +441,18 @@ aperture.
 On non-Intel platforms, the driver requires a linear aperture and, so, this
 option is ignored.
 
-5.10  Option ``HWCursor'' and Option ``SWCursor''
+5.11  Option ``HWCursor'' and Option ``SWCursor''
 
 Option ``HWCursor'', which is the default, specifies that hardware facilities
 are to be used to paint the mouse pointer on the screen.  Option ``SWCursor''
-specifies that the mouse pointer is to by drawn by software, which is much
+specifies that the mouse pointer is to be drawn by software, which is much
 slower.  If both options are specified, option ``SWCursor'' prevails.  Cur-
 rently, these options are only acted upon for 256-colour or higher depth
 modes, if a Mach64 accelerator CRTC, or a Mach64 integrated controller is
-being used.  In all other situations, a software cursor will be used.
+being used.  In all other situations, a software cursor will be used, regard-
+less of what these options specify.
 
-5.11  Option ``SilkenMouse''
+5.12  Option ``SilkenMouse''
 
 This option is only acted upon when a hardware cursor is being used.  It
 specifies that the cursor's position on the screen is to be updated as
@@ -446,7 +460,7 @@ quickly as possible when the mouse is moved.  This is the default behaviour.
 If this option is negated, the cursor may lag the mouse when the X server is
 very busy.
 
-5.12  Option ``shadowfb''
+5.13  Option ``shadowfb''
 
 If this option is enabled, the driver will cause the CPU to do each drawing
 operation first into a shadow frame buffer in system virtual memory and then
@@ -462,19 +476,19 @@ Note that, due to various limitations, this option is forcibly disabled when
 a linear video memory aperture is not enabled, when the frame buffer depth is
 less than 8, or when acceleration is used.
 
-5.13  Option ``dpms''
+5.14  Option ``dpms''
 
 This option enables the driver's support for VESA's Display Power Management
 Specification.
 
-5.14  Option ``backingstore''
+5.15  Option ``backingstore''
 
 This is not specifically a driver option.  It is used to enable the server's
 support for backing store, a mechanism by which pixel data for occluded win-
 dow regions is remembered by the server thereby alleviating the need to send
 expose events to X clients when the data needs to be redisplayed.
 
-5.15  MemBase address
+5.16  MemBase address
 
 This specification is only effective for non-PCI Mach64 adapters, and is used
 to override the CPU address at which the adapter will map its video memory.
@@ -488,14 +502,14 @@ ing to the PCI Plug'n'Play specification which arbitrates the resource
 requirements of most devices in the system.  This means the driver can not
 easily change the linear aperture address.
 
-5.16  Option ``ReferenceClock'' ``frequency''
+5.17  Option ``ReferenceClock'' ``frequency''
 
 This option is only applicable to non-Intel platforms, where an adapter BIOS
 is not available to the driver.  The option specifies the reference frequency
 used by the adapter's clock generator.  The default is 14.318 MHz, and other
 typical values are 28.636, or 29.5 MHz.
 
-5.17  ClockChip ``name''
+5.18  ClockChip ``name''
 
 This option is only applicable to non-Intel platforms, where an adapter BIOS
 is not available to the driver, and the driver cannot reliably determine
@@ -523,33 +537,17 @@ not yield a usable mode), the server will automatically select as a default
 resolution the largest usable mode, whether or not the chosen mode is speci-
 fied in the corresponding ``Monitor'' section.
 
-For a CRT monitor, you should still specify horizontal sync and vertical
-refresh rates in the corresponding ``Monitor'' section.  Otherwise, the
-server will default these to those of a VGA monitor, which will limit resolu-
-tions to not much more than 640x480 at 72 Hz.  For a digital flat panel, any
-sync tolerances should be removed from the corresponding ``Monitor'' section.
-The driver will automatically calculate these from the mode that is active on
-server entry.  The driver also inserts timings for a mode called "Native
-panel mode" that represents the panel's native resolution.
+For a digital flat panel, any sync tolerances should be removed from the cor-
+responding ``Monitor'' section.  The driver will automatically calculate
+these from the mode that is active on server entry.  The driver also inserts
+timings for a mode called "Native panel mode" that represents the panel's
+native resolution.
 
 7.  Known problems and limitations
 
 There are several known problems or limitations related to the XFree86 ATI
 driver.  They include:
 
-   o A number of system lockups and blank screens have been reported when
-     using PCI Mach64 adapters.  The great majority of these problems have
-     been found to be due to system aspects that are unrelated to this
-     driver.  As of this writing, these problems can be divided into two gen-
-     eral areas:
-
-     Improper mouse protocol specification with some recent mice.  Try dif-
-     ferent protocol specifications or another mouse.
-
-     A system conflict with APM.  This problem is Linux-specific.  There is a
-     bug in kernels 2.0.31 or earlier that prevents proper APM operation.
-     Upgrade to a more recent kernel or disable APM support in the kernel.
-
    o When using a Mach64's accelerator CRTC, the virtual resolution must be
      less than 8192 pixels wide.  The VGA CRTC further limits the virtual
      resolution width to less than 4096 pixels, or to less than 2048 pixels
@@ -598,8 +596,23 @@ driver.  They include:
      damage the adapter.
 
    o Except as in the previous items, clocks are limited to 80MHz on most
-     adapters, although many are capable of higher frequencies.  This will be
-     fixed in a future release.
+     adapters, although many are capable of higher frequencies.  This will
+     eventually be fixed in a future release.
+
+   o The use of a laptop's hot-keys to switch displays while this driver is
+     active can cause lockups and/or other woes, and is therefore not recom-
+     mended.  It is not currently possible to solve this problem.
+
+   o In situations where the driver is to simultaneously display on both a
+     panel and a CRT, the same image will be seen on both.  In particular,
+     this means the CRT must be able to synchronise with the timings of the
+     panel's native resolution.  This is quite evident when the panel has
+     ``odd-ball'' dimensions, such as 1400x1050, a resolution not commonly
+     possible on CRTs or projection equipment.
+
+     Also, the display of independant images on the panel and CRT is not cur-
+     rently implemented, and might never be, pending resolution of the previ-
+     ous item.
 
 Support for the following will be added in a future release:
 
@@ -632,8 +645,8 @@ uncertain.
 Secondly, please check XFree86's doc directory for additional information.
 
 Thirdly, a scan through the comp.windows.x.i386unix and comp.os.linux.x news-
-groups using your favourite archiving service can also prove useful in
-resolving problems.
+groups and the newbie or xpert mailing lists using your favourite archiving
+service can also prove useful in resolving problems.
 
 If you are still experiencing problems, you can send me non-HTMLised e-mail
 at <tsi@xfree86.org>.  Please be as specific as possible when describing the
@@ -650,13 +663,13 @@ adapter under X386 1.1a.  This original driver might have actually been based
 on a non-functional ATI driver written by Thomas Roell (currently of Xi
 Graphics).
 
-Then Doug Evans (dje@cygnus.com) added support for the ATI VGA Wonder XL,
-trying in the process to make the driver work with all other ATI adapters
-available at the time.
+Then Doug Evans added support for the ATI VGA Wonder XL, trying in the pro-
+cess to make the driver work with all other ATI adapters available at the
+time.
 
-Rik Faith (faith@precisioninsight.com) obtained the X11R4 driver from Doug
-Evans in the summer of 1992 and ported the code to the X386 part of X11R5.
-This subsequently became part of XFree86.
+Rik Faith obtained the X11R4 driver from Doug Evans in the summer of 1992 and
+ported the code to the X386 part of X11R5.  This subsequently became part of
+XFree86.
 
 I (Marc Aurele La France) took over development and maintenance of the driver
 in the fall of 1993 after Rik got rid of his VGA Wonder adapter.
@@ -690,7 +703,7 @@ newer driver API of XFree86 4.0 and later.
 The introduction of version 6 is a first swipe at porting the driver to non-
 Intel architectures.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.39 2002/01/16 16:25:54 tsi Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.40 2002/02/14 22:08:00 tsi Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.59 2002/01/16 20:51:02 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.60 2002/02/14 22:21:35 tsi Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/RELNOTES b/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
index c236acaec..6c5d6cebb 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
+++ b/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
@@ -788,7 +788,7 @@ the Xft man page.
 
 4.11.2  FreeType support in Xft
 
-XFree86 4.2.0 includes sources for FreeType version 2.0.1, and, by default,
+XFree86 4.2.0 includes sources for FreeType version 2.0.6, and, by default,
 they are built and installed automatically.
 
 If you prefer, you can configure XFree86 4.2.0 to use an existing Freetype2
@@ -813,14 +813,11 @@ Render extension and the Xft and FreeType libraries to provide anti-aliased
 text.  Xterm, xditview and x11perf.  Migration of other applications may
 occur in future releases.
 
-By default, xterm uses core fonts through the standard core API.  It has two
-command line options and associated resources to direct it to use Xft
-instead:
+By default, xterm uses core fonts through the standard core API.  It has a
+command line option and associated resource to direct it to use Xft instead:
 
    o -fa family / .VT100.faceName: family.  Selects the font family to use.
 
-   o -fs pointsize / .VT100.faceSize: pointsize.  Selects the pointsize.
-
 Xditview will use Xft instead of the core API by default.  X11perf includes
 tests to measure the performance of text rendered in three ways, anti-
 aliased, anti-aliased with sub-pixel sampling and regular chunky text, but
@@ -1046,7 +1043,7 @@ location pointing to the new location.  Some run-time generated files are now
 located under the appropriate subdirectories of /var, again with the relevant
 symbolic links in the old location.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.70 2002/01/17 18:14:59 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.71 2002/01/21 19:01:35 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.104 2002/01/17 23:27:44 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.105 2002/01/22 22:26:10 dawes Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/man/Imakefile b/xc/programs/Xserver/hw/xfree86/doc/man/Imakefile
index 844446f21..74b2ab03e 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/man/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/doc/man/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/Imakefile,v 3.6 2001/11/01 23:35:32 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/Imakefile,v 3.7 2002/10/12 16:06:43 herrb Exp $
 
 MANDIR = $(LIBMANDIR)
 MANSUFFIX = $(LIBMANSUFFIX)
@@ -23,9 +23,7 @@ InstallManPageAliases(XF86Misc,$(MANDIR),XF86MiscQueryExtension XF86MiscQueryVer
 
 #endif
 
-/* XXX Check if this is up to date */
 InstallManPageLong(XF86VM,$(MANDIR),XF86VidMode)
 #if ExpandManNames
-InstallManPageAliases(XF86VidMode,$(MANDIR),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine)
+InstallManPageAliases(XF86VidMode,$(MANDIR),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine XF86VidModeSetClientVersion XF86VidModeGetDotClocks XF86VidModeGetGamma XF86VidModeSetGamma XF86VidModeSetGammaRamp XF86VidModeGetGammaRamp XF86VidModeGetGammaRampSize)
 #endif
-
diff --git a/xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man b/xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
index 03278df1e..cccca39f4 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
+++ b/xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man
@@ -4,7 +4,7 @@
 .\"
 .\"
 .\" Copyright (c) 1996  Joe Moss, The XFree86 Project
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.10 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.11 2002/10/12 16:06:43 herrb Exp $
 .\" 
 .de ZN
 .ie t \fB\^\\$1\^\fR\\$2
@@ -12,7 +12,7 @@
 ..
 .TH XF86VIDMODE 3X11 __vendorversion__ "X FUNCTIONS"
 .SH NAME
-XF86VidModeQueryExtension, XF86VidModeQueryVersion, XF86VidModeGetModeLine, XF86VidModeGetAllModeLines, XF86VidModeDeleteModeLine, XF86VidModeModModeLine, XF86VidModeValidateModeLine, XF86VidModeSwitchMode, XF86VidModeSwitchToMode, XF86VidModeLockModeSwitch, XF86VidModeGetMonitor, XF86VidModeGetViewPort, XF86VidModeSetViewPort \- XFree86-VidMode extension interface functions
+XF86VidModeQueryExtension, XF86VidModeQueryVersion, XF86VidModeSetClientVersion, XF86VidModeGetModeLine, XF86VidModeGetAllModeLines, XF86VidModeDeleteModeLine, XF86VidModeModModeLine, XF86VidModeValidateModeLine, XF86VidModeSwitchMode, XF86VidModeSwitchToMode, XF86VidModeLockModeSwitch, XF86VidModeGetMonitor, XF86VidModeGetViewPort, XF86VidModeSetViewPort, XF86VidModeGetDotClocks, XF86VidModeGetGamma, XF86VidModeSetGamma, XF86VidModeGetGammaRamp, XF86VidModeSetGammaRamp, XF86VidModeGetGammaRampSize \- XFree86-VidMode extension interface functions
 .SH SYNTAX
 .nf
 .LP
@@ -28,6 +28,9 @@ Bool XF86VidModeQueryVersion(
     int *\fImajor_version_return\fP\^,
     int *\fIminor_version_return\fP\^);
 .LP
+Bool XF86VidModeSetClientVersion(
+    Display *\fIdisplay\fP\^);
+.LP
 Bool XF86VidModeGetModeLine(
     Display *\fIdisplay\fP\^,
     int \fIscreen\fP\^,
@@ -38,7 +41,7 @@ Bool XF86VidModeGetAllModeLines(
     Display *\fIdisplay\fP\^,
     int \fIscreen\fP\^,
     int *\fImodecount_return\fP\^,
-    XF86VidModeModeInfo **\fImodesinfo\fP\^);
+    XF86VidModeModeInfo ***\fImodesinfo\fP\^);
 .ig
 .LP
 Bool XF86VidModeAddModeLine(
@@ -94,6 +97,45 @@ Bool XF86VidModeSetViewPort(
     int \fIscreen\fP\^,
     int \fIx\fP\^,
     int \fIy\fP\^);
+.LP
+XF86VidModeGetDotClocks(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    int *\fIflags return\fP\^,
+    int *\fInumber of clocks return\fP\^,
+    int *\fImax dot clock return\fP\^,
+    int **\fIclocks return\fP\^);
+.LP
+XF86VidModeGetGamma(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    XF86VidModeGamma *\fIGamma\fP\^);
+.LP
+XF86VidModeSetGamma(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    XF86VidModeGamma *\fIGamma\fP\^);
+.LP
+XF86VidModeGetGammaRamp(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    int \fIsize\fP\^,
+    unsigned short *\fIred array\fP\^,
+    unsigned short *\fIgreen array\fP\^,
+    unsigned short *\fIblue array\fP\^);
+.LP
+XF86VidModeSetGammaRamp(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    int \fIsize\fP\^,
+    unsigned short *\fIred array\fP\^,
+    unsigned short *\fIgreen array\fP\^,
+    unsigned short *\fIblue array\fP\^);
+.LP
+XF86VidModeGetGammaRampSize(
+    Display *\fIdisplay\fP\^,
+    int \fIscreen\fP\^,
+    int *\fIsize\fP\^);
 .fi
 .SH ARGUMENTS
 .IP \fIdisplay\fP 2i
@@ -185,6 +227,24 @@ typedef struct {
     float	hi;	/* Top of range */
     float	lo;	/* Bottom of range */
 } XF86VidModeSyncRange;
+.LP
+typedef struct {
+    int type;			/* of event */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came from a SendEvent req */
+    Display *display;		/* Display the event was read from */
+    Window root;		/* root window of event screen */
+    int state;			/* What happened */
+    int kind;			/* What happened */
+    Bool forced;		/* extents of new region */
+    Time time;			/* event timestamp */
+} XF86VidModeNotifyEvent;
+.LP
+typedef struct {
+    float red;			/* Red Gamma value */
+    float green;		/* Green Gamma value */
+    float blue;			/* Blue Gamma value */
+} XF86VidModeGamma;
 .fi
 .SH DESCRIPTION
 These functions provide an interface to the server extension
@@ -336,8 +396,18 @@ The function
 .ZN XF86VidModeQueryExtension
 returns the lowest numbered error and event values
 assigned to the extension.
+.SH BUGS
+The
+XF86VidModeSetClientVersion,
+XF86VidModeGetDotClocks,
+XF86VidModeGetGamma,
+XF86VidModeSetGamma,
+XF86VidModeSetGammaRamp,
+XF86VidModeGetGammaRamp,
+and
+XF86VidModeGetGammaRampSize
+functions need to be documented.
 .SH SEE ALSO
 XFree86(1), XF86Config(4/5), xvidtune(1)
 .SH AUTHORS
 Kaleb Keithley, Jon Tombs, David Dawes, and Joe Moss
-
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml
index 154a1b197..fe47754b5 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml
@@ -30,41 +30,50 @@ builds with the native compiler for each platform;
 
 <p>
 There are a few starting points for getting the XFree86 source.  One option
-is to start directly with the XFree86 &relvers; source distribution.  In this
+is to start directly with the XFree86 &fullrelvers; source
+distribution<![ %updaterel; [ and updating it to &relvers; with a source
+patch]]>.  In this
 case, the procedure is as follows:
 <itemize>
-  <item>The XFree86 source is contained in files <tt>X&srcvers;src-1.tgz</tt>,
-	<tt>X&srcvers;src-2.tgz</tt> and <tt>X&srcvers;src-3.tgz</tt>.  These can be found
-	at <htmlurl name="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/source/"
-	url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/source/"> and similar
-	locations on XFree86 mirror sites.  <tt>X&srcvers;src-2.tgz</tt> contains
-	the fonts and documentation source.  <tt>X&srcvers;src-3.tgz</tt> contains
-	the hardcopy documentation.  <tt>X&srcvers;src-1.tgz</tt> contains
-	everything else.  If you don't need the docs or fonts you can get
-	by with only <tt>X&srcvers;src-1.tgz</tt>.
+  <item>The XFree86 source is contained in files
+	<tt>X&fullsrcvers;src-1.tgz</tt>, <tt>X&fullsrcvers;src-2.tgz</tt>
+	and <tt>X&fullsrcvers;src-3.tgz</tt>.  These can be found at
+	<htmlurl
+	name="ftp://ftp.xfree86.org/pub/XFree86/&fullrelvers;/source/"
+	url="ftp://ftp.xfree86.org/pub/XFree86/&fullrelvers;/source/">
+	and similar locations on XFree86 mirror sites.
+	<tt>X&fullsrcvers;src-2.tgz</tt> contains the fonts and
+	documentation source.  <tt>X&fullsrcvers;src-3.tgz</tt> contains
+	the hardcopy documentation.  <tt>X&fullsrcvers;src-1.tgz</tt>
+	contains everything else.  If you don't need the docs or fonts
+	you can get by with only <tt>X&fullsrcvers;src-1.tgz</tt>.
+
   <item>Extract each of these files by running the following from a directory
 	on a filesystem containing enough space (the full source requires
 	around 270MB, and a similar amount is required in addition to this
 	for the compiled binaries):
 	<quote><tt>
-	gzip -d &lt; X&srcvers;src-1.tgz | tar vxf -<newline>
-	gzip -d &lt; X&srcvers;src-2.tgz | tar vxf -<newline>
-	gzip -d &lt; X&srcvers;src-3.tgz | tar vxf -<newline>
+	gzip -d &lt; X&fullsrcvers;src-1.tgz | tar vxf -<newline>
+	gzip -d &lt; X&fullsrcvers;src-2.tgz | tar vxf -<newline>
+	gzip -d &lt; X&fullsrcvers;src-3.tgz | tar vxf -<newline>
 	</tt></quote>
-    <item>If the release is not a full release, it is available as a
-    patch against the previous full release in the 
-<htmlurl
-name="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/"
-url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/">
-directory. Get the patch file from there and apply it by running the
-following command:
-<quote><tt>
-cd <em>the directory containing the</em> xc <em>directory</em><newline>
-gzip -d &lt; <em>file</em> | patch -s -p0 -E 
-</tt>
-</quote>
-Look for special patching instructions in the <htmlurl name="Release
-Notes" url="http://www.xfree86.org/&relvers;/RELNOTES.html">.
+
+<![ %updaterel; [
+  <item>A patch relative to &fullrelvers is available at
+	<htmlurl
+	name="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/"
+	url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/">.
+	The patch file is <tt>&fullrelvers;-&relvers;.diff.gz</tt>.
+
+	The patch can be applied by running:
+	<quote><tt>
+	cd <em>the directory containing the</em> xc <em>directory</em><newline>
+	gzip -d &lt; &fullrelvers;-&relvers;.diff.gz | patch -s -p0 -E 
+	</tt>
+	</quote>
+	Look for special patching instructions in the <htmlurl name="Release
+	Notes" url="http://www.xfree86.org/&relvers;/RELNOTES.html">.
+]]>
 </itemize>
 
 Another option is to get the source by anonymous CVS or CVSup. 
@@ -72,7 +81,7 @@ See <htmlurl name="http://www.xfree86.org/cvs/"
 url="http://www.xfree86.org/cvs/"> for details on the different
 procedure available. 
 
-All method will produce one main source directory called <tt>xc</tt>. 
+All methods will produce one main source directory called <tt>xc</tt>. 
 
 <sect>Configuring the source before building
 <p>
@@ -240,7 +249,7 @@ XFree86@XFree86.org.
 </itemize>
 
 <verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.6 2001/11/15 17:32:16 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.7 2002/09/04 03:31:10 dawes Exp $
 </verb>
 
 </article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml
index d9926c244..3310d3437 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml
@@ -27,7 +27,7 @@
 
 <title>XFree86 X server ``New Design'' (DRAFT)
 <author>The XFree86 Project, Inc
-<date>Last modified 1 August 2001
+<date>Last modified 18 May 2002
 
 
 
@@ -36,7 +36,7 @@
 
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.47 2002/01/16 20:38:44 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.49 2002/05/18 20:52:22 herrb Exp $
 </ident>
 
 
@@ -4846,6 +4846,9 @@ strongly encouraged to improve the consistency of driver behaviour.
 	<quote>Informational message.</quote>
       &s.code;X_NONE&e.code;
 	<quote>No prefix.</quote>
+      &s.code;X_NOT_IMPLEMENTED&e.code;
+	<quote>The message relates to functionality that is not yet
+               implemented.</quote>
       </quote>
 
 
@@ -5674,9 +5677,9 @@ typedef struct {
   <quote><p>
     &s.code;Bool xf86IsUnblank(int mode)&e.code;
     <quote><p>
-      Returns &s.code;FALSE&e.code; when the screen saver mode specified
+      Returns &s.code;TRUE&e.code; when the screen saver mode specified
       by &s.code;mode&e.code; requires the screen be unblanked,
-      and &s.code;TRUE&e.code; otherwise.  The screen saver modes that
+      and &s.code;FALSE&e.code; otherwise.  The screen saver modes that
       require blanking are &s.code;SCREEN_SAVER_ON&e.code; and
       &s.code;SCREEN_SAVER_CYCLE&e.code;, and the screen saver modes that
       require unblanking are &s.code;SCREEN_SAVER_OFF&e.code; and
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
index c3467a255..15722d3c1 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
@@ -13,7 +13,7 @@
     <date>15 June 2001
 
     <ident>
-    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.27 2002/01/07 22:05:57 dawes Exp $
+    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.28 2002/02/22 21:45:13 dawes Exp $
     </ident>
 
     <toc>
@@ -50,7 +50,7 @@
 
     <sect>Introduction
 <p>
-        With XFree86 4.0 and the Direct Rendering Interface
+        With XFree86 4.x and the Direct Rendering Interface
         (DRI), hardware accelerated 3D graphics can be considered a standard
         feature on Linux workstations.
         Support for other operating systems, such as FreeBSD, is underway.
@@ -62,9 +62,9 @@
 	software downloads.
       <p>
         This document does not cover compilation or installation of
-        XFree86 4.0.
+        XFree86 4.x.
         It is assumed that you've already installed a Linux distribution which
-        includes XFree86 4.0 or that you're an experienced Linux developer
+        includes XFree86 4.x or that you're an experienced Linux developer
         who has compiled the DRI for himself.
         DRI download, compilation and installation instructions can be found
         at <htmlurl url="http://dri.sourceforge.net/doc/DRIcompile.html"
@@ -100,7 +100,7 @@
 
       <sect1> Graphics Hardware
 <p>
-          XFree86 4.0 (or later versions) includes 3D acceleration for the
+          XFree86 4.2 (or later versions) includes 3D acceleration for the
           following graphics hardware:
 
         <itemize>
@@ -123,11 +123,13 @@
 	      <item>Matrox G200
 	      <item>Matrox G400
             </itemize>
-          <item>Intel i810 (motherboard chipset)
+          <item>Intel i810/i815/i830 (motherboard chipsets)
             <itemize>
               <item>i810
               <item>i810-dc100
               <item>i810e
+              <item>i815
+              <item>i830
             </itemize>
 	  <item>ATI Rage 128, supported on Intel x86, AMD and Alpha:
             <itemize>
@@ -308,7 +310,7 @@
       <sect1>libGL.so
 <p>
           Your OpenGL program must link with the libGL.so.1.2 library provided
-          by XFree86 4.0.
+          by XFree86.
           The libGL.so.1.2 library contains a GLX protocol encoder for
           indirect/remote rendering and DRI code for accessing hardware
           drivers.
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
index 09b17caeb..46bc98d5d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
@@ -13,7 +13,7 @@
     <date>21 April 2001
 
     <ident>
-    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.16 2002/01/07 22:05:57 dawes Exp $
+    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.17 2002/02/22 21:45:13 dawes Exp $
     </ident>
 
     <toc>
@@ -52,74 +52,61 @@
     <sect>Introduction <p>
 
         This document describes how to download, compile and install the
-        DRI project.
+        DRI.
         The DRI provides 3D graphics hardware acceleration for the XFree86
         project.
         This information is intended for experienced Linux developers.
         Beginners are probably better off installing precompiled packages.
       <p>
         Edits, corrections and updates to this document may be mailed
-        to <email>brian@tungstengrahpics.com</email>.
-
+        to <email>brian@tungstengraphics.com</email>.
+      <p>
+        Last updated on 13 February 2002 by Brian Paul.
 
     <sect>Prerequisites <p>
 
         You'll need the following:
         <itemize>
+	  <item>An installation of XFree86 4.1 or later.
+            The DRI tree has been pruned down to minimize its size.
+            But in order to build the DRI tree you need to have recent X
+            header files, etc. already installed.
+            If you don't have XFree86 4.1 (or later) installed you can
+            probably install it from RPMs (or another package format).
+            Or, you can download XFree86 as sources and compile/install
+            it yourself.
           <item>At least 200MB of free disk space.
             If you compile for debugging (the -g option) then you'll need
             about 600MB.
           <item>GCC compiler and related tools.
-          <item>ssh (secure shell) for registered developer downloading of the
-            DRI source tree
-          <item>A recent Linux Kernel.  See below for details.
+          <item>ssh (secure shell) if you're a DRI developer and don't want
+            to use anonymous CVS download.
+          <item>A 2.4.x Linux Kernel.  See below for details.
           <item>FreeBSD support is not currently being maintained and may not
             work.
         </itemize>
 
       <p>
         The DRI 3D drivers generally work on systems with Intel or AMD CPUs.
-        However, there is limited support for Alpha and PowerPC support is
-        underway.
+        However, limited support for Alpha and PowerPC support is underway.
 
       <p>
-        For 3dfx Voodoo3 hardware, you'll also need:
-        <itemize>
-          <item>Glide3 headers and runtime library if you want to use the
-            3dfx driver.
-            These can be obtained from
-            <htmlurl url="http://linux.3dfx.com/open_source/glide_kit.htm"
-            name="linux.3dfx.com">.
-          <item>A recent Linux 2.4.x kernel.  AGP support is not required.
-        </itemize>
+        For 3dfx Voodoo hardware, you'll also need the Glide3 runtime
+        library (libglide3-v3.so for Voodoo3 or libglide3-v5.so for
+        Voodoo4/5).
+        These can be downloaded from the DRI website.
+        You can compile them yourself, but it's often a painful process.
 
       <p>
-        For Matrox G200/G400 hardware, you'll also need:
-        <itemize>
-          <item>A recent Linux 2.4.x kernel with AGP support.
-        </itemize>
-
-      <p>
-        For Intel i810 hardware, you'll also need:
-        <itemize>
-          <item>A recent Linux 2.4.x kernel with AGP support.
-        </itemize>
-
-      <p>
-        For ATI Rage 128 and Radeon hardware, you'll also need:
-        <itemize>
-          <item>A recent Linux 2.4.x kernel with AGP support.
-        </itemize>
+        For Matrox G200/G400, Intel i810/i830 or ATI Rage128/Radeon hardware,
+        you'll also need AGP support in your Linux kernel, either built-in
+        or as a loadable module.
 
 
     <sect>Linux Kernel Preparation <p>
 
-        The DRI project closely tracks Linux kernel development.  Since
-        the internal Linux data structures might change in the 2.4 Linux
-        kernel, it's important to use the most recent Linux kernel and
-        not an old, intermediate development release.
-        As of this writing (Jan 2001), 2.4.0 is the most recent version
-        of Linux which the DRI is synchronized to.
+        Only the Linux 2.4.x kernels are currently supported by the DRI
+        hardware drivers.  2.5.x kernels may work, but aren't tested.
       <p>
         Most of the DRI drivers require AGP support and using Intel
         Pentium III SSE optimizations also requires an up-to-date Linux
@@ -265,8 +252,7 @@
 
     <sect>Downloading the XFree86/DRI CVS Sources <p>
 
-        The DRI project is hosted by VA Linux Systems'
-        <htmlurl url="http://dri.sourceforge.net/"
+        The DRI project is hosted by <htmlurl url="http://dri.sourceforge.net/"
         name="SourceForge">.
         The DRI source code, which is a subset of the XFree86 source tree,
         is kept in a CVS repository there.
@@ -404,7 +390,6 @@
             #define LinuxDistribution LinuxRedHat
             #define DefaultCCOptions -ansi GccWarningOptions -pipe
             #define BuildXF86DRI YES
-            #define HasGlide3 YES  
             /* Optionally turn these on for debugging */
             /* #define GlxBuiltInTdfx YES */
             /* #define GlxBuiltInMga YES */
@@ -415,28 +400,27 @@
           </verb>
           The <tt>ProjectRoot</tt> variable specifies where the XFree86 files
           will be installed.
-          You probably don't want to use <tt>/usr/X11R6/</tt> because that
-          would overwrite your default X files.
-          The following is recommended:
+          We recommend installing the DRI files over your existing XFree86
+          installation - it's generally safe to do and less error-prone.
+          This policy is different than what we used to recommend.
+        <p>
+          If XFree86 4.x is not installed in /usr/X11R6/ you'll have to
+          add the following to the <tt>host.def</tt> file:
           <verb>
-            #define ProjectRoot /usr/X11R6-DRI
+            #define ProjectRoot pathToYourXFree86installation
           </verb>
         <p>
-          Especially note the <em>XF86CardDrivers</em> line to be sure your
+          Note the <em>XF86CardDrivers</em> line to be sure your card's
           driver is listed.
         <p>
-          If you have 3dfx hardware be sure that the Glide 3x headers are
-          installed in <tt>/usr/include/glide3/</tt> and that the Glide 3x
-          library is installed at <tt>/usr/lib/libglide3.so</tt>.
-        <p>
-          If you do not have 3dfx hardware comment out the <tt>HasGlide3</tt>
-          line in <tt>host.def</tt>.
-        <p>
 	  If you want to enable 3DNow! optimizations in Mesa and the DRI
 	  drivers, you should add the following: 
           <verb>
             #define MesaUse3DNow YES
           </verb>
+          You don't have to be using an AMD processor in order to enable
+          this option.  The DRI will look for 3DNow! support and runtime
+          and only enable it if applicable.
         <p>
 	  If you want to enable SSE optimizations in Mesa and the DRI
 	  drivers, you <bf>must</bf> upgrade to a Linux 2.4.x kernel.
@@ -457,13 +441,13 @@
           To compile the complete DRI tree:
           <verb>
             cd ~/DRI-CVS/build/xc/
-            make World >& World.LOG
+            make World >& world.log
           </verb>
           Or if you want to watch the compilation progress:
           <verb>
             cd ~/DRI-CVS/build/xc/
-            make World >& World.LOG &
-            tail -f World.LOG
+            make World >& world.log &
+            tail -f world.log
           </verb>
           With the default compilation flags it's normal to get a lot of
           warnings during compilation.
@@ -477,7 +461,7 @@
 
       <sect1>Check for compilation errors <p>
 
-          Using your text editor, examine <tt>World.LOG</tt> for errors
+          Using your text editor, examine <tt>world.log</tt> for errors
           by searching for the pattern <tt>***</tt>.
         <p>
           Verify that the DRI kernel module(s) for your system were built:
@@ -514,7 +498,7 @@
 
       <sect1>DRI kernel module installation <p>
 
-        The DRI kernel modules are in
+        The DRI kernel modules will be in
         <tt>~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/</tt>.
         <p>
         To load the appropriate DRM module in your running kernel you can
@@ -531,95 +515,42 @@
 
     <sect>Normal Installation and Configuration <p>
 
-        Most users will want to install the new X server and use it instead
-        of the original X server.
+        Most users will want to install the new X server and use it in place
+        of their old X server.
         This section explains how to do that.
-        We assume that the user is upgrading from XFree86 3.3.x.
         <p>
         Developers, on the other hand, may just want to test the X server
         without actually installing it as their default server.
         If you want to do that, skip to the next section.
         <p>
 
-      <sect1>X Installation <p>
+      <sect1>Installation <p>
 
-          You'll need to run as root to do the following commands:
+          Here are the installation commands:
           <verb>
 	      su
-          </verb>
-	  As mentioned above, the installation directory is specified by the
-	  <tt>ProjectRoot</tt> variable in the <tt>host.def</tt> file.
-	  Create that directory now if it doesn't already exist, then
-          run the install commands:
-	  <verb>
-	      mkdir /usr/X11R6-DRI
 	      cd ~/DRI-CVS/build/xc
 	      make install
 	  </verb>
 
-      <sect1>Linker configuration <p>
-
-	  Edit your <tt>/etc/ld.so.conf</tt> file and put
-	  <tt>/usr/X11R6-DRI/lib</tt> as the first line.
-	  Then run:
-	  <verb>
-	      ldconfig
-	  </verb>
-          This will ensure that you use the new X libraries when you run
-          X programs.
-        <p>
-
-      <sect1>Update Locale Information <p>
-
-          To update your X locale information do the following:
-          <verb>
-             cd ~/DRI-CVS/build/xc/nls
-             ../config/util/xmkmf -a
-             make
-             make install
-          </verb>
-          This will prevent a locale error message from being printed
-          when you run Xlib programs.
-
-      <sect1>Setup Miscellaneous Files <p>
-
-          Issue the following commands:
-          <verb>
-             cd /usr/X11R6-DRI/lib/X11
-             ln -s /usr/X11R6/lib/X11/rgb.txt .
-             ln -s /usr/X11R6/lib/X11/fonts .
-             ln -s /usr/X11R6/lib/X11/app-defaults .
-          </verb>
-
-          This will allow applications to use the fonts and resources
-          that they used in the past.
-
-      <sect1>Disable the Old X Server and Enable the New One <p>
+      <sect1>Update the XF86Config File <p>
 
-          Assuming that an installation of XFree86 3.3.x is present, we need
-          to disable the old 3.3.x X server and enable the new 4.0.x X server.
-        <p>
-          Issue the following commands:
-          <verb>
-             cd /usr/X11R6/bin
-             mv Xwrapper Xwrapper.old
-             rm X
-             ln -s /usr/X11R6-DRI/bin/XFree86  X
-          </verb>
-          This will cause the new X server to be used instead of the
-          original one.
+          You may need to edit your XF86Config file to enable the DRI.
+          The config file is usually installed as
+          <tt>/etc/X11/XF86Config-4</tt>.
+          See the DRI User Guide for details, but basically, you need
+          to load the "glx" and "dri" modules and add a "DRI" section.
         <p>
-
-      <sect1>Create the XF86Config File <p>
-
-          Configuration files for XFree86 3.3.x will not work with
-          XFree86 4.0.x.
+          On the DRI web site, in the resources section, you'll find example
+          XF86Config files for a number of graphics cards.
+          These configuration files also setup DRI options so it's highly
+          recommended that you look at these examples.
         <p>
-          The new 4.0.x server can generate a basic configuration file
+          The XFree86 4.x server can generate a basic configuration file
           itself.
           Simply do this:
           <verb>
-             cd /usr/X11R6-DRI/bin
+             cd /usr/X11R6/bin
              ./XFree86 -configure
           </verb>
           A file named <tt>/root/XF86Config.new</tt> will be created.
@@ -629,27 +560,14 @@
           <tt>VertRefresh</tt> options to the <tt>Monitor</tt> section
           and <tt>Modes</tt> options to the <tt>Screen</tt> section.
           Also, the <tt>ModulePath</tt> option in the <tt>Files</tt>
-          section should be set to <tt>/usr/X11R6-DRI/lib/modules</tt>.
-        <p>
-          On the DRI web site, in the resources section, you'll find example
-          XF86Config files for a number of graphics cards.
-          These configuration files also setup DRI options so it's highly
-          recommended that you look at these examples.
-        <p>
-          In any case, your new XF86Config file should be placed in
-          <tt>/etc/X11/XF86Config-4</tt>.
-          This configuration file will be recognized by the 4.0.x server
-          but not by 3.3.x servers.
-          You can instead name it <tt>/etc/X11/XF86Config</tt> but
-          that'll overwrite your old config file, which you may want to
-          preserve.
+          section should be set to <tt>/usr/X11R6/lib/modules</tt>.
         <p>
 
       <sect1>Start the New X Server <p>
 
           The new X server should be ready to use now.
           Start your X server in your usual manner.
-          Typically, the <tt>startx</tt> command is used:
+          Often times the <tt>startx</tt> command is used:
           <verb>
              startx
           </verb>
@@ -657,7 +575,7 @@
 
     <sect>Testing the Server Without Installing It <p>
 
-        As mentioned at the start of section 8, developers may want to
+        As mentioned at the start of section 9, developers may want to
         simply run the X server without installing it.
         This can save some time and allow you to keep a number of X servers
         available for testing.
@@ -669,7 +587,8 @@
         Put the <tt>XF86Config</tt> file in your
         <tt>~/DRI-CVS/build/xc/programs/Xserver</tt> directory.
       <p>
-        Be sure the <tt>ModulePath</tt> option is set correctly.
+        Be sure the <tt>ModulePath</tt> option in your XF86Config file
+        is set correctly.
       <p>
 
       <sect1>A Startup Script <p>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile b/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
index f4e541f7e..af193d934 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
@@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/16 1996/10/28 05:13:04 kaleb $
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.78 2001/11/15 18:12:50 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.80 2002/06/03 21:22:09 dawes Exp $
 
 #include <Server.tmpl>
 #include <lnxdoc.rules>
@@ -23,7 +23,7 @@ MANSGMLDEPENDS = mdefs.ent
 	      DESIGN.sgml Versions.sgml \
 	      mouse.sgml fonts.sgml DRI.sgml DRIcomp.sgml dps.sgml \
 	      Darwin.sgml isc.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml \
-	      OS2Notes.sgml \
+	      OS2Notes.sgml SCO.sgml Solaris.sgml \
               apm.sgml ati.sgml chips.sgml cyrix.sgml DECtga.sgml \
 	      I128.sgml i740.sgml i810.sgml newport.sgml \
 	      r128.sgml rendition.sgml s3virge.sgml SiS.sgml
@@ -47,14 +47,9 @@ LinuxDocReadmeTarget(OpenBSD)
 LinuxDocReadmeTarget(OS2)
 #endif
 LinuxDocTargetLong(OS2Notes.sgml,OS2.Notes,OS2Notes)
-#ifdef OUTOFDATE
 LinuxDocReadmeTarget(SCO)
-#endif
-#ifdef NOTYET
 LinuxDocReadmeTarget(Solaris)
-#endif
 #ifdef OUTOFDATE
-LinuxDocReadmeTarget(SOLX86)
 LinuxDocReadmeTarget(SVR4)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
index ce75aaf35..1c3a3becf 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
@@ -16,7 +16,7 @@
 <date>16 January 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.119 2002/01/16 19:40:48 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.120 2002/09/09 16:04:22 dawes Exp $
 </ident>
 
 <abstract>
@@ -116,7 +116,7 @@ If you would like to work on the development of XFree86 4, either by
 helping with the conversion of our older drivers to the new 4.x design,
 or assisting in the addition of new drivers or platforms to the code base
 then send a request to <url name="join the XFree86 development team"
-url="http://www.xfree86.org:/developer.html">.  This will give you direct
+url="http://www.xfree86.org/developer.html">.  This will give you direct
 access to the latest XFree86 related development topics and discussions.
 Include in your note, your name, email address, reason for joining (what
 you will work on) and, level of expertise (coder, DRI, core, specific
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
index 2975d4430..cc5965009 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
@@ -9,7 +9,7 @@
 <date>17 January 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.70 2002/01/17 18:14:59 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.71 2002/01/21 19:01:35 dawes Exp $
 </ident>
 
 <abstract>
@@ -955,7 +955,7 @@ file is included in the Xft man page.
 <sect2>FreeType support in Xft
 <p>
 
-XFree86 &relvers; includes sources for FreeType version 2.0.1, and, by
+XFree86 &relvers; includes sources for FreeType version 2.0.6, and, by
 default, they are built and installed automatically.
 
 <p>
@@ -988,13 +988,11 @@ applications may occur in future releases.
 
 <p>
 By default, xterm uses core fonts through the standard core API.  It has
-two command line options and associated resources to direct it to use
+a command line option and associated resource to direct it to use
 Xft instead:
 <itemize>
   <item><tt>-fa</tt> family / <tt>.VT100.faceName:</tt> family.  Selects the 
 	font family to use.
-  <item><tt>-fs</tt> pointsize / <tt>.VT100.faceSize:</tt> pointsize.  
-	Selects the pointsize.
 </itemize>
 
 <p>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
index 0f9b20829..17b376a36 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
@@ -4,98 +4,74 @@
 <!-- TitleS information -->
 
 <title>Information for SCO OpenServer Users
-<author>J. Kean Johnston (jkj@sco.com)
-<date>21 May 2001
+<author>J. Kean Johnston (jkj@caldera.com)
+<date>22 January 2002
 
+<ident>
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.20 2002/06/03 21:22:09 dawes Exp $
+</ident>
 
 <!-- Table of contents -->
 <toc>
 
 <!-- Begin the document -->
 
-<sect>Binary Distribution<p>
+<sect>Requirements<p>
 
-The following files are provided in the binary distribution:
-<quote>
-<descrip>
-<tag/README.SCO/            This file.
-<tag/gunzip.Z/              The GNU <tt>uncompress</tt> utility.
-
-<tag/*X312Xdoc.tgz/         The XFree86 specific documentation.
-
-<tag/X312Mono.tgz/          The Mono server
-<tag/X312VG16.tgz/          The 16 colour VGA server
-<tag/X312SVGA.tgz/          The Super VGA server
-<tag/X312S3.tgz/            The S3 server
-<tag/X3128514.tgz/          The 8514 server
-<tag/X312AGX.tgz/           The AGX server
-<tag/X312Mc32.tgz/          The Mach 32 server
-<tag/X312Mc64.tgz/          The Mach 64 server
-<tag/X312Mc8.tgz/           The Mach 8 server
-<tag/X312P9k.tgz/           The P9000 server
-<tag/*X312cfg.tgz/          The local configuration files for 
-<tt>xdm/fs/xinit</tt>.
-<tag/*X312bin.tgz/          The <tt>bin</tt> directory, contains most executables.
-<tag/*X312lib.tgz/          The shared and unshared libraries.
-<tag/*X312fnt1.tgz/         <tt>75dpi</tt> and <tt>misc</tt> fonts.
-<tag/X312fnt2.tgz/          <tt>100dpi</tt> and <tt>Speedo</tt> fonts.
-<tag/*X312inc.tgz/          The X11 include files.
-<tag/X312man.tgz/           The formatted man pages.
-<tag/X312lkit.tgz/          The server link kit (all drivers + PEX).
-<tag/X312util.tgz/          Lots of PD utilities provided as is.
-<tag/X312pex.tgz/           All files relating to PEX including libraries
-                            and header files.  The LinkKit is required to
-                            obtain servers capable of running PEX.
-</descrip></quote>
-
-To obtain a minimum XFree86 installation you will require the archives
-marked with a `*' above, the server binary best suited to your machine
-and optionally "<tt>gunzip.Z</tt>".  All the files are compressed 
-with "<tt>gzip</tt>" except
-of course "<tt>gunzip.Z</tt>" which is compressed using the 
-conventional <tt>compress</tt>
-program.<p>
-
-To install the XFree86 binaries just follow these steps.
-<enum>
-<item>Obtain the files you require.<p>   
-      The rest of this procedure must be done as root.  If you do not run
-      the extraction as root the permissions on the files will not be
-      correct.  For example,  the `X' server is s-bit root and will not
-      function correctly if extracted as an ordinary user.  <p>
-<item>create a directory <tt>/usr/X11R6</tt>, permissions <tt>755</tt>
- should do nicely.
-<item>cd <tt>/usr/X11R6</tt>
-<item>extract the archives, for example:
-<verb>
-            gunzip < X312bin.tgz | tar xvpf -
-</verb>    
-<item>if you have installed man pages see the later section on
-       setting up man pages.
-<item>Look through <tt>/usr/X11R6/lib/X11/doc/INSTALL</tt>, 
-	especially section 2
-       on configuring and using XFree86.   This should allow you to get
-       a server up and running.  Before starting the server check in
-       the later section <ref id="sec-runxf86" name="Before Running XFree86">, 
-	in this document, to
-       see if there are any system requirements you have to make for the
-       server to operate correctly.
-</enum>
-
-<sect>Source Distribution<p>
+Before you can either compile or execute a binary distribution of
+XFree86, the following conditions must be met:
+<itemize>
+  <item>Ensure that you are running Release 5.0.5 or later. This is required
+    because OSS646 is only supported on those platforms. There are no plans
+    to support XFree86 on earlier releases of OpenServer.
+  <item>Ensure OSS646, the ``Linkers and Libraries 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 March
+    2002.
+  <item>To compile XFree86, you must use the Caldera-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
+    Development System'' is available for all releases from (and including)
+    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 Caldera Web
+    site at <tt>http://www.caldera.com</tt>.
+</itemize>
 
-The SCO port comes as part of the standard XFree86 distribution.  Consult
-the XFree86 <tt>README</tt> for more information on the location of sources.
+<sect>Compiling XFree86<p>
 
-Please note that as of XFree86 3.2, Only SCO Open Server Release 5 and
-onwards are supported.  If you are using a previous version of SCO UNIX
-and you want to use XFree86, use the 3.1 series, or be prepared for build
-failures.
+Using the GNU Development System, compiling XFree86 should be fairly
+straightforward.  Before attempting to compile the system though, you
+should make sure that you have met all of the requirements above.
+To actually start the compilation, perform the following steps:
 
-For people who want and need to look around the source, there
-are now two files in ``<tt>xc/config/cf</tt>''. Firstly, ``<tt>sco.cf</tt>'' is
-the old original SCO configuration file, and ``<tt>sco5.cf</tt>'', which is
-the currently used configuration file. 
+<itemize>
+  <item>Copy the unmodified <tt>xf86site.def</tt> in <tt>xc/config/cf</tt>
+    to <tt>host.def</tt>. Edit <tt>host.def</tt> and make any changes you
+    think you need. The most useful options to change are <tt>HasTcl</tt>,
+    <tt>HasTk</tt>, <tt>HasXdmAuth</tt> if you have the file
+    <tt>WrapHelp.c</tt> and <tt>GccWarningOptions</tt>. Due to the nature
+    of OpenServer's header files, the default options for this last setting
+    are a bit aggressive, and I recommend you set this option to
+    <tt>-Wpointer-arith</tt>.
+
+  <item>Make sure that the official version of the GNU Development System
+    is first in your <tt>PATH</tt>.  The official version lives in
+    <tt>/usr/gnu/bin</tt>, and the Skunkware version (if any) lives in
+    <tt>/usr/local/bin</tt>. You must ensure that <tt>/usr/gnu/bin</tt>
+    appears first in your <tt>PATH</tt>.
+
+  <item>Go to the top level of the source tree and execute the command
+    <tt>CC=gcc make World BOOTSTRAPCFLAGS=-DSCO5 2&gt;&amp;1 | tee world.log</tt>.
+    This will do a full build, and send all of the build results to the
+    file <tt>world.log</tt>.
+    
+  <item>If the build succeeded, install the new server by executing the
+    command <tt>make install 2&gt;&amp;1 | tee install.log</tt> as root.
+    This will send the install results to the file <tt>install.log</tt>.
+</itemize>
 
 <sect>Before Running XFree86<p><label id="sec-runxf86">
 
@@ -113,76 +89,6 @@ serial mouse,
 especially if you are having trouble getting your mouse to work using the
 XFree86 mouse drivers.<p>
 
-If you do not have the SCO TCP/IP package installed do not panic.
-XFree86 will work fine without TCP/IP but you will most likely have to do
-some or all of these things:
-<itemize>           
-      <item>Do not worry about errors from the X server complaining about
-        ``/dev/socksys''.  The X server is configured to run on systems with
-        and without TCP/IP.  This error is just pointing out that you do
-        not have TCP/IP and that this method of connecting to the server
-        has been disabled.
-  
-      <item>Do worry about errors involving ``/dev/spx'' or the ``sco''
-	connection
-        type.  This means something is wrong with the streams pipes that
-        are used for connections on the local machine.  First be sure that
-        your server has the ``s-bit'' set.  You can do this by running this
-        command for the X server you are using:
-
-                ls -al /usr/X11R6/bin/XF86_XXXXXX
-  
-        The output should contain the `s' character instead of the `x'
-        character.  For example:
-	<quote><verb>
--rwsr-xr-x   1 root     bin      1074060 Jul 24 11:54 XF86_S3
-	</verb></quote>
-        is correct while:
-	<quote><verb>
--rwxr-xr-x   1 root     bin      1074060 Jul 24 11:54 XF86_S3
-	</verb></quote>
-        is not.
-     
-      <item>you may have to install streams into the kernel with
-        ``mkdev streams''
-        Check the SCO Manuals for more information on this.
-      
-      <item>you may have to configure some devices in /dev,  check in the
-        "Trouble Shooting" section of this document for the entry which
-        comments on ``/dev/spx'' and ``Xsco''.
-        
-      <item>Your streams resources may be configured too low.  You should check
-        your streams parameters against the following values,  if the are
-        higher then you do not need to changes them.  To check these
-        values, login as root, change directory to ``/etc/conf/cf.d'' and
-        then run ``./configure''. 
-
-        Once you are running configure,  choose the ``Streams Data'' option  
-        and step through the entries.  Just press &lt;ENTER&gt; at each prompt
-        unless you want to change a value.  The values to look for,  and
-        their minimum values, are:
-             
-	<quote><verb>
-                   NSTREAM      128
-                   NQUEUE       512
-                   NBLK4096     4
-                   NBLK2048     32
-                   NBLK1024     32
-                   NBLK512      32
-                   NBLK256      64
-                   NBLK128      256
-                   NBLK64       256
-                   NBLK16       256
-                   NBLK4        128
-                   NUMSP        128
-	</verb></quote>
-  
-        You will not normally need to change any of these,  if however you
-        do have to change some,  configure will confirm that you want to
-        save the changes before exiting,  and will give you further
-        instructions on rebuilding the unix kernel. 
-</itemize>
-
 <sect>Switching Consoles<p>
 
 XFree86 uses similar console switching keys as the SCO R4 and R5
@@ -200,7 +106,7 @@ should look in <tt>xc/programs/Xserver/hw/xfree86/common/xf86Events.c</tt>.
 After compiling the tree, or after installing the binary distribution you
 can get man to recognise the XFree86 man pages by adding 
 <tt>/usr/X11R6/man</tt> to
-the <tt>MANPATH</tt> in <tt>/etc/default/man</tt>, the line should 
+the <tt>MANPATH</tt> in <tt>/etc/default/man</tt>. The line should 
 look similar to:
 <tscreen><verb>
     MANPATH=/usr/man:/usr/X11R6/man
@@ -211,7 +117,7 @@ man pages.<p>
 
 By default the man pages are compressed using ``<tt>compress</tt>'' to
 conserve space.  If you do not want to compress the man pages change
-<tt>CompressManPages</tt> to <tt>NO</tt> in your ``<tt>xf86site.def</tt>''
+<tt>CompressManPages</tt> to <tt>NO</tt> in your ``<tt>host.def</tt>''
 file.  Those using the binary distribution can use ``<tt>uncompress</tt>''
 to uncompress the man pages.
 
@@ -222,314 +128,4 @@ SCO R5 server will also accept connections from XFree86 binaries. This
 means you may mix and match the two if you have ODT.  For example you may
 still use the Motif window manager (mwm) if you prefer.
 
-<sect>Compiling XFree86 under Open Server 5<p>
-
-As of GCC version 2.8.0, Open Server is supported. Configure it by
-using the following:
-<tscreen><verb>
-    ./configure i486-sco3.2v5.0
-</verb></tscreen><p>
-
-There is no reason to modify gcc in any way.  It compiles cleanly on
-Open Server 5.<p>
-
-SCO Open Server 5.0 is recognised automatically by XFree86. You do not
-need to specify any <tt>BOOTSTRAPCFLAGS</tt> parameters when doing a
-<tt>make World</tt>. You can ignore the warning message about
-<tt>BOOTSTRAPCFLAGS</tt> at the very beginning of a <tt>make World</tt>.
-
-<enum>
-<item>Fine tune ``<tt>site.def/xf86site.def</tt>''<p>
-Use GCC if you can. XFree86 should compile with the DevSys cc, but GCC has
-better optimizations, and is guaranteed to work.
-
-<item>SCO Open Server comes with Visual
-TCL, which is an old (and incompatible) version of TCL. If you want to
-use XF86Setup you will have to compile Tcl and Tk yourself. Both are
-supported well on SCO Open Server 5. Tcl 7.6 and Tk 4.2 are available
-from <tt>ftp://ftp.smli.com/pub/tcl</tt>.
-
-<item>You may want to disable dynamic loading support. Several users have
-reported trouble with this. XIE and PEX5 definitely do not work. If
-you want to experiment, try enabling this. Please report successes or
-failures to me.
-
-<item>Do <bf>not</bf> enable the <tt>HasSVR3mmapDrv</tt> as you may have done
-in older versions of SCO. Open Server 5 has full mmap() support, and
-this is used for direct frame buffer access.
-
-<item>If you know you will not ever be using COFF binaries, and you are
-short of space, set <tt>ForceNormalLib</tt> to <tt>NO</tt>. Doing this
-will cause only the ELF versions of the libraries to be built.
-``<tt>sco5.cf</tt>'' sets this to <tt>YES</tt> by default, so you must
-explicitly set it to <tt>NO</tt> in ``<tt>xf86site.def</tt>''.
-All binaries are compiled in ELF mode to reduce space.
-
-</enum>
-
-<sect>Relevant Documentation<p>
-
-Some relevant documentation for SCO Users and Developers can be found in
-the following files.
-<descrip>
-<tag/README/       
-the standard XFree86 <tt>README</tt> (<tt>/usr/X11R6/lib/X11/doc</tt>)
-<tag/README.SVR3/  Although a lot of this readme is based on Interactive
-                   a substantial proportion is still relevant.
-<tag>All of the VGA/Config documentation.</tag>
-       <tt>/usr/X11R6/lib/X11/doc/VideoModes.doc</tt> and the <tt>README</tt>
-               files for particular video cards.
-</descrip>
-
-<sect>Known Problems<p>
-<itemize>
-<item>After running the server you may see some strange characters in your
-input to the shell.  This is due to some unprocessed scancodes and is
-of no concern.  This will be fixed in a future release.<p>
-<item>Not all of the applications in <tt>/usr/X11R6/bin</tt> have 
-been debugged.<p>
-</itemize>
-
-<sect>Trouble Shooting<p>
-<descrip>
-<tag/Problem:/
-<quote>
-           The server does not start up,  and I cannot tell what is going
-           wrong as it did not print any error messages.  
-</quote>
-<tag/Causes:/
-<quote>
-           There can be any number of causes why the server doesn't start.
-           The first step is to find out what the server has to say.  To do
-           this we have to catch the error output of the server into a file.
-           This output contains a log of what the server is finding/doing as
-           it starts up.  To get this output run:
-	<verb>
-               startx 2> /tmp/errs
-	</verb>
-           The output of the server will now be in "/tmp/errs".  You should
-           look through this output for possible problems,  and then check
-           here in this document for any references to the problems you are
-           seeing.
-</quote>
-<tag/Problem:/
-<quote>
-           The server starts up,  the screen goes blank,  and I never see
-           anything else.  It appears that my machine has hung.
-</quote>
-<tag/Causes:/
-<quote>
-           Again this can have many causes.  Most likely your XF86Config is
-           wrong.  You should be able to kill the server by typing
-           Ctrl-Alt-BackSpace,  if it is still running.  If this does not 
-           restore your display then you may have to drive your system blind.
-           Always keep another login running at the shell prompt so that you
-           may switch to that screen and run commands even if you cannot see
-           anything on the screen.  Try these things,  usually in the order
-           given:
-	<itemize>
-                 <item>log out of the login where you started ``X'' and then 
-                    change consoles.  This will cause the SCO screen
-                    switching code to try to reset the card.
-                 <item>run ``vidi v80x25'',  this command will also try to set
-                    your card into a viewable mode.
-                 <item>shutdown the machine cleanly with ``shutdown'' and try
-                    again.
-	</itemize>
-           When first trying to get XFree86 to run,  be sure to use a simple
-           setup.  Get 640x480 working first then move on to higher
-           resolutions.  Always trap the output of the server as shown earlier.
-           Once you have the valid clocks for your video card (as provided
-           in the server output),  hard code them into your XF86Config as  
-           this will take some strain off your monitor during XFree86
-           startup where it usually probes the various clock frequencies. 
-           Getting the ``X'' screen to appear can be a painfully slow task.
-           Be patient and read as much of the doco as you can handle.  You  
-           will get it to work.
-</quote>
-<tag/Problem:/
-<quote>
-<verb>
-           Fatal server error:
-           xf86MapVidMem:No class map defined for (XXXXX,XXXXX)
-</verb>
-</quote>
-<tag/Causes:/
-<quote>
-<enum>
-	<item>Your system does not have the correct
-              /etc/conf/pack.d/cn/class.h, You can confirm this by
-              editing the file and looking for the string "SVGA", if it
-              is not there then you should re-install this file from
-              the "Extended Utilities" diskettes provided with your OS.
-              If this is not possible then installing the "dmmap"
-              driver from the distribution may allow the server to
-              operate correctly.
-
-</enum>
-</quote>
-<tag/Problem:/
-<quote>
-    <tt>xf86install</tt> does not work.
-</quote>
-<tag/Causes:/
-<quote>
-    You should not be running <tt>xf86install</tt> when using the 
-    XFree86 server
-    under SCO.  It is used for Interactive (ISC) installations.
-</quote>
-<tag/Problem:/
-<quote>
-    The server starts but the screen is not aligned correctly or is shaky
-    and impossible to view.
-</quote>
-<tag/Causes:/
-<quote>
-    This is most likely due to an incorrect <tt>XF86Config</tt> setup.  
-    Look for the
-    files <tt>README.Config</tt>  <tt>VideoModes.doc</tt> (in 
-    <tt>/usr/X11R6/lib/X11/doc</tt> with 
-    the binary distribution).  These files explains how to fix up your 
-    video modes.
-</quote>
-<tag/Problem:/
-<enum>
-<item>Can only run a limited number of xterms.
-<item><tt>xterm</tt> does not work but other programs like 
-<tt>xclock</tt> do work.
-</enum>
-
-<tag/Causes:/
-<quote>
-    Not enough or no pseudo ttys devices are present on your system.
-    Run "<tt>mkdev ptty</tt>" and increase the number of ptty's.
-</quote>
-<tag/Problem:/
-<quote>
-    When running curses/termcap applications in an <tt>xterm</tt>
-     the output gets
-    corrupted especially when scrolling.
-</quote>
-<tag/Causes:/
-<enum>
-<item>You are running an original 1.3 distribution of XFree86.  Update
-       to the latest version (3.2 or greater).
-<item>You have resized the window and not ran "<tt>eval `resize`</tt>" 
-      before using
-       your application.  The SCO operating system does not support dynamic
-       resizing of xterms fully so this command must be run after resizing
-       an <tt>xterm</tt> in order for curses/termcap applications to operate
-       correctly.
-</enum>
-<tag/Problem:/
-<enum>
-<item>When starting X it dies with an error "Cannot access a needed shared
-       library".
-<item>When starting an X application is dies with the above error.
-</enum>
-<tag/Causes:/
-<enum>
-<item>You do not have the binaries installed in the correct directory.
-       Check that they are in <tt>/usr/X11R6</tt>
-<item>You have upgraded to a new binary distribution which has a new
-       version of the shared libraries which are not compatible with your
-       old binaries.  To fix this you will need to re-install the old
-       shared libraries or recompile your application against the new
-       libraries.
-</enum>
-<tag/Problem:/
-<quote>    
-    When linking against the SCO motif library I get an unresolved external
-    for "<tt>XtDisplayStringConversionWarning</tt>" when using gcc.
-</quote>
-<tag/Causes:/
-<quote>    
-    The SCO library is compiled with limited length identifiers.  To work
-    around this add the following code to your application when compiling
-    under XFree86 with gcc and SCO motif.
-<verb>
-    #ifdef SCO
-    void XtDisplayStringConversionWarnin(dpy, from, toType)
-        Display*  dpy;
-        String    from;
-        String    toType;
-    { XtDisplayStringConversionWarning(dpy, from, toType); }
-    #endif
-</verb></quote>
-<tag/Problem:/
-<quote>
-    The server fails to run and prints out a line similar to:<p>
-<tt>XFree86: Cannot open /dev/spx for ???? listener: No such file or directory
-</tt></quote>
-<tag/Causes:/
-<quote>    
-    All SCO unix installations appear to have the Streams pseudo tty driver
-    installed, but not all the devices are present.<p>
-<enum>
-<item>there should be a <tt>/etc/conf/pack.d/sp</tt> directory,
-<item><tt>/etc/conf/sdevice.d/sp</tt> should have a '<tt>Y</tt>' in it.
-<item>You need a file in <tt>/etc/conf/node.d</tt>
-       which contains something like:
-<verb>
-        clone	spx		c	sp
-        sp	X0S		c	127
-        sp	X0R		c	126
-        sp	X1S		c	125
-        sp	X1R		c	124
-        sp	X2S		c	123
-        sp	X2R		c	122
-        sp	X3S		c	121
-        sp	X3R		c	120
-        sp	X4S		c	119
-        sp	X4R		c	118
-        sp	X5S		c	117
-	sp	X5R		c	116
-        sp	X6S		c	115
-        sp	X6R		c	114
-        sp	X7S		c	113
-        sp	X7R		c	112
-</verb>
-</enum>
-    if you don't have something like this (maybe called "Xsco") then create
-    one and that should fix your problem.  As far as I can tell the streams
-    pseudo tty driver should be there.<p>
-    The simplest way to get the devices if you had to create this file is
-    to rebuild the kernel and the environment.  If you don't want to do this
-    then:
-<verb>            
-        touch /etc/.new_unix
-        cd /etc/conf/bin
-        ./idmkenv
- </verb> 
-    and try it out.
-</quote>
-</descrip>
-<sect>Acknowledgements<p>
-
-Thanks to the Core team for their previous and continuing help with the SCO
-work.  Many thanks to <bf/Stacey Campbell/ at SCO for all the advice and
-insights provided.  Thanks to SCO in general for making information available
-for XFree86 development.
-
-Thanks also to <bf/Peter Eubert/ (<em/peter.eubert@iwb.mw.tu-muenchen.dbp.de/)
-and <bf/Kent Hamilton/ (<em/kenth@stl.scscom.COM/) for 
-input on compiling under 3.2.4 
-systems.  <bf/Larry Plona/ (<em/faxi@world.std.com/) and 
-<bf/Didier Poirot/ (<em/dp@chorus.fr/)
-for their input on xdm and 3.2.4 compilation under 3.1.   And of course the
-beta list for its input on everything.
-
-Special thanks to <bf/Jerry Whelan/ (<em/guru@stasi.bradley.edu/) 
-for providing an
-ftp site for the binary distribution.
-
-<verb>  
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.19 2001/08/10 16:38:13 dawes Exp $
-
-
-
-
-
-$XConsortium: SCO.sgml /main/11 1996/10/23 11:45:55 kaleb $
-</verb>
 </article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml
index 892d4984d..97a48f082 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml
@@ -11,8 +11,7 @@
 
 <!-- Begin the document -->
 <sect>What is XFree86<p>
-XFree86 is a port of X11R6.5.1 that supports several versions of Intel-based
-Unix.
+XFree86 is a port of X11R6.5.1 that supports several versions of Unix.
 It is derived from X386 1.2 which was the X server distributed with X11R5.
 This release consists of many new features and performance improvements as well
 as many bug fixes.
@@ -38,7 +37,7 @@ Therefore if you use virtual terminals, you do so at <bf>YOUR OWN RISK</bf>.<p>
 Virtual terminals are not available in Solaris SPARC, and their availability
 has been removed in Solaris8 x86.<p>
 When available, the virtual terminals of Solaris work basically the same way as
-most other Intel based SVR4 VT sub-systems.
+most other SVR4 VT sub-systems.
 However, there are a number of limitations documented below.<p>
 First, if you are running a Solaris 2.4 x86 system, and you want VT's, you will
 have to create the necessary devices first, so become root.<p>
@@ -213,6 +212,6 @@ Bug reports should be sent to one of the <bf/XFree86@XFree86.org/,
 <bf>Xpert@XFree86.org</bf>, or <bf>Newbie@XFree86.org</bf> (depending on your
 level of comfort).
 <verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.2 2001/11/15 17:22:55 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3 2002/01/25 21:55:53 tsi Exp $
 </verb>
 </article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
index 3e1029a15..5ece3380a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
@@ -8,14 +8,14 @@
 
 <title>ATI Adapters README file
 <author>Marc Aurele La France
-<date>2001 April 10
+<date>2002 February 12
 
 
 
 
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.39 2002/01/16 16:25:54 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.40 2002/02/14 22:08:00 tsi Exp $
 </ident>
 
 <abstract>
@@ -50,6 +50,10 @@ in the system, but also, on what the user specifies in the XF86Config file.
 See the <bf>``XF86Config specifications''</bf> section below for details.<p>
 If none of the above conditions are met, the ATI driver will essentially
 disable itself to allow other drivers to examine the system.<p>
+Note that I am currently considering removing the driver's support for generic
+VGA.
+If you have any concerns about this, please contact me at
+<it>tsi@xfree86.org</it>.
 <sect>A note on acceleration<p>
 The meaning of ``acceleration'', as used in this document, needs to be
 clarified.
@@ -366,7 +370,7 @@ Other clock generators that have been used on ATI adapters (which can all be
 said to be clones of one of the above) might generate non-zero frequencies for
 those that are zero above, or vice-versa.<p>
 The order of the clocks <it>is</it> very important, although the driver will
-reorder the clocks if it deems it appropriate to do so.
+reorder the specified clocks if it deems it appropriate to do so.
 Mach32 and Mach64 owners should note that this order is different than what
 they would use for previous XFree86 accelerated servers.<p>
 <sect2>Clocks for non-ATI adapters<p>
@@ -376,12 +380,20 @@ The first clock will typically be 25.175 MHz, but there are exceptions.
 You can include up to four clock frequencies in your XF86Config to specify the
 actual values used by the adapter.
 Any more will be ignored.<p>
-<sect1>Option <it>``crt_screen''</it><p>
+<sect1>Option <it>``nopanel_display''</it><p>
 This specification is only effective when the driver detects that the adapter's
 BIOS has initialised both the digital flat panel and CRT interfaces.
 In such a situation, the driver will normally drive both the panel and the CRT.
 This specification causes the driver to disable the digital flat panel and
-display the screen image on the CRT instead.<p>
+display the screen image on the CRT instead, which could potentially allow for
+larger physical resolutions than the panel can handle.<p>
+<sect1>Option <it>``crt_display''</it><p>
+This specification is only effective when the driver detects that the adapter's
+BIOS has initialised the digital flat panel interface, but has disabled the
+CRT interface.
+In such a situation the driver will normally drive only the panel.
+This specification causes the driver to instead display the same image on both
+the panel and the CRT.<p>
 <sect1>Option <it>``noaccel''</it><p>
 By default, the driver will accelerate draw operations if a Mach64 CRTC is used
 to drive the display.
@@ -398,13 +410,14 @@ option is ignored.<p>
 <sect1>Option <it>``HWCursor''</it> and Option <it>``SWCursor''</it><p>
 Option <it>``HWCursor''</it>, which is the default, specifies that hardware
 facilities are to be used to paint the mouse pointer on the screen.
-Option <it>``SWCursor''</it> specifies that the mouse pointer is to by drawn by
+Option <it>``SWCursor''</it> specifies that the mouse pointer is to be drawn by
 software, which is much slower.
 If both options are specified, option <it>``SWCursor''</it> prevails.
 Currently, these options are only acted upon for 256-colour or higher depth
 modes, if a Mach64 accelerator CRTC, or a Mach64 integrated controller is being
 used.
-In all other situations, a software cursor will be used.<p>
+In all other situations, a software cursor will be used, regardless of what
+these options specify.<p>
 <sect1>Option <it>``SilkenMouse''</it><p>
 This option is only acted upon when a hardware cursor is being used.
 It specifies that the cursor's position on the screen is to be updated as
@@ -478,10 +491,6 @@ Should no mode names be specified (or those specified do not yield a usable
 mode), the server will automatically select as a default resolution the largest
 usable mode, whether or not the chosen mode is specified in the corresponding
 ``Monitor'' section.<p>
-For a CRT monitor, you should still specify horizontal sync and vertical
-refresh rates in the corresponding ``Monitor'' section.
-Otherwise, the server will default these to those of a VGA monitor, which will
-limit resolutions to not much more than 640x480 at 72 Hz.
 For a digital flat panel, any sync tolerances should be removed from the
 corresponding ``Monitor'' section.
 The driver will automatically calculate these from the mode that is active on
@@ -493,17 +502,6 @@ There are several known problems or limitations related to the XFree86 ATI
 driver.
 They include:<p>
 <itemize>
-<item>A number of system lockups and blank screens have been reported when
-using PCI Mach64 adapters.
-The great majority of these problems have been found to be due to system
-aspects that are unrelated to this driver.
-As of this writing, these problems can be divided into two general areas:<p>
-Improper mouse protocol specification with some recent mice.
-Try different protocol specifications or another mouse.<p>
-A system conflict with APM.
-This problem is Linux-specific.
-There is a bug in kernels 2.0.31 or earlier that prevents proper APM operation.
-Upgrade to a more recent kernel or disable APM support in the kernel.<p>
 <item>When using a Mach64's accelerator CRTC, the virtual resolution must be
 less than 8192 pixels wide.
 The VGA CRTC further limits the virtual resolution width to less than 4096
@@ -549,7 +547,19 @@ through the DACSpeed specification in XF86Config.
 Be aware however that doing so is untested and might damage the adapter.
 <item>Except as in the previous items, clocks are limited to 80MHz on most
 adapters, although many are capable of higher frequencies.
-This will be fixed in a future release.
+This will eventually be fixed in a future release.
+<item>The use of a laptop's hot-keys to switch displays while this driver is
+active can cause lockups and/or other woes, and is therefore not recommended.
+It is not currently possible to solve this problem.<p>
+<item>In situations where the driver is to simultaneously display on both a
+panel and a CRT, the same image will be seen on both.
+In particular, this means the CRT must be able to synchronise with the timings
+of the panel's native resolution.
+This is quite evident when the panel has ``odd-ball'' dimensions, such as
+1400x1050, a resolution not commonly possible on CRTs or projection
+equipment.<p>
+Also, the display of independant images on the panel and CRT is not currently
+implemented, and might never be, pending resolution of the previous item.<p>
 </itemize>
 Support for the following will be added in a future release:
 <itemize>
@@ -574,13 +584,9 @@ Check the server's log (usually found in /var/log/XFree86.0.log) and <htmlurl
 name="ftp://ftp.xfree86.org/pub/XFree86"
 url="ftp://ftp.xfree86.org/pub/XFree86"> if you are uncertain.<p>
 Secondly, please check XFree86's doc directory for additional information.<p>
-<!--
-Thirdly, do not forget to read <htmlurl name="http://www.xfree86.org/FAQ"
-url="http://www.xfree86.org/FAQ">.<p>
--->
 Thirdly, a scan through the comp.windows.x.i386unix and comp.os.linux.x
-newsgroups using your favourite archiving service can also prove useful in
-resolving problems.<p>
+newsgroups and the newbie or xpert mailing lists using your favourite archiving
+service can also prove useful in resolving problems.<p>
 If you are still experiencing problems, you can send me <it>non-HTMLised</it>
 e-mail at <email>tsi@xfree86.org</email>.
 Please be as specific as possible when describing the problem(s), and include
@@ -592,11 +598,10 @@ Apparently, Per Lindqvist first got a driver working with an early ATI adapter
 under X386 1.1a.
 This original driver might have actually been based on a non-functional ATI
 driver written by Thomas Roell (currently of Xi Graphics).<p>
-Then Doug Evans (<it>dje@cygnus.com</it>) added support for the ATI VGA Wonder
-XL, trying in the process to make the driver work with all other ATI adapters
-available at the time.<p>
-Rik Faith (<it>faith@precisioninsight.com</it>) obtained the X11R4 driver from
-Doug Evans in the summer of 1992 and ported the code to the X386 part of X11R5.
+Then Doug Evans added support for the ATI VGA Wonder XL, trying in the process
+to make the driver work with all other ATI adapters available at the time.<p>
+Rik Faith obtained the X11R4 driver from Doug Evans in the summer of 1992 and
+ported the code to the X386 part of X11R5.
 This subsequently became part of XFree86.<p>
 I (Marc Aurele La France) took over development and maintenance of the driver
 in the fall of 1993 after Rik got rid of his VGA Wonder adapter.<p>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
index 58f1dc2ca..859801b76 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
@@ -6,10 +6,10 @@
 
 <title>Fonts in XFree86
 <author>Juliusz Chroboczek, <email/jch@xfree86.org/
-<date>26 November 2001</date>
+<date>29 September 2002</date>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.15 2001/12/17 19:25:36 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.16 2002/10/17 00:49:02 dawes Exp $
 </ident>
 
 <toc>
@@ -880,15 +880,13 @@ to use these fonts with standard applications, it may be useful to
 remap them to their proper names.
 
 This is done by writing a `<tt/fonts.alias/' file. The format of this file
-is similar to the format of the `<tt/fonts.dir/' file, except that it maps
-XLFD names to XLFD names. A `<tt/fonts.alias/' file might look as follows:
+is very simple: it consists of a series of lines each mapping an alias name to a font name.  A `<tt/fonts.alias/' file might look as follows:
 <tscreen><verb>
-1
 "-ogonki-alamakota-medium-r-normal--0-0-0-0-p-0-iso8859-2" \
   "-ogonki-alamakota-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific"
 </verb></tscreen>
 (both XLFD names on a single line).  The syntax of the
-`<tt/fonts.alias/' file is precisely described in the
+`<tt/fonts.alias/' file is more precisely described in the
 <tt/mkfontdir/(1) manual page.
 
 <sect>Additional notes about TrueType support
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml
index 4ff052d40..f0d960394 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml
@@ -8,7 +8,7 @@
 <date>9 February 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.11 2000/03/01 00:25:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.12 2002/02/22 21:45:13 dawes Exp $
 </ident>
 
 <toc>
@@ -350,7 +350,7 @@ Choose one from the following list:
 <itemize>
 	<item><tt>GlidePoint</tt>
 	<item><tt>IntelliMouse</tt>
-	<item><tt>Logictech</tt>
+	<item><tt>Logitech</tt>
 	<item><tt>Microsoft</tt>
 	<item><tt>MMHittab</tt>
 	<item><tt>MMSeries</tt>
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/Imakefile
index 2be045434..2d8a601e6 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/Imakefile,v 1.22 2001/07/02 10:46:04 alanh Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/Imakefile,v 1.23 2002/05/31 18:45:59 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -7,17 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/Imakefile,v 1.22 2001/07/
 SUBDIRS = XF86CardDrivers
 DRIVERS = XF86CardDrivers
 
-#ifndef OS2Architecture
 OBJS = `cat driver.list`
-#else
-OBJS = apm/?*_drv.o ati/?*_drv.o chips/?*_drv.o cirrus/?*_drv.o \
-       cyrix/?*_drv.o glint/?*_drv.o i128/?*_drv.o i740/?*_drv.o \
-       i810/?*_drv.o imstt/?*_drv.o mga/?*_drv.o neomagic/?*_drv.o \
-       nv/?*_drv.o rendition/?*_drv.o s3/?*_drv.o s3virge/?*_drv.o \
-       sis/?*_drv.o tdfx/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \
-       vesa/?*_drv.o vga/?*_drv.o siliconmotion/?*.drv.o vmware/?*_drv.o
-
-#endif
 
 #if DoLoadableServer
 MakeSubdirs($(SUBDIRS))
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile
index 144b86384..3fba86e4b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile,v 1.22 2001/04/25 17:46:42 alanh Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile,v 1.23 2002/05/07 12:53:49 alanh Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -20,7 +20,6 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
            -I$(SERVERSRC)/mfb  -I$(SERVERSRC)/mi \
            -I$(SERVERSRC)/fb  -I$(XF86SRC)/xaa \
            -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \
-	   -I$(XF86SRC)/xf24_32bpp \
            -I$(XF86SRC)/vgahw  -I$(XF86SRC)/ramdac \
 	   -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \
 	   -I$(XF86SRC)/shadowfb \
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h
index 387d73ded..44e37eb53 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.17 2001/05/04 19:05:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19 2002/05/07 12:53:49 alanh Exp $ */
 
 
 /* All drivers should typically include these */
@@ -61,6 +61,15 @@
 #endif
 #define TRUE	(1)
 
+#define rdinx(port, ind)	(outb((port), (ind)), inb((port) + 1))
+#define wrinx(port, ind, val)	outb((port), (ind)),  outb((port) + 1, (val))
+#define modinx(port, ind, mask, bits)					\
+    do {								\
+	unsigned char tmp;						\
+	tmp = (rdinx((port), (ind)) & ~(mask)) | ((bits) & (mask));	\
+	wrinx((port), (ind), tmp);					\
+    } while(0)
+
 typedef unsigned char	u8;
 typedef unsigned short	u16;
 typedef unsigned long	u32;
@@ -108,7 +117,7 @@ typedef struct {
     char		*MemMap;
     pointer		BltMap;
     Bool		UnlockCalled;
-    int			xbase;
+    IOADDRESS		iobase, xport, xbase;
     unsigned char	savedSR10;
     CARD8		MiscOut;
     CARD8		c9, d9, db, Rush;
@@ -176,6 +185,7 @@ typedef struct {
     int			timerIsOn;
     Time		offTime;
     OptionInfoPtr	Options;
+    char		DPMSMask[4];
 } ApmRec, *ApmPtr;
 
 #define curr		((unsigned char *)pApm->regcurr)
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man
index 813256942..cb206c195 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.2 2001/01/27 18:20:46 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.3 2002/05/07 12:53:49 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH APM __drivermansuffix__ __vendorversion__
@@ -14,16 +14,92 @@ apm \- Alliance ProMotion video driver
 .fi
 .SH DESCRIPTION
 .B apm 
-is an XFree86 driver for Alliance ProMotion video cards.
-THIS MAN PAGE NEEDS TO BE FILLED IN.
+is an XFree86 driver for Alliance ProMotion video cards. The driver
+is accelerated for supported hardware/depth combination. It supports
+framebuffer depths of 8, 15, 16, 24 and 32 bits. For 6420, 6422, AT24,
+AT3D and AT25, all depths are fully accelerated except 24 bpp for which
+only screen to screen copy and rectangle filling is accelerated.
 .SH SUPPORTED HARDWARE
 The
 .B apm
-driver supports...
+driver supports PCI and ISA video cards on the following Alliance
+ProMotion chipsets
+.TP 12
+.B ProMotion 6420
+.TP 12
+.B ProMotion 6422
+.TP 12
+.B AT24
+.TP 12
+.B AT3D
+.TP 12
+.B AT25
 .SH CONFIGURATION DETAILS
 Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
+.PP
+The driver auto-detects the chipset type, but the following
+.B ChipSet
+names may optionally be specified in the config file
+.B \*qDevice\*q
+section, and will override the auto-detection:
+.PP
+.RS 4
+"6422", "at24", "at3d".
+.PP
+The AT25 is Chipset "at3d" and the 6420 is 6422.
+.PP
+The driver will auto-detect the amount of video memory present for all
+chips. The actual amount of video memory can also be specified with a
+.B VideoRam
+entry in the config file
+.B \*qDevice\*q
+section.
+.PP
+The following driver
+.B Options
+are supported:
+.TP
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
+Enable or disable the hardware cursor.  Default: on.
+.TP
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
+Disable or enable acceleration.  Default: acceleration is enabled.
+.TP
+.BI "Option \*qNoLinear\*q \*q" boolean \*q
+Disable or enable use of linear frame buffer. Default: on.
+Note: it may or may not work. Tell me if you need it.
+.TP
+.BI "Option \*qPciRetry\*q \*q" boolean \*q
+Enable or disable PCI retries.  Default: off.
+.TP
+.BI "Option \*qRemap_DPMS_On\*q \*q" string \*q
+.TP
+.BI "Option \*qRemap_DPMS_Standby\*q \*q" string \*q
+.TP
+.BI "Option \*qRemap_DPMS_Suspend\*q \*q" string \*q
+.TP
+.BI "Option \*qRemap_DPMS_Off\*q \*q" string \*q
+Remaps the corresponding DPMS events. I've found that my
+Hercules 128/3D swaps Off and Suspend events. You can correct
+that with
+.nf
+.RS
+.RS
+.BI "Option \*qRemap_DPMS_Suspend\*q \*qOff\*q"
+.BI "Option \*qRemap_DPMS_Off\*q \*qSuspend\*q"
+.RE
+.fi
+in the
+.B Device
+section of the config file.
+.TP
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
+Force the software cursor.  Default: off.
+.TP
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
+Enable or disable use of the shadow framebuffer layer.  Default: off.
 .SH "SEE ALSO"
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c
index 3dcfee628..72b0cee21 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c
@@ -1,7 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.18 2001/10/28 03:33:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.21 2002/10/08 22:14:03 tsi Exp $ */
 
-
-#define COMPILER_H_EXTRAS
 #include "apm.h"
 #include "miline.h"
 
@@ -29,8 +27,6 @@ static unsigned char apmROP[] = {
 };
 
 
-static void Dump(void* start, u32 len);
-
 #include "apm_funcs.c"
 
 #define IOP_ACCESS
@@ -755,20 +751,3 @@ void ApmSetupXAAInfo(ApmPtr pApm, XAAInfoRecPtr pXAAinfo)
 	}
     }
 }
-
-
-
-static void
-Dump(void* start, u32 len)
-{
-  u8* i;
-  int c = 0;
-  ErrorF("Memory Dump. Start 0x%x length %d\n", (u32)start, len);
-  for (i = (u8*)start; i < ((u8*)start+len); i++)
-  {
-    ErrorF("%02x ", *i);
-    if (c++ % 25 == 24)
-      ErrorF("\n");
-  }
-  ErrorF("\n");
-}
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c
index 6f830e8d7..3a5f362d6 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c
@@ -1,11 +1,10 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.9 2001/01/06 21:29:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.10 2002/01/25 21:55:54 tsi Exp $ */
 /*
  * file: apm_dga.c
  * ported from s3virge, ported from mga
  *
  */
 
-#define COMPILER_H_EXTRAS
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
@@ -324,8 +323,8 @@ ApmSetViewport(
 	else {
 	    tmp = (RDXB_IOP(0xDB) & 0xF4) |  0x0A;
 	    WRXB_IOP(0xDB, tmp);
-	    wrinx(0x3C4, 0x1B, 0x20);
-	    wrinx(0x3C4, 0x1C, 0x2F);
+	    wrinx(pApm->xport, 0x1B, 0x20);
+	    wrinx(pApm->xport, 0x1C, 0x2F);
 	}
 	pApm->apmLock = FALSE;
     }
@@ -337,8 +336,8 @@ ApmSetViewport(
     }
     else {
 	/* Wait until vertical retrace is in progress. */
-	while (inb(0x3DA) & 0x08);
-	while (!(inb(0x3DA) & 0x08));            
+	while (inb(pApm->iobase + 0x3DA) & 0x08);
+	while (!(inb(pApm->iobase + 0x3DA) & 0x08));            
     }
 }
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c
index 62eabc100..dd877d318 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c
@@ -1,6 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.56 2002/01/04 21:22:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.61 2002/10/16 21:13:46 dawes Exp $ */
 
-#define COMPILER_H_EXTRAS
 #include "apm.h"
 #include "xf86cmap.h"
 #include "shadowfb.h"
@@ -53,7 +52,7 @@ static void	ApmProbeDDC(ScrnInfoPtr pScrn, int index);
 
 
 int ApmPixmapIndex = -1;
-static int ApmGeneration = -1;
+static unsigned long ApmGeneration = 0;
 
 DriverRec APM = {
 	VERSION,
@@ -92,6 +91,10 @@ typedef enum {
     OPTION_NOACCEL,
     OPTION_SHADOW_FB,
     OPTION_PCI_BURST,
+    OPTION_REMAP_DPMS_ON,
+    OPTION_REMAP_DPMS_STANDBY,
+    OPTION_REMAP_DPMS_SUSPEND,
+    OPTION_REMAP_DPMS_OFF,
     OPTION_PCI_RETRY
 } ApmOpts;
 
@@ -102,7 +105,7 @@ static const OptionInfoRec ApmOptions[] =
     {OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN,
 	{0}, FALSE},
     {OPTION_HW_CURSOR, "HWcursor", OPTV_BOOLEAN,
-	{0}, FALSE},
+	{0}, TRUE},
     {OPTION_NOLINEAR, "NoLinear", OPTV_BOOLEAN,
 	{0}, FALSE},
     {OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN,
@@ -111,6 +114,14 @@ static const OptionInfoRec ApmOptions[] =
 	{0}, FALSE},
     {OPTION_PCI_BURST, "pci_burst", OPTV_BOOLEAN,
 	{0}, FALSE},
+    {OPTION_REMAP_DPMS_ON, "Remap_DPMS_On", OPTV_ANYSTR,
+	{0}, FALSE},
+    {OPTION_REMAP_DPMS_STANDBY, "Remap_DPMS_Standby", OPTV_ANYSTR,
+	{0}, FALSE},
+    {OPTION_REMAP_DPMS_SUSPEND, "Remap_DPMS_Suspend", OPTV_ANYSTR,
+	{0}, FALSE},
+    {OPTION_REMAP_DPMS_OFF, "Remap_DPMS_Off", OPTV_ANYSTR,
+	{0}, FALSE},
     {OPTION_PCI_RETRY, "PciRetry", OPTV_BOOLEAN,
 	{0}, FALSE},
     {-1, NULL, OPTV_NONE,
@@ -283,7 +294,7 @@ ApmUnlock(ApmPtr pApm)
     if (pApm->Chipset >= AT3D && !pApm->noLinear)
 	ApmWriteSeq(0x10, 0x12);
     else
-	wrinx(0x3C4, 0x10, 0x12);
+	wrinx(pApm->xport, 0x10, 0x12);
 }
 
 /* lock Alliance registers */
@@ -293,7 +304,7 @@ ApmLock(ApmPtr pApm)
     if (pApm->Chipset >= AT3D && !pApm->noLinear)
 	ApmWriteSeq(0x10, pApm->savedSR10 ? 0 : 0x12);
     else
-	wrinx(0x3C4, 0x10, pApm->savedSR10 ? 0 : 0x12);
+	wrinx(pApm->xport, 0x10, pApm->savedSR10 ? 0 : 0x12);
 }
 
 static void
@@ -500,8 +511,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 {
     APMDECL(pScrn);
     EntityInfoPtr	pEnt;
+    vgaHWPtr		hwp;
     MessageType		from;
-    char		*mod = NULL, *req = NULL;
+    char		*mod = NULL, *req = NULL, *s;
     ClockRangePtr	clockRanges;
     int			i;
     xf86MonPtr		MonInfo = NULL;
@@ -559,11 +571,15 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     if (!vgaHWGetHWRec(pScrn))
 	return FALSE;
 
-    vgaHWGetIOBase(VGAHWPTR(pScrn));
+    hwp = VGAHWPTR(pScrn);
+    vgaHWGetIOBase(hwp);
+    pApm->iobase = hwp->PIOOffset;
+    pApm->xport = hwp->PIOOffset + 0x3C4;
 
     /* Set pScrn->monitor */
     pScrn->monitor = pScrn->confScreen->monitor;
 
+    /* XXX: Access funcs */
     /*
      * The first thing we should figure out is the depth, bpp, etc.
      */
@@ -586,6 +602,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	    return FALSE;
 	}
     }
+    xf86PrintDepthBpp(pScrn);
 
     /*
      * This must happen after pScrn->display has been set because
@@ -674,6 +691,70 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	else
 	  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"pci_retry\" option requires pci_burst \"on\".\n");
     }
+    pApm->DPMSMask[DPMSModeOn]		= DPMSModeOn;
+    pApm->DPMSMask[DPMSModeStandby]	= DPMSModeStandby;
+    pApm->DPMSMask[DPMSModeSuspend]	= DPMSModeSuspend;
+    pApm->DPMSMask[DPMSModeOff]		= DPMSModeOff;
+    if ((s = xf86GetOptValString(pApm->Options, OPTION_REMAP_DPMS_ON))) {
+	if (!strcmp(s, "on"))
+	    pApm->DPMSMask[DPMSModeOn] = DPMSModeOn;
+	else if (!strcmp(s, "standby"))
+	    pApm->DPMSMask[DPMSModeOn] = DPMSModeStandby;
+	else if (!strcmp(s, "suspend"))
+	    pApm->DPMSMask[DPMSModeOn] = DPMSModeSuspend;
+	else if (!strcmp(s, "off"))
+	    pApm->DPMSMask[DPMSModeOn] = DPMSModeOff;
+	else if (s[0] >= '0' && s[0] <= '9') {
+	    pApm->DPMSMask[DPMSModeOn] = strtol(s, NULL, 0);
+	    if (pApm->DPMSMask[DPMSModeOn] > (sizeof pApm->DPMSMask)-1)
+		pApm->DPMSMask[DPMSModeOn] = (sizeof pApm->DPMSMask) - 1;
+	}
+    }
+    if ((s = xf86GetOptValString(pApm->Options, OPTION_REMAP_DPMS_STANDBY))) {
+	if (!strcmp(s, "on"))
+	    pApm->DPMSMask[DPMSModeStandby] = DPMSModeOn;
+	else if (!strcmp(s, "standby"))
+	    pApm->DPMSMask[DPMSModeStandby] = DPMSModeStandby;
+	else if (!strcmp(s, "suspend"))
+	    pApm->DPMSMask[DPMSModeStandby] = DPMSModeSuspend;
+	else if (!strcmp(s, "off"))
+	    pApm->DPMSMask[DPMSModeStandby] = DPMSModeOff;
+	else if (s[0] >= '0' && s[0] <= '9') {
+	    pApm->DPMSMask[DPMSModeStandby] = strtol(s, NULL, 0);
+	    if (pApm->DPMSMask[DPMSModeStandby] > (sizeof pApm->DPMSMask)-1)
+		pApm->DPMSMask[DPMSModeStandby] = (sizeof pApm->DPMSMask) - 1;
+	}
+    }
+    if ((s = xf86GetOptValString(pApm->Options, OPTION_REMAP_DPMS_SUSPEND))) {
+	if (!strcmp(s, "on"))
+	    pApm->DPMSMask[DPMSModeSuspend] = DPMSModeOn;
+	else if (!strcmp(s, "standby"))
+	    pApm->DPMSMask[DPMSModeSuspend] = DPMSModeStandby;
+	else if (!strcmp(s, "suspend"))
+	    pApm->DPMSMask[DPMSModeSuspend] = DPMSModeSuspend;
+	else if (!strcmp(s, "off"))
+	    pApm->DPMSMask[DPMSModeSuspend] = DPMSModeOff;
+	else if (s[0] >= '0' && s[0] <= '9') {
+	    pApm->DPMSMask[DPMSModeSuspend] = strtol(s, NULL, 0);
+	    if (pApm->DPMSMask[DPMSModeSuspend] > (sizeof pApm->DPMSMask)-1)
+		pApm->DPMSMask[DPMSModeSuspend] = (sizeof pApm->DPMSMask) - 1;
+	}
+    }
+    if ((s = xf86GetOptValString(pApm->Options, OPTION_REMAP_DPMS_OFF))) {
+	if (!strcmp(s, "on"))
+	    pApm->DPMSMask[DPMSModeOff] = DPMSModeOn;
+	else if (!strcmp(s, "standby"))
+	    pApm->DPMSMask[DPMSModeOff] = DPMSModeStandby;
+	else if (!strcmp(s, "suspend"))
+	    pApm->DPMSMask[DPMSModeOff] = DPMSModeSuspend;
+	else if (!strcmp(s, "off"))
+	    pApm->DPMSMask[DPMSModeOff] = DPMSModeOff;
+	else if (s[0] >= '0' && s[0] <= '9') {
+	    pApm->DPMSMask[DPMSModeOff] = strtol(s, NULL, 0);
+	    if (pApm->DPMSMask[DPMSModeOff] > (sizeof pApm->DPMSMask)-1)
+		pApm->DPMSMask[DPMSModeOff] = (sizeof pApm->DPMSMask) - 1;
+	}
+    }
 
     /*
      * Set the Chipset and ChipRev, allowing config file entries to
@@ -783,7 +864,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     }
 
     xf86RegisterResources(pEnt->index, NULL, ResNone);
-    xf86SetOperatingState(RES_SHARED_VGA, pEnt->index, ResDisableOpr);
+    xf86SetOperatingState(resVga, pEnt->index, ResDisableOpr);
     pScrn->racMemFlags = 0;	/* For noLinear, access to 0xA0000 */
     if (pApm->VGAMap)
 	pScrn->racIoFlags = 0;
@@ -831,11 +912,13 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 
 	save = pciReadLong(pApm->PciTag, PCI_CMD_STAT_REG);
 	pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save | PCI_CMD_IO_ENABLE);*/
-	pApm->savedSR10 = rdinx(0x3C4, 0x10);
-	wrinx(0x3C4, 0x10, 0x12);
-	pScrn->videoRam = rdinx(0x3C4, 0x20) * 64;
-	pApm->xbase = (rdinx(0x3C4, 0x1F) << 8) | rdinx(0x3C4, 0x1E);
-	wrinx(0x3C4, 0x10, pApm->savedSR10 ? 0 : 0x12);
+	pApm->savedSR10 = rdinx(pApm->xport, 0x10);
+	wrinx(pApm->xport, 0x10, 0x12);
+	pScrn->videoRam = rdinx(pApm->xport, 0x20) * 64;
+	pApm->xbase = rdinx(pApm->xport, 0x1F) << 8;
+	pApm->xbase |= rdinx(pApm->xport, 0x1E);
+	pApm->xbase += pApm->iobase;
+	wrinx(pApm->xport, 0x10, pApm->savedSR10 ? 0 : 0x12);
 	/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
 	from = X_PROBED;
     }
@@ -846,8 +929,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
                pScrn->videoRam);
 
     if (!xf86IsPc98()) {
-	vgaHWGetIOBase(VGAHWPTR(pScrn));
-	VGAHWPTR(pScrn)->MapSize = 0x10000;
+	hwp->MapSize = 0x10000;
 	vgaHWMapMem(pScrn);
 	if (pApm->I2C) {
 	    if (!ApmI2CInit(pScrn)) {
@@ -857,7 +939,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 		MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pApm->I2CPtr);
 	    }
 	}
-	if (!MonInfo)
+	if (0 && !MonInfo)
 	    MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex,vgaHWddc1SetSpeed,ddc1Read);
 	if (MonInfo)
 	    xf86PrintEDID(MonInfo);
@@ -1232,7 +1314,7 @@ ApmSave(ScrnInfoPtr pScrn)
 {
     APMDECL(pScrn);
     ApmRegPtr	ApmReg = &pApm->SavedReg;
-    vgaHWPtr	vgaHWP = VGAHWPTR(pScrn);
+    vgaHWPtr	hwp    = VGAHWPTR(pScrn);
 
     if (pApm->VGAMap) {
 	ApmReg->SEQ[0x1B] = ApmReadSeq(0x1B);
@@ -1241,7 +1323,7 @@ ApmSave(ScrnInfoPtr pScrn)
 	/*
 	 * Save fonts
 	 */
-	if (!(vgaHWP->SavedReg.Attribute[0x10] & 1)) {
+	if (!(hwp->SavedReg.Attribute[0x10] & 1)) {
 	    if (pApm->FontInfo || (pApm->FontInfo = (pointer)xalloc(TEXT_AMOUNT))) {
 		int locked;
 
@@ -1259,7 +1341,7 @@ ApmSave(ScrnInfoPtr pScrn)
 	 * This function will handle creating the data structure and filling
 	 * in the generic VGA portion.
 	 */
-	vgaHWSave(pScrn, &vgaHWP->SavedReg, VGA_SR_MODE | VGA_SR_CMAP);
+	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_CMAP);
 
 	/* Hardware cursor registers. */
 	ApmReg->EX[XR140] = RDXL(0x140);
@@ -1288,10 +1370,10 @@ ApmSave(ScrnInfoPtr pScrn)
 	 * This function will handle creating the data structure and filling
 	 * in the generic VGA portion.
 	 */
-	vgaHWSave(pScrn, &vgaHWP->SavedReg, VGA_SR_ALL);
+	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
 
-	ApmReg->SEQ[0x1B] = rdinx(0x3C4, 0x1B);
-	ApmReg->SEQ[0x1C] = rdinx(0x3C4, 0x1C);
+	ApmReg->SEQ[0x1B] = rdinx(pApm->xport, 0x1B);
+	ApmReg->SEQ[0x1C] = rdinx(pApm->xport, 0x1C);
 
 	/* Hardware cursor registers. */
 	if (pApm->noLinear) {
@@ -1307,12 +1389,12 @@ ApmSave(ScrnInfoPtr pScrn)
 	    ApmReg->EX[XR14C] = RDXW(0x14C);
 	}
 
-	ApmReg->CRT[0x19] = rdinx(0x3D4, 0x19);
-	ApmReg->CRT[0x1A] = rdinx(0x3D4, 0x1A);
-	ApmReg->CRT[0x1B] = rdinx(0x3D4, 0x1B);
-	ApmReg->CRT[0x1C] = rdinx(0x3D4, 0x1C);
-	ApmReg->CRT[0x1D] = rdinx(0x3D4, 0x1D);
-	ApmReg->CRT[0x1E] = rdinx(0x3D4, 0x1E);
+	ApmReg->CRT[0x19] = rdinx(pApm->iobase + 0x3D4, 0x19);
+	ApmReg->CRT[0x1A] = rdinx(pApm->iobase + 0x3D4, 0x1A);
+	ApmReg->CRT[0x1B] = rdinx(pApm->iobase + 0x3D4, 0x1B);
+	ApmReg->CRT[0x1C] = rdinx(pApm->iobase + 0x3D4, 0x1C);
+	ApmReg->CRT[0x1D] = rdinx(pApm->iobase + 0x3D4, 0x1D);
+	ApmReg->CRT[0x1E] = rdinx(pApm->iobase + 0x3D4, 0x1E);
 
 	if (pApm->noLinear) {
 	    /* RAMDAC registers. */
@@ -1671,8 +1753,8 @@ ApmRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, ApmRegPtr ApmReg)
 	/*
 	 * Write the extended registers first
 	 */
-	wrinx(0x3C4, 0x1B, ApmReg->SEQ[0x1B]);
-	wrinx(0x3C4, 0x1C, ApmReg->SEQ[0x1C]);
+	wrinx(pApm->xport, 0x1B, ApmReg->SEQ[0x1B]);
+	wrinx(pApm->xport, 0x1C, ApmReg->SEQ[0x1C]);
 
 	/* Hardware cursor registers. */
 	if (pApm->noLinear) {
@@ -1688,12 +1770,12 @@ ApmRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, ApmRegPtr ApmReg)
 	    WRXW(0x14C, ApmReg->EX[XR14C]);
 	}
 
-	wrinx(0x3D4, 0x19, ApmReg->CRT[0x19]);
-	wrinx(0x3D4, 0x1A, ApmReg->CRT[0x1A]);
-	wrinx(0x3D4, 0x1B, ApmReg->CRT[0x1B]);
-	wrinx(0x3D4, 0x1C, ApmReg->CRT[0x1C]);
-	wrinx(0x3D4, 0x1D, ApmReg->CRT[0x1D]);
-	wrinx(0x3D4, 0x1E, ApmReg->CRT[0x1E]);
+	wrinx(pApm->iobase + 0x3D4, 0x19, ApmReg->CRT[0x19]);
+	wrinx(pApm->iobase + 0x3D4, 0x1A, ApmReg->CRT[0x1A]);
+	wrinx(pApm->iobase + 0x3D4, 0x1B, ApmReg->CRT[0x1B]);
+	wrinx(pApm->iobase + 0x3D4, 0x1C, ApmReg->CRT[0x1C]);
+	wrinx(pApm->iobase + 0x3D4, 0x1D, ApmReg->CRT[0x1D]);
+	wrinx(pApm->iobase + 0x3D4, 0x1E, ApmReg->CRT[0x1E]);
 
 	/* RAMDAC registers. */
 	if (pApm->noLinear) {
@@ -1951,6 +2033,9 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     pApm->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = ApmCloseScreen;
 
+    pScrn->memPhysBase = pApm->LinAddress;
+    pScrn->fbOffset = (((char *)pApm->FbBase) - ((char *)pApm->LinMap));
+
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1) {
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
@@ -1992,11 +2077,11 @@ ApmLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 	for (i = 0; i < numColors; i++) {
 	    index = indices[i];
 	    if (index != last) 
-		outb(0x3C8, index);
+		outb(pApm->iobase + 0x3C8, index);
 	    last = index + 1;
-	    outb(0x3C9, colors[index].red);
-	    outb(0x3C9, colors[index].green);
-	    outb(0x3C9, colors[index].blue);
+	    outb(pApm->iobase + 0x3C9, colors[index].red);
+	    outb(pApm->iobase + 0x3C9, colors[index].green);
+	    outb(pApm->iobase + 0x3C9, colors[index].blue);
 	}
     }
 }
@@ -2037,14 +2122,14 @@ ApmAdjustFrame(int scrnIndex, int x, int y, int flags)
 	ApmWriteCrtc(0x1C, (ApmReadCrtc(0x1C) & 0xF0) | ((Base & 0x0F0000) >> 16));
     }
     else {
-	outw(0x3D4, (Base & 0x00FF00) | 0x0C);
-	outw(0x3D4, ((Base & 0x00FF) << 8) | 0x0D);
+	outw(pApm->iobase + 0x3D4, (Base & 0x00FF00) | 0x0C);
+	outw(pApm->iobase + 0x3D4, ((Base & 0x00FF) << 8) | 0x0D);
 
 	/*
 	 * Here the high-order bits are masked and shifted, and put into
 	 * the appropriate extended registers.
 	 */
-	modinx(0x3D4, 0x1C, 0x0F, (Base & 0x0F0000) >> 16);
+	modinx(pApm->iobase + 0x3D4, 0x1C, 0x0F, (Base & 0x0F0000) >> 16);
     }
 }
 
@@ -2097,12 +2182,12 @@ ApmLeaveVT(int scrnIndex, int flags)
     APMDECL(pScrn);
     vgaHWPtr	hwp = VGAHWPTR(pScrn);
 
-    ApmRestore(pScrn, &VGAHWPTR(pScrn)->SavedReg, &pApm->SavedReg);
+    ApmRestore(pScrn, &hwp->SavedReg, &pApm->SavedReg);
     /*
      * Reset color mode
      */
-    hwp->writeMiscOut(hwp, pApm->MiscOut);
-    vgaHWLock(VGAHWPTR(pScrn));
+    (*hwp->writeMiscOut)(hwp, pApm->MiscOut);
+    vgaHWLock(hwp);
     ApmLock(pApm);
     if (pApm->Chipset >= AT3D) {
 	if (!pApm->noLinear) {
@@ -2134,7 +2219,7 @@ ApmCloseScreen(int scrnIndex, ScreenPtr pScreen)
     APMDECL(pScrn);
 
     if (pScrn->vtSema) {
-	ApmRestore(pScrn, &VGAHWPTR(pScrn)->SavedReg, &pApm->SavedReg);
+	ApmRestore(pScrn, &hwp->SavedReg, &pApm->SavedReg);
 	vgaHWLock(hwp);
 	ApmUnmapMem(pScrn);
     }
@@ -2198,6 +2283,9 @@ ApmDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
     APMDECL(pScrn);
     unsigned char dpmsreg, tmp;
 
+    if (PowerManagementMode < sizeof pApm->DPMSMask &&
+	    PowerManagementMode >= 0)
+	PowerManagementMode = pApm->DPMSMask[PowerManagementMode];
     switch (PowerManagementMode)
     {
     case DPMSModeOn:
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c
index 3742fff80..71f0fe86b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.15 2001/10/01 13:44:03 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.17 2002/05/07 12:53:49 alanh Exp $ */
 
 #define FASTER
 #ifndef PSZ
@@ -19,7 +19,7 @@
 #  define WRXB	WRXB_IOP
 #  define WRXW	WRXW_IOP
 #  define WRXL	WRXL_IOP
-#  define ApmWriteSeq(i, v)	wrinx(0x3C4, i, v)
+#  define ApmWriteSeq(i, v)	wrinx(pApm->xport, i, v)
 #else
 #  define APM_SUFF_IOP	""
 #endif
@@ -887,7 +887,7 @@ A(SetupForImageWrite)(ScrnInfoPtr pScrn, int rop, unsigned int planemask,
 {
   APMDECL(pScrn);
 
-  DPRINTNAME(SetupForImageWriteRect);
+  DPRINTNAME(SetupForImageWrite);
   if (trans_color != -1)
   {
 #ifndef FASTER
@@ -1200,19 +1200,25 @@ A(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
     int PlusOne = 0, mask, count;
 
     DPRINTNAME(WritePixmap);
+    if (rop == GXnoop)
+	return;
+    /*
+     * The function seems to crash more than it feels good. I hope that a
+     * good sync will help. This sync is anyway needed for direct write.
+     */
+    (*pApm->AccelInfoRec->Sync)(pScrn);
     /*
      * First the fast case : source and dest have same alignment. Doc says
      * it's faster to do it here, which may be true since one has to read
      * the chip when CPU to screen-ing.
      */
-    if ((skipleft = (long)src & 3L) == ((long)dst & 3L)) {
+    if ((skipleft = (long)src & 3L) == ((long)dst & 3L) && rop == GXcopy) {
 	int skipright;
 
 	if (skipleft)
 	    skipleft = 4 - skipleft;
 	dwords = (skipright = w * Bpp - skipleft) >> 2;
 	skipright %= 4;
-	(*pApm->AccelInfoRec->Sync)(pScrn);
 	if (!skipleft && !skipright)
 	    while (h-- > 0) {
 		CARD32 *src2 = (CARD32 *)src;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c
index 6e8ac49fe..dc250b146 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c
@@ -1,6 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6 2001/01/06 21:29:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.7 2002/01/25 21:55:55 tsi Exp $ */
 
-#define COMPILER_H_EXTRAS
 #include "apm.h"
 #include "apm_regs.h"
 
@@ -32,15 +31,15 @@ ApmI2CPutBits(I2CBusPtr b, int clock,  int data)
     unsigned char	lock;
     ApmPtr pApm = ((ApmPtr)b->DriverPrivate.ptr);
 
-    lock = rdinx(0x3C4, 0x10);
-    wrinx(0x3C4, 0x10, 0x12);
+    lock = rdinx(pApm->xport, 0x10);
+    wrinx(pApm->xport, 0x10, 0x12);
     WaitForFifo(pApm, 2);
     reg = (RDXB_IOP(0xD0) & 0x07) | 0x60;
     if(clock) reg |= 0x08;
     if(data)  reg |= 0x10;
     WRXB_IOP(0xD0, reg);
     if (lock)
-	wrinx(0x3C4, 0x10, 0);
+	wrinx(pApm->xport, 0x10, 0);
 }
 
 static void
@@ -51,8 +50,8 @@ ApmI2CGetBits(I2CBusPtr b, int *clock, int *data)
     ApmPtr pApm = ((ApmPtr)b->DriverPrivate.ptr);
     unsigned char	tmp;
 
-    lock = rdinx(0x3C4, 0x10);
-    wrinx(0x3C4, 0x10, 0x12);
+    lock = rdinx(pApm->xport, 0x10);
+    wrinx(pApm->xport, 0x10, 0x12);
     WaitForFifo(pApm, 2);
     tmp = RDXB_IOP(0xD0);
     WRXB_IOP(0xD0, tmp & 0x07);
@@ -60,7 +59,7 @@ ApmI2CGetBits(I2CBusPtr b, int *clock, int *data)
     *clock = (reg & STATUS_SCL) != 0;
     *data  = (reg & STATUS_SDA) != 0;
     if (lock)
-	wrinx(0x3C4, 0x10, 0);
+	wrinx(pApm->xport, 0x10, 0);
 }
 
 Bool 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h
index 5f2699384..633a1eb5f 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.7 2000/02/29 03:09:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.8 2002/01/25 21:55:55 tsi Exp $ */
 
 
 
@@ -48,27 +48,39 @@
 			curr32[MIN(((addr) / 4), 0x20)] = (val); }} while (0)
 
 /* IO port access to extended registers */
-#define RDXB_IOP(addr)     (wrinx(0x3C4, 0x1D, (addr) >> 2),inb(pApm->xbase + ((addr) & 3)))
-#define RDXW_IOP(addr)     (wrinx(0x3C4, 0x1D, (addr) >> 2),inw(pApm->xbase + ((addr) & 2)))
-#define RDXL_IOP(addr)     (wrinx(0x3C4, 0x1D, (addr) >> 2),inl(pApm->xbase))
-#define WRXB_IOP(addr,val) do { if (check08((addr), (val))) {		     \
-				    wrinx(0x3C4, 0x1D, (addr) >> 2);	     \
-				    outb(pApm->xbase + ((addr) & 3), (val)); \
-				    curr08[MIN((addr), 0x80)] = (val);	     \
-				    break;				     \
-				}} while (1)
-#define WRXW_IOP(addr,val) do { if (check16((addr), (val))) {		     \
-				    wrinx(0x3C4, 0x1D, (addr) >> 2);	     \
-				    outw(pApm->xbase + ((addr) & 2), (val)); \
-				    curr16[MIN(((addr) / 2), 0x40)] = (val); \
-				    break;				     \
-				}} while (1)
-#define WRXL_IOP(addr,val) do { if (check32((addr), (val))) {		     \
-				    wrinx(0x3C4, 0x1D, (addr) >> 2);	     \
-				    outl(pApm->xbase, (val));		     \
-				    curr32[MIN(((addr) / 4), 0x20)] = (val); \
-				    break;				     \
-				}} while (1)
+#define RDXB_IOP(addr)     (wrinx(pApm->xport, 0x1D, (addr) >> 2), \
+			    inb(pApm->xbase + ((addr) & 3)))
+#define RDXW_IOP(addr)     (wrinx(pApm->xport, 0x1D, (addr) >> 2), \
+			    inw(pApm->xbase + ((addr) & 2)))
+#define RDXL_IOP(addr)     (wrinx(pApm->xport, 0x1D, (addr) >> 2), \
+			    inl(pApm->xbase))
+#define WRXB_IOP(addr,val)					   \
+    do { 							   \
+	if (check08((addr), (val))) {				   \
+	    wrinx(pApm->xport, 0x1D, (addr) >> 2);		   \
+	    outb(pApm->xbase + ((addr) & 3), (val));		   \
+	    curr08[MIN((addr), 0x80)] = (val);			   \
+	    break;						   \
+	}							   \
+    } while (1)
+#define WRXW_IOP(addr,val)					   \
+    do {							   \
+	if (check16((addr), (val))) {				   \
+	    wrinx(pApm->xport, 0x1D, (addr) >> 2);		   \
+	    outw(pApm->xbase + ((addr) & 2), (val));		   \
+	    curr16[MIN(((addr) / 2), 0x40)] = (val);		   \
+	    break;						   \
+	}							   \
+    } while (1)
+#define WRXL_IOP(addr,val)					   \
+    do {							   \
+	if (check32((addr), (val))) {				   \
+	    wrinx(pApm->xport, 0x1D, (addr) >> 2);		   \
+	    outl(pApm->xbase, (val));				   \
+	    curr32[MIN(((addr) / 4), 0x20)] = (val);		   \
+	    break;						   \
+	}							   \
+    } while (1)
 
 #define WRXL	WRXL_M
 #define WRXW	WRXW_M
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c
index b41b1e6d2..7cab40ac9 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c
@@ -1,9 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.10 2001/05/23 20:13:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11 2002/01/25 21:55:55 tsi Exp $ */
 /*
  * Copyright Loïc Grenié 1999
  */
 
-#define COMPILER_H_EXTRAS
 #include "apm.h"
 #include "xaalocal.h"
 
@@ -271,8 +270,8 @@ xf86RushUnlockPixmap(int scrnIndex, PixmapPtr pix)
 
 	    db = RDXB_IOP(0xDB);
 	    WRXB_IOP(0xDB, (db & 0xF4) |  0x0A);
-	    wrinx(0x3C4, 0x1B, 0x20);
-	    wrinx(0x3C4, 0x1C, 0x2F);
+	    wrinx(pApm->xport, 0x1B, 0x20);
+	    wrinx(pApm->xport, 0x1C, 0x2F);
 	}
 	pApm->apmLock = FALSE;
     }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h
index c03e4c290..a76ff2697 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
 /*
  * ark
  */
@@ -69,4 +69,16 @@ typedef struct _ARKRec {
 
 Bool ARKAccelInit(ScreenPtr pScreen);
 
+#define rdinx(port, ind)	(outb((port), (ind)), inb((port) + 1))
+#define wrinx(port, ind, val)						\
+    do {								\
+	outb((port), (ind));  outb((port) + 1, (val));			\
+    } while(0)
+#define modinx(port, ind, mask, bits)					\
+    do {								\
+	unsigned char tmp;						\
+	tmp = (rdinx((port), (ind)) & ~(mask)) | ((bits) & (mask));	\
+	wrinx((port), (ind), tmp);					\
+    } while(0)
+
 #endif /* _ARK_H */
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c
index cfe8ae1a5..0640a09fe 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.5 2001/01/29 15:15:44 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
 /*
  *      Copyright 2000  Ani Joshi <ajoshi@unixbox.com>
  *
@@ -46,8 +46,10 @@ int curx, cury, cmd_flags;
 
 static void ARKSync(ScrnInfoPtr pScrn)
 {
+	IOADDRESS port = pScrn->domainIOBase + 0x3cb;
+
 	for (;;) {
-		if (!(inb(0x3cb) & 0x40))
+		if (!(inb(port) & 0x40))
 			break;
 	}
 }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c
index 4c9d31413..0d84bce38 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.19 2001/10/28 03:33:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.21 2002/07/24 01:47:24 tsi Exp $ */
 /*
  *	Copyright 2000	Ani Joshi <ajoshi@unixbox.com>
  *
@@ -28,7 +28,6 @@
  *
  */
 
-#define COMPILER_H_EXTRAS
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
@@ -73,8 +72,8 @@ static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
 static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new);
 
 /* helpers */
-static unsigned char get_daccomm(void);
-static unsigned char set_daccom(unsigned char comm);
+static unsigned char get_daccomm(IOADDRESS);
+static unsigned char set_daccom(IOADDRESS, unsigned char comm);
 
 
 DriverRec ARK =
@@ -350,8 +349,8 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 
 	pARK->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
 	xf86RegisterResources(pEnt->index, NULL, ResNone);
-	xf86SetOperatingState(RES_SHARED_VGA, pEnt->index, ResUnusedOpr);
-	xf86SetOperatingState(resVgaMemShared, pEnt->index, ResDisableOpr);
+	xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
+	xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
 
 	if (pEnt->device->chipset && *pEnt->device->chipset) {
 		pScrn->chipset = pEnt->device->chipset;
@@ -383,14 +382,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 			      pARK->PciInfo->func);
 
 	/* unlock CRTC[0-7] */
-	outb(hwp->IOBase + 4, 0x11);
-	tmp = inb(hwp->IOBase + 5);
-	outb(hwp->IOBase + 5, tmp & 0x7f);
-	modinx(0x3c4, 0x1d, 0x01, 0x01);
+	outb(hwp->PIOOffset + hwp->IOBase + 4, 0x11);
+	tmp = inb(hwp->PIOOffset + hwp->IOBase + 5);
+	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
+	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
 
 	/* use membase's later on ??? */
-	pARK->FBAddress = (rdinx(0x3c4, 0x13) << 16) +
-			  (rdinx(0x3c4, 0x14) << 24);
+	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
+			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
 
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n",
 		   pARK->FBAddress);
@@ -401,7 +400,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 	if (!pScrn->videoRam) {
 		unsigned char sr10;
 
-		sr10 = rdinx(0x3c4, 0x10);
+		sr10 = rdinx(hwp->PIOOffset + 0x3c4, 0x10);
 		if (pARK->Chipset == PCI_CHIP_1000PV) {
 			if ((sr10 & 0x40) == 0)
 				pScrn->videoRam = 1024;
@@ -426,9 +425,9 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 	{
 		int man_id, dev_id;
 
-		inb(0x3c6);		/* skip command register */
-		man_id = inb(0x3c6);	/* manufacturer id */
-		dev_id = inb(0x3c6);	/* device id */
+		inb(hwp->PIOOffset + 0x3c6);		/* skip cmd register */
+		man_id = inb(hwp->PIOOffset + 0x3c6);	/* manufacturer id */
+		dev_id = inb(hwp->PIOOffset + 0x3c6);	/* device id */
 		if (man_id == 0x84 && dev_id == 0x98) {
 			pARK->ramdac = ZOOMDAC;
 			pARK->dac_width = 16;
@@ -605,45 +604,46 @@ static void ARKSave(ScrnInfoPtr pScrn)
 	ARKPtr pARK = ARKPTR(pScrn);
 	ARKRegPtr save = &pARK->SavedRegs;
 	vgaHWPtr hwp = VGAHWPTR(pScrn);
-	int vgaIOBase = hwp->IOBase;
+	IOADDRESS isaIOBase = hwp->PIOOffset;
+	IOADDRESS vgaIOBase = isaIOBase + hwp->IOBase;
 
 	vgaHWUnlock(hwp);
 	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
 	vgaHWLock(hwp);
 
 	/* set read and write aperture index to 0 */
-	wrinx(0x3c4, 0x15, 0x00);
-	wrinx(0x3c4, 0x16, 0x00);
-	outb(0x3c8, 0);		/* reset DAC register access mode */
-
-	save->sr10 = rdinx(0x3c4, 0x10);
-	save->sr11 = rdinx(0x3c4, 0x11);
-	save->sr12 = rdinx(0x3c4, 0x12);
-	save->sr13 = rdinx(0x3c4, 0x13);
-	save->sr14 = rdinx(0x3c4, 0x14);
-	save->sr15 = rdinx(0x3c4, 0x15);
-	save->sr16 = rdinx(0x3c4, 0x16);
-	save->sr17 = rdinx(0x3c4, 0x17);
-	save->sr18 = rdinx(0x3c4, 0x18);
+	wrinx(isaIOBase + 0x3c4, 0x15, 0x00);
+	wrinx(isaIOBase + 0x3c4, 0x16, 0x00);
+	outb(isaIOBase + 0x3c8, 0);	/* reset DAC register access mode */
+
+	save->sr10 = rdinx(isaIOBase + 0x3c4, 0x10);
+	save->sr11 = rdinx(isaIOBase + 0x3c4, 0x11);
+	save->sr12 = rdinx(isaIOBase + 0x3c4, 0x12);
+	save->sr13 = rdinx(isaIOBase + 0x3c4, 0x13);
+	save->sr14 = rdinx(isaIOBase + 0x3c4, 0x14);
+	save->sr15 = rdinx(isaIOBase + 0x3c4, 0x15);
+	save->sr16 = rdinx(isaIOBase + 0x3c4, 0x16);
+	save->sr17 = rdinx(isaIOBase + 0x3c4, 0x17);
+	save->sr18 = rdinx(isaIOBase + 0x3c4, 0x18);
 
 #if 0
-	save->sr1d = rdinx(0x3c4, 0x1d);
-	save->sr1c = rdinx(0x3c4, 0x1c);
-
-	save->sr20 = rdinx(0x3c4, 0x20);
-	save->sr21 = rdinx(0x3c4, 0x21);
-	save->sr22 = rdinx(0x3c4, 0x22);
-	save->sr23 = rdinx(0x3c4, 0x23);
-	save->sr24 = rdinx(0x3c4, 0x24);
-	save->sr25 = rdinx(0x3c4, 0x25);
-	save->sr26 = rdinx(0x3c4, 0x26);
-	save->sr27 = rdinx(0x3c4, 0x27);
-	save->sr29 = rdinx(0x3c4, 0x29);
-	save->sr2a = rdinx(0x3c4, 0x2a);
+	save->sr1d = rdinx(isaIOBase + 0x3c4, 0x1d);
+	save->sr1c = rdinx(isaIOBase + 0x3c4, 0x1c);
+
+	save->sr20 = rdinx(isaIOBase + 0x3c4, 0x20);
+	save->sr21 = rdinx(isaIOBase + 0x3c4, 0x21);
+	save->sr22 = rdinx(isaIOBase + 0x3c4, 0x22);
+	save->sr23 = rdinx(isaIOBase + 0x3c4, 0x23);
+	save->sr24 = rdinx(isaIOBase + 0x3c4, 0x24);
+	save->sr25 = rdinx(isaIOBase + 0x3c4, 0x25);
+	save->sr26 = rdinx(isaIOBase + 0x3c4, 0x26);
+	save->sr27 = rdinx(isaIOBase + 0x3c4, 0x27);
+	save->sr29 = rdinx(isaIOBase + 0x3c4, 0x29);
+	save->sr2a = rdinx(isaIOBase + 0x3c4, 0x2a);
 	if ((pARK->Chipset == PCI_CHIP_2000PV) ||
 	    (pARK->Chipset == PCI_CHIP_2000MT)) {
-		save->sr28 = rdinx(0x3c4, 0x28);
-		save->sr2b = rdinx(0x3c4, 0x2b);
+		save->sr28 = rdinx(isaIOBase + 0x3c4, 0x28);
+		save->sr2b = rdinx(isaIOBase + 0x3c4, 0x2b);
 	}
 #endif
 
@@ -657,7 +657,7 @@ static void ARKSave(ScrnInfoPtr pScrn)
 		save->cr46 = rdinx(vgaIOBase + 4, 0x46);
 
 	/* save RAMDAC regs here, based on type */
-	save->dac_command = get_daccomm();
+	save->dac_command = get_daccomm(isaIOBase);
 }
 
 
@@ -669,7 +669,8 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	int multiplexing, dac16, modepitch;
 	vgaHWPtr hwp = VGAHWPTR(pScrn);
 	vgaRegPtr pVga = &hwp->ModeReg;
-	int vgaIOBase = hwp->IOBase;
+	IOADDRESS isaIOBase = hwp->PIOOffset;
+	IOADDRESS vgaIOBase = isaIOBase + hwp->IOBase;
 	unsigned char tmp;
 	int offset;
 
@@ -772,13 +773,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	new->sr17 &= ~0xc7;
 	new->sr17 |= modepitch;
 
-	new->sr10 = rdinx(0x3c4, 0x10) & ~0x1f;
+	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
 	new->sr10 |= 0x1f;
 
 	new->sr13 = pARK->FBAddress >> 16;
 	new->sr14 = pARK->FBAddress >> 24;
 
-	new->sr12 = rdinx(0x3c4, 0x12) & ~0x03;
+	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
 	switch (pScrn->videoRam) {
 		case 1024:
 			new->sr12 |= 0x01;
@@ -834,7 +835,7 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 				(pScrn->bitsPerPixel / 8);
 		/* 120000 is another guess */
 		percentused = (bandwidthused * 100) / 120000;
-		tmp = rdinx(0x3c4, 0x18);
+		tmp = rdinx(isaIOBase + 0x3c4, 0x18);
 		if (pARK->Chipset == PCI_CHIP_1000PV) {
 			threshold = 4;
 			tmp |= 0x08;	/* enable full FIFO (8 deep) */
@@ -884,20 +885,20 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
 #if 0
 	/* hw cursor regs */
-	new->sr20 = rdinx(0x3c4, 0x20);
-	new->sr21 = rdinx(0x3c4, 0x21);
-	new->sr22 = rdinx(0x3c4, 0x22);
-	new->sr23 = rdinx(0x3c4, 0x23);
-	new->sr24 = rdinx(0x3c4, 0x24);
-	new->sr25 = rdinx(0x3c4, 0x25);
-	new->sr26 = rdinx(0x3c4, 0x26);
-	new->sr27 = rdinx(0x3c4, 0x27);
-	new->sr29 = rdinx(0x3c4, 0x29);
-	new->sr2a = rdinx(0x3c4, 0x2a);
+	new->sr20 = rdinx(isaIOBase + 0x3c4, 0x20);
+	new->sr21 = rdinx(isaIOBase + 0x3c4, 0x21);
+	new->sr22 = rdinx(isaIOBase + 0x3c4, 0x22);
+	new->sr23 = rdinx(isaIOBase + 0x3c4, 0x23);
+	new->sr24 = rdinx(isaIOBase + 0x3c4, 0x24);
+	new->sr25 = rdinx(isaIOBase + 0x3c4, 0x25);
+	new->sr26 = rdinx(isaIOBase + 0x3c4, 0x26);
+	new->sr27 = rdinx(isaIOBase + 0x3c4, 0x27);
+	new->sr29 = rdinx(isaIOBase + 0x3c4, 0x29);
+	new->sr2a = rdinx(isaIOBase + 0x3c4, 0x2a);
 	if ((pARK->Chipset == PCI_CHIP_2000PV) ||
 	    (pARK->Chipset == PCI_CHIP_2000MT)) {
-		new->sr28 = rdinx(0x3c4, 0x28);
-		new->sr2b = rdinx(0x3c4, 0x3b);
+		new->sr28 = rdinx(isaIOBase + 0x3c4, 0x28);
+		new->sr2b = rdinx(isaIOBase + 0x3c4, 0x3b);
 	}
 #endif
 
@@ -913,7 +914,7 @@ static void ARKAdjustFrame(int scrnIndex, int x, int y, int flags)
 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 	ARKPtr pARK = ARKPTR(pScrn);
 	vgaHWPtr hwp = VGAHWPTR(pScrn);
-	int vgaIOBase = hwp->IOBase;
+	IOADDRESS vgaIOBase = hwp->PIOOffset + hwp->IOBase;
 	int base;
 
 	base = ((y * pScrn->displayWidth + x) *
@@ -940,47 +941,48 @@ static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new)
 {
 	ARKPtr pARK = ARKPTR(pScrn);
 	vgaHWPtr hwp = VGAHWPTR(pScrn);
-	int vgaIOBase = hwp->IOBase;
+	IOADDRESS isaIOBase = hwp->PIOOffset;
+	IOADDRESS vgaIOBase = isaIOBase + hwp->IOBase;
 
 	vgaHWProtect(pScrn, TRUE);
 
 	/* set read and write aperture index to 0 */
-	wrinx(0x3c4, 0x15, 0x00);
-	wrinx(0x3c4, 0x16, 0x00);
+	wrinx(isaIOBase + 0x3c4, 0x15, 0x00);
+	wrinx(isaIOBase + 0x3c4, 0x16, 0x00);
 
 	/* write the extended registers first so that textmode font
 	 * restoration can suceed
 	 */
-	wrinx(0x3c4, 0x10, new->sr10);
-	wrinx(0x3c4, 0x11, new->sr11);
-	wrinx(0x3c4, 0x12, new->sr12);
-	wrinx(0x3c4, 0x13, new->sr13);
-	wrinx(0x3c4, 0x14, new->sr14);
-	wrinx(0x3c4, 0x15, new->sr15);
-	wrinx(0x3c4, 0x16, new->sr16);
-	wrinx(0x3c4, 0x17, new->sr17);
+	wrinx(isaIOBase + 0x3c4, 0x10, new->sr10);
+	wrinx(isaIOBase + 0x3c4, 0x11, new->sr11);
+	wrinx(isaIOBase + 0x3c4, 0x12, new->sr12);
+	wrinx(isaIOBase + 0x3c4, 0x13, new->sr13);
+	wrinx(isaIOBase + 0x3c4, 0x14, new->sr14);
+	wrinx(isaIOBase + 0x3c4, 0x15, new->sr15);
+	wrinx(isaIOBase + 0x3c4, 0x16, new->sr16);
+	wrinx(isaIOBase + 0x3c4, 0x17, new->sr17);
 
 #if 0
-	wrinx(0x3c4, 0x1c, new->sr1c);
-	wrinx(0x3c4, 0x1d, new->sr1d);
+	wrinx(isaIOBase + 0x3c4, 0x1c, new->sr1c);
+	wrinx(isaIOBase + 0x3c4, 0x1d, new->sr1d);
 
 	/* hw cursor regs */
-	wrinx(0x3c4, 0x20, new->sr20);
-	wrinx(0x3c4, 0x21, new->sr21);
-	wrinx(0x3c4, 0x22, new->sr22);
-	wrinx(0x3c4, 0x23, new->sr23);
-	wrinx(0x3c4, 0x24, new->sr24);
-	wrinx(0x3c4, 0x25, new->sr25);
-	wrinx(0x3c4, 0x26, new->sr26);
-	wrinx(0x3c4, 0x27, new->sr27);
-	wrinx(0x3c4, 0x29, new->sr29);
-	wrinx(0x3c4, 0x2a, new->sr2a);
+	wrinx(isaIOBase + 0x3c4, 0x20, new->sr20);
+	wrinx(isaIOBase + 0x3c4, 0x21, new->sr21);
+	wrinx(isaIOBase + 0x3c4, 0x22, new->sr22);
+	wrinx(isaIOBase + 0x3c4, 0x23, new->sr23);
+	wrinx(isaIOBase + 0x3c4, 0x24, new->sr24);
+	wrinx(isaIOBase + 0x3c4, 0x25, new->sr25);
+	wrinx(isaIOBase + 0x3c4, 0x26, new->sr26);
+	wrinx(isaIOBase + 0x3c4, 0x27, new->sr27);
+	wrinx(isaIOBase + 0x3c4, 0x29, new->sr29);
+	wrinx(isaIOBase + 0x3c4, 0x2a, new->sr2a);
 #endif
 
 	if ((pARK->Chipset == PCI_CHIP_2000PV) ||
 	    (pARK->Chipset == PCI_CHIP_2000MT)) {
-		wrinx(0x3c4, 0x28, new->sr28);
-		wrinx(0x3c4, 0x2B, new->sr2b);
+		wrinx(isaIOBase + 0x3c4, 0x28, new->sr28);
+		wrinx(isaIOBase + 0x3c4, 0x2B, new->sr2b);
 	}
 
 	wrinx(vgaIOBase + 4, 0x40, new->cr40);
@@ -994,7 +996,7 @@ static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new)
 
 	/* RAMDAC regs */
 	if (pARK->ramdac == ZOOMDAC) {
-		set_daccom(new->dac_command);
+		set_daccom(isaIOBase, new->dac_command);
 	}
 
 	if (xf86IsPrimaryPci(pARK->PciInfo))
@@ -1003,7 +1005,6 @@ static void ARKWriteMode(ScrnInfoPtr pScrn, vgaRegPtr pVga, ARKRegPtr new)
 		vgaHWRestore(pScrn, pVga, VGA_SR_MODE);
 
 	vgaHWProtect(pScrn, FALSE);
-
 }
 
 
@@ -1033,8 +1034,6 @@ static void ARKLeaveVT(int scrnIndex, int flags)
 	vgaHWUnlock(hwp);
 	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
 	vgaHWLock(hwp);
-
-	return;
 }
 
 
@@ -1046,8 +1045,8 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
 	/* extended to cover MMIO space at 0xB8000 */
 	hwp->MapSize = 0x20000;
 
-	pARK->MMIOBase = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO,
-				       0xb8000, 0x8000);
+	pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
+					     pARK->PciTag, 0xb8000, 0x8000);
 
 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				     pARK->PciTag, pARK->FBAddress,
@@ -1071,8 +1070,6 @@ static void ARKUnmapMem(ScrnInfoPtr pScrn)
 
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pARK->FBBase,
 			pScrn->videoRam * 1024);
-
-	return;
 }
 
 
@@ -1114,14 +1111,15 @@ static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
 			   int *indicies, LOCO *colors,
 			   VisualPtr pVisual)
 {
+	IOADDRESS isaIOBase = pScrn->domainIOBase;
 	int i, index;
 
 	for (i=0; i<numColors; i++) {
 		index = indicies[i];
-		outb(0x3c8, index);
-		outb(0x3c9, colors[index].red);
-		outb(0x3c9, colors[index].green);
-		outb(0x3c9, colors[index].blue);
+		outb(isaIOBase + 0x3c8, index);
+		outb(isaIOBase + 0x3c9, colors[index].red);
+		outb(isaIOBase + 0x3c9, colors[index].green);
+		outb(isaIOBase + 0x3c9, colors[index].blue);
 	}
 }
 
@@ -1136,39 +1134,39 @@ static void ARKFreeScreen(int scrnIndex, int flags)
 }
 
 
-static unsigned char get_daccomm(void)
+static unsigned char get_daccomm(IOADDRESS isaIOBase)
 {
 	unsigned char tmp;
 
-	outb(0x3c8, 0);
-	inb(0x3c6);
-	inb(0x3c6);
-	inb(0x3c6);
-	inb(0x3c6);
-	tmp = inb(0x3c6);
-	outb(0x3c8, 0);
+	outb(isaIOBase + 0x3c8, 0);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	tmp = inb(isaIOBase + 0x3c6);
+	outb(isaIOBase + 0x3c8, 0);
 
 	return tmp;
 }
 
 
-static unsigned char set_daccom(unsigned char comm)
+static unsigned char set_daccom(IOADDRESS isaIOBase, unsigned char comm)
 {
 #if 0
-	outb(0x3c8, 0);
+	outb(isaIOBase + 0x3c8, 0);
 #else
-	inb(0x3c8);
+	inb(isaIOBase + 0x3c8);
 #endif
-	inb(0x3c6);
-	inb(0x3c6);
-	inb(0x3c6);
-	inb(0x3c6);
-	outb(0x3c6, comm);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	inb(isaIOBase + 0x3c6);
+	outb(isaIOBase + 0x3c6, comm);
 #if 0
-	outb(0x3c8, 0);
+	outb(isaIOBase + 0x3c8, 0);
 #else
-	inb(0x3c8);
+	inb(isaIOBase + 0x3c8);
 #endif
 
-	return inb(0x3c6);
+	return inb(isaIOBase + 0x3c6);
 }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
index 68694423a..7bf7262fb 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v 1.36 2002/01/16 16:22:25 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v 1.39 2002/09/12 00:33:43 tsi Exp $
 XCOMM
 XCOMM Copyright 1997 through 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
 XCOMM
@@ -42,6 +42,12 @@ MODOBJS4 = radeon_misc.o
 
 #endif
 
+/* XXX Temporary: for now DRM for BSD/Radeon doesn't build. */
+#if !defined(LinuxArchitecture)
+#undef BuildXF86DRI
+#define BuildXF86DRI NO
+#endif
+
 #if BuildXF86DRI
 
 DRISRCS3 = r128_dri.c
@@ -83,6 +89,7 @@ DRIDEFINES  = $(GLX_DEFINES)
  */
 #if defined(i386Architecture) || \
     defined(ia64Architecture) || \
+    defined(x86_64Architecture) || \
     defined(AlphaArchitecture)
 # ifndef ATIAvoidCPIO
 #  define ATIAvoidCPIO NO
@@ -130,7 +137,7 @@ CPIOOBJS2 = atibank.o ativga.o atiwonder.o atiwonderio.o
 #endif
 
 #ifndef ATIAvoidDGA
-#define ATIAVoidDGA NO
+#define ATIAvoidDGA NO
 #endif
 
 #if ATIAvoidDGA
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c
index 20b41c0cb..f8c529f3c 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c,v 1.19 2002/01/16 16:22:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c,v 1.20 2002/01/29 03:42:27 tsi Exp $ */
 /*
  * Copyright 1997 through 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -32,43 +32,16 @@
  * exception.  Contributions, intentional or not, to this and previous versions
  * of this driver by the following are hereby acknowledged:
  *
- * Thomas Roell, roell@informatik.tu-muenchen.de
- * Per Lindqvist, pgd@compuram.bbt.se
- * Doug Evans, dje@cygnus.com
- * Rik Faith, faith@precisioninsight.com
- * Arthur Tateishi, ruhtra@turing.toronto.edu
- * Alain Hebert, aal@broue.rot.qc.ca
- * Ton van Rosmalen, ton@stack.urc.tue.nl
- * David Chambers, davidc@netcom.com
- * William Shubert, wms@ssd.intel.com
- * ATI Technologies Incorporated
- * Robert Wolff
- * David Dawes, dawes@xfree86.org
- * Mark Weaver, Mark_Weaver@brown.edu
- * Hans Nasten, nasten@everyware.se
- * Kevin Martin, martin@precisioninsight.com
- * Frederic Rienthaler, root@mojo.synapse.com
- * Marc Bolduc, bolduc@cim.mcgill.ca
- * Reuben Sumner, rasumner@undergrad.math.uwaterloo.ca
- * Benjamin T. Yang, risk@uclink.berkeley.edu
- * James Fast Kane, jfk2@engr.uark.edu
- * Randall Hopper, rhh@ct.picker.com
- * W. Marcus Miller, marcus@llnl.gov
- * Henrik Harmsen, ervhch@erv.ericsson.se
- * Christian Lupien, lupien@physics.utoronto.ca
- * Precision Insight Incorporated
- * Mark Vojkovich, mvojkovich@nvidia.com
- * Huw D M Davies, h.davies1@physics.ox.ac.uk
- * Andrew C Aitchison, A.C.Aitchison@dpmms.cam.ac.uk
- * Ani Joshi, ajoshi@shell.unixbox.com
- * Kostas Gewrgiou, gewrgiou@imbc.gr
- * Jakub Jelinek, jakub@redhat.com
- * David S. Miller, davem@redhat.com
- * A E Lawrence, adrian.lawrence@computing-services.oxford.ac.uk
- * Linus Torvalds, torvalds@transmeta.com
- * William Blew, wblew@home.com
- * Ignacio Garcia Etxebarria, garetxe@euskalnet.net
- * Patrick Chase, pchase2@pacbell.net
+ * Thomas Roell, Per Lindqvist, Doug Evans, Rik Faith, Arthur Tateishi,
+ * Alain Hebert, Ton van Rosmalen, David Chambers, William Shubert,
+ * ATI Technologies Incorporated, Robert Wolff, David Dawes, Mark Weaver,
+ * Hans Nasten, Kevin Martin, Frederic Rienthaler, Marc Bolduc, Reuben Sumner,
+ * Benjamin T. Yang, James Fast Kane, Randall Hopper, W. Marcus Miller,
+ * Henrik Harmsen, Christian Lupien, Precision Insight Incorporated,
+ * Mark Vojkovich, Huw D M Davies, Andrew C Aitchison, Ani Joshi,
+ * Kostas Gewrgiou, Jakub Jelinek, David S. Miller, A E Lawrence,
+ * Linus Torvalds, William Blew, Ignacio Garcia Etxebarria, Patrick Chase,
+ * Vladimir Dergachev
  *
  * ... and, many, many others from around the world.
  *
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
index 890e3a1a6..407e3ab8f 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.25 2002/01/16 16:22:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.27 2002/10/12 01:38:06 martin Exp $ */
 /*
  * Copyright 1997 through 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -90,6 +90,9 @@ const char *ATIChipNames[] =
     "ATI Radeon Mobility M7",
     "ATI Radeon 8500",
     "ATI Radeon 7500",
+    "ATI Radeon 9000",
+    "ATI Radeon Mobility M9",
+    "ATI Radeon 9700",
     "ATI Rage HDTV"
 };
 
@@ -439,7 +442,7 @@ ATIChipID
         case OldChipID('X', 'X'):  case NewChipID('X', 'X'):
             return ATI_CHIP_68800_6;
 
-        case OldChipID('L', 'X'):  case NewChipID('L', 'X'):
+        case OldChipID('L', 'X'):
             return ATI_CHIP_68800LX;
 
         case OldChipID('A', 'X'):  case NewChipID('A', 'X'):
@@ -605,6 +608,7 @@ ATIChipID
             return ATI_CHIP_RADEONMOBILITY6;
 
         case NewChipID('L', 'W'):
+        case NewChipID('L', 'X'):
             return ATI_CHIP_RADEONMOBILITY7;
 
         case NewChipID('Q', 'L'):
@@ -615,8 +619,27 @@ ATIChipID
             return ATI_CHIP_R200;
 
         case NewChipID('Q', 'W'):
+        case NewChipID('Q', 'X'):
             return ATI_CHIP_RV200;
 
+        case NewChipID('I', 'd'):
+        case NewChipID('I', 'e'):
+        case NewChipID('I', 'f'):
+        case NewChipID('I', 'g'):
+            return ATI_CHIP_RV250;
+
+        case NewChipID('L', 'd'):
+        case NewChipID('L', 'e'):
+        case NewChipID('L', 'f'):
+        case NewChipID('L', 'g'):
+            return ATI_CHIP_RADEONMOBILITY9;
+
+        case NewChipID('N', 'D'):
+        case NewChipID('N', 'E'):
+        case NewChipID('N', 'F'):
+        case NewChipID('N', 'G'):
+            return ATI_CHIP_R300;
+
         case NewChipID('H', 'D'):
             return ATI_CHIP_HDTV;
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h
index bb99f4865..78850af05 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.20 2002/01/16 16:22:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.21 2002/10/12 01:38:06 martin Exp $ */
 /*
  * Copyright 1997 through 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -92,6 +92,9 @@ typedef enum
     ATI_CHIP_RADEONMOBILITY7,   /* Radeon M7 */
     ATI_CHIP_R200,              /* R200 */
     ATI_CHIP_RV200,             /* RV200 */
+    ATI_CHIP_RV250,             /* RV250 */
+    ATI_CHIP_RADEONMOBILITY9,   /* Radeon M9 */
+    ATI_CHIP_R300,              /* R300 */
     ATI_CHIP_HDTV               /* HDTV */
 } ATIChipType;
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c
index 2ad94ad53..0af8a34e5 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c,v 1.18 2002/01/16 16:22:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c,v 1.19 2002/09/18 17:11:48 tsi Exp $ */
 /*
  * Copyright 1997 through 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -430,7 +430,7 @@ static const CARD8 ClockMaps[][4] =
  * This function tries to match the XF86Config clocks to one of an array of
  * clock lines.  It returns a clock line number or 0.
  */
-static const int
+static int
 ATIMatchClockLine
 (
     ScrnInfoPtr              pScreenInfo,
diff --git a/xc/programs/Xserver/hw/xfree86/xf86Version.h b/xc/programs/Xserver/hw/xfree86/xf86Version.h
index 1fb9d70ba..e9fa7396b 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86Version.h
+++ b/xc/programs/Xserver/hw/xfree86/xf86Version.h
@@ -1,16 +1,21 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.487 2002/01/18 20:09:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.502 2002/10/22 02:44:26 dawes Exp $ */
 
 #ifndef XF86_VERSION_CURRENT
 
 #define XF86_VERSION_MAJOR	4
 #define XF86_VERSION_MINOR	2
-#define XF86_VERSION_PATCH	0
-#define XF86_VERSION_SNAP	0
+#define XF86_VERSION_PATCH	99
+#define XF86_VERSION_SNAP	2
 
 /* This has five arguments for compatibilty reasons */
 #define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
 	(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
 
+#define XF86_GET_MAJOR_VERSION(vers)	((vers) / 10000000)
+#define XF86_GET_MINOR_VERSION(vers)	(((vers) % 10000000) / 100000)
+#define XF86_GET_PATCH_VERSION(vers)	(((vers) % 100000) / 1000)
+#define XF86_GET_SNAP_VERSION(vers)	((vers) % 1000)
+
 /* Define these for compatibility.  They'll be removed at some point. */
 #define XF86_VERSION_SUBMINOR	XF86_VERSION_PATCH
 #define XF86_VERSION_BETA	0
@@ -24,7 +29,7 @@
 			0)
 
 
-#define XF86_DATE	"18 January 2002"
+#define XF86_DATE	"21 October 2002"
 
 #endif