Add references to ATM cards (Mike Spengler <mks@networkcs.com>) and

remove all tabs.

4 files changed, 353 insertions, 356 deletions

diff --git a/release/sysinstall/help/XF86.hlp b/release/sysinstall/help/XF86.hlp
index 17a2160..4757fb0 100644
--- a/release/sysinstall/help/XF86.hlp
+++ b/release/sysinstall/help/XF86.hlp
@@ -1,15 +1,15 @@
 
-			 README for XFree86[tm] 3.3.2.3
+                         README for XFree86[tm] 3.3.2.3
 
 
-			   The XFree86 Project, Inc
+                           The XFree86 Project, Inc
 
 
-				 20 July 1998
+                                 20 July 1998
   
 
 
-				   Abstract
+                                   Abstract
 
      XFree86 is a port of X11R6.3 that supports several Unix and Unix-like
      operating systems on Intel and other platforms.  This release is a
@@ -36,21 +36,21 @@ Note: Not all systems listed here have been tested with the current release.
 
       SVR4.0:
 
-	       o Esix: 4.0.3A, 4.0.4, 4.0.4.1
+               o Esix: 4.0.3A, 4.0.4, 4.0.4.1
 
-	       o Microport: 2.2, 3.1, 4.1, 4.2
+               o Microport: 2.2, 3.1, 4.1, 4.2
 
-	       o Dell: 2.1, 2.2, 2.2.1
+               o Dell: 2.1, 2.2, 2.2.1
 
-	       o UHC: 2.0, 3.6
+               o UHC: 2.0, 3.6
 
-	       o Consensys: 1.2
+               o Consensys: 1.2
 
-	       o MST: 4.0.3 (Load 2.07 and Load 3.02)
+               o MST: 4.0.3 (Load 2.07 and Load 3.02)
 
-	       o ISC: 4.0.3
+               o ISC: 4.0.3
 
-	       o AT&T: 2.1, 4.0
+               o AT&T: 2.1, 4.0
 
 
 
@@ -65,55 +65,55 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o NCR: MP-RAS
+               o NCR: MP-RAS
 
-	       o SunSoft: Solaris x86 2.1, 2.4, 2.5, 2.5.1, 2.6
+               o SunSoft: Solaris x86 2.1, 2.4, 2.5, 2.5.1, 2.6
 
-	       o PANIX 5.0 for AT
+               o PANIX 5.0 for AT
 
 
       SVR4.2:
 
-	       o Consensys
+               o Consensys
 
-	       o Novell UnixWare
+               o Novell UnixWare
 
 
       SVR3:
 
-	       o ISC: 3.0, 4.0, 4.1
+               o ISC: 3.0, 4.0, 4.1
 
 
       Others:
 
-	       o NetBSD 1.0, 1.1, 1.2, 1.2.1, 1.3
+               o NetBSD 1.0, 1.1, 1.2, 1.2.1, 1.3
 
-	       o OpenBSD 2.0, 2.1
+               o OpenBSD 2.0, 2.1
 
-	       o FreeBSD 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.1.7.1, 2.2, 2.2.1,
-		 2.2.2, 2.2.5, 3.0-current
+               o FreeBSD 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.1.7.1, 2.2, 2.2.1,
+                 2.2.2, 2.2.5, 3.0-current
 
-	       o Linux (Intel x86, DEC Alpha/AXP and m68k)
+               o Linux (Intel x86, DEC Alpha/AXP and m68k)
 
-	       o LynxOS AT 2.3.0, 2.4.0, 2.5.0
+               o LynxOS AT 2.3.0, 2.4.0, 2.5.0
 
-	       o LynxOS microSPARC 2.4.0, 2.5.0
+               o LynxOS microSPARC 2.4.0, 2.5.0
 
-	       o LynxOS PowerPC 2.4.0, 2.5.0
+               o LynxOS PowerPC 2.4.0, 2.5.0
 
-	       o OS/2 Warp 3 FP5/17/22, Warp 4 -/FP1
+               o OS/2 Warp 3 FP5/17/22, Warp 4 -/FP1
 
 
       PC98:
 
-	       o FreeBSD(98) 2.0.5, 2.1, 2.1.5, 2.1.7.1, 2.2, 2.2.1, 2.2.2,
-		 2.2.5
+               o FreeBSD(98) 2.0.5, 2.1, 2.1.5, 2.1.7.1, 2.2, 2.2.1, 2.2.2,
+                 2.2.5
 
-	       o NetBSD/pc98 (based on NetBSD 1.2, 1.2.1)
+               o NetBSD/pc98 (based on NetBSD 1.2, 1.2.1)
 
-	       o PANIX 5.0 for 98
+               o PANIX 5.0 for 98
 
-	       o Linux/98
+               o Linux/98
 
 
 3.  Supported video-card chip-sets
@@ -132,59 +132,59 @@ README for XFree86[tm] 3.3.2
 
 
       Ark Logic
-	    ARK1000PV, ARK1000VL, ARK2000PV, ARK2000MT
+            ARK1000PV, ARK1000VL, ARK2000PV, ARK2000MT
 
       Alliance
-	    AP6422, AT24
+            AP6422, AT24
 
       ATI
-	    18800, 18800-1, 28800-2, 28800-4, 28800-5, 28800-6, 68800-3,
-	    68800-6, 68800AX, 68800LX, 88800GX-C, 88800GX-D, 88800GX-E,
-	    88800GX-F, 88800CX, 264CT, 264ET, 264VT, 264GT, 264VT-B, 264VT3,
-	    264GT-B, 264GT3 (this list includes the Mach8, Mach32, Mach64, 3D
-	    Rage, 3D Rage II and 3D Rage Pro)
+            18800, 18800-1, 28800-2, 28800-4, 28800-5, 28800-6, 68800-3,
+            68800-6, 68800AX, 68800LX, 88800GX-C, 88800GX-D, 88800GX-E,
+            88800GX-F, 88800CX, 264CT, 264ET, 264VT, 264GT, 264VT-B, 264VT3,
+            264GT-B, 264GT3 (this list includes the Mach8, Mach32, Mach64, 3D
+            Rage, 3D Rage II and 3D Rage Pro)
 
       Avance Logic
-	    ALG2101, ALG2228, ALG2301, ALG2302, ALG2308, ALG2401
+            ALG2101, ALG2228, ALG2301, ALG2302, ALG2308, ALG2401
 
       Chips & Technologies
-	    65520, 65530, 65540, 65545, 65520, 65530, 65540, 65545, 65546,
-	    65548, 65550, 65554, 65555, 68554, 64200, 64300
+            65520, 65530, 65540, 65545, 65520, 65530, 65540, 65545, 65546,
+            65548, 65550, 65554, 65555, 68554, 64200, 64300
 
       Cirrus Logic
-	    CLGD5420, CLGD5422, CLGD5424, CLGD5426, CLGD5428, CLGD5429,
-	    CLGD5430, CLGD5434, CLGD5436, CLGD5440, CLGD5446, CLGD5462,
-	    CLGD5464, CLGD5465, CLGD5480, CLGD6205, CLGD6215, CLGD6225,
-	    CLGD6235, CLGD6410, CLGD6412, CLGD6420, CLGD6440, CLGD7541(*),
-	    CLGD7543(*), CLGD7548(*), CLGD7555(*)
+            CLGD5420, CLGD5422, CLGD5424, CLGD5426, CLGD5428, CLGD5429,
+            CLGD5430, CLGD5434, CLGD5436, CLGD5440, CLGD5446, CLGD5462,
+            CLGD5464, CLGD5465, CLGD5480, CLGD6205, CLGD6215, CLGD6225,
+            CLGD6235, CLGD6410, CLGD6412, CLGD6420, CLGD6440, CLGD7541(*),
+            CLGD7543(*), CLGD7548(*), CLGD7555(*)
 
       Digital Equipment Corporation
-	    TGA
+            TGA
 
       Compaq
-	    AVGA
+            AVGA
 
       Genoa
-	    GVGA
+            GVGA
 
       IBM
-	    8514/A (and true clones), XGA-2
+            8514/A (and true clones), XGA-2
 
       IIT
-	    AGX-014, AGX-015, AGX-016
+            AGX-014, AGX-015, AGX-016
 
       Matrox
-	    MGA2064W (Millennium), MGA1064SG (Mystique and Mystique 220),
-	    MGA2164W (Millennium II PCI and AGP)
+            MGA2064W (Millennium), MGA1064SG (Mystique and Mystique 220),
+            MGA2164W (Millennium II PCI and AGP)
 
       MX
-	    MX68000(*), MX680010(*)
+            MX68000(*), MX680010(*)
 
       NCR
-	    77C22(*), 77C22E(*), 77C22E+(*)
+            77C22(*), 77C22E(*), 77C22E+(*)
 
       Number Nine
-	    I128 (series I and II), Revolution 3D (T2R)
+            I128 (series I and II), Revolution 3D (T2R)
 
 
 
@@ -198,45 +198,45 @@ README for XFree86[tm] 3.3.2
 
 
       NVidia/SGS Thomson
-	    NV1, STG2000, RIVA128
+            NV1, STG2000, RIVA128
 
       OAK
-	    OTI067, OTI077, OTI087
+            OTI067, OTI077, OTI087
 
       RealTek
-	    RTG3106(*)
+            RTG3106(*)
 
       S3
-	    86C911, 86C924, 86C801, 86C805, 86C805i, 86C928, 86C864, 86C964,
-	    86C732, 86C764, 86C765, 86C767, 86C775, 86C785, 86C868, 86C968,
-	    86C325, 86C357, 86C375, 86C375, 86C385, 86C988, 86CM65, 86C260
+            86C911, 86C924, 86C801, 86C805, 86C805i, 86C928, 86C864, 86C964,
+            86C732, 86C764, 86C765, 86C767, 86C775, 86C785, 86C868, 86C968,
+            86C325, 86C357, 86C375, 86C375, 86C385, 86C988, 86CM65, 86C260
 
       SiS
-	    86C201, 86C202, 86C205
+            86C201, 86C202, 86C205
 
       Tseng
-	    ET3000, ET4000AX, ET4000/W32, ET4000/W32i, ET4000/W32p, ET6000,
-	    ET6100
+            ET3000, ET4000AX, ET4000/W32, ET4000/W32i, ET4000/W32p, ET6000,
+            ET6100
 
       Trident
-	    TVGA8800CS, TVGA8900B, TVGA8900C, TVGA8900CL, TVGA9000, TVGA9000i,
-	    TVGA9100B, TVGA9200CXR, Cyber9320(*), TVGA9400CXi, TVGA9420,
-	    TGUI9420DGi, TGUI9430DGi, TGUI9440AGi, TGUI9660XGi, TGUI9680, Pro-
-	    Vidia 9682, ProVidia 9685(*), Cyber 9382, Cyber 9385, Cyber 9388,
-	    3DImage975(PCI), 3DImage985(AGP), Cyber 9397, Cyber 9520
+            TVGA8800CS, TVGA8900B, TVGA8900C, TVGA8900CL, TVGA9000, TVGA9000i,
+            TVGA9100B, TVGA9200CXR, Cyber9320(*), TVGA9400CXi, TVGA9420,
+            TGUI9420DGi, TGUI9430DGi, TGUI9440AGi, TGUI9660XGi, TGUI9680, Pro-
+            Vidia 9682, ProVidia 9685(*), Cyber 9382, Cyber 9385, Cyber 9388,
+            3DImage975(PCI), 3DImage985(AGP), Cyber 9397, Cyber 9520
 
       Video 7/Headland Technologies
-	    HT216-32(*)
+            HT216-32(*)
 
       Weitek
-	    P9000
+            P9000
 
       Western Digital/Paradise
-	    PVGA1
+            PVGA1
 
       Western Digital
-	    WD90C00, WD90C10, WD90C11, WD90C24, WD90C24A, WD90C30, WD90C31,
-	    WD90C33
+            WD90C00, WD90C10, WD90C11, WD90C24, WD90C24A, WD90C30, WD90C31,
+            WD90C33
 
 (*) Note, chips marked in this way have either limited support or the drivers
 for them are not actively maintained.
@@ -313,8 +313,8 @@ directory xc/programs/Xserver/hw/xfree86/VGADriverDoc in the source distribu-
 tion.
 
 If you are totally at a loss, you can contact the XFree86 Support Team at
-<XFree86@XFree86.Org>.	Before doing so, please make sure that you are using
-the latest release of XFree86.	Check the versions listed on
+<XFree86@XFree86.Org>.  Before doing so, please make sure that you are using
+the latest release of XFree86.  Check the versions listed on
 ftp://ftp.xfree86.org/pub/XFree86.
 
 
@@ -429,25 +429,25 @@ README for XFree86[tm] 3.3.2
 
       386BSD, FreeBSD, NetBSD  support by:
 
-	       o Rich Murphey <Rich@XFree86.org>
+               o Rich Murphey <Rich@XFree86.org>
 
       NetBSD, OpenBSD support by:
 
-	       o Matthieu Herrb <Matthieu.Herrb.@laas.fr>
+               o Matthieu Herrb <Matthieu.Herrb.@laas.fr>
 
       Original 386BSD port by:
 
-	       o Pace Willison,
+               o Pace Willison,
 
-	       o Amancio Hasty Jr <hasty@netcom.com>
+               o Amancio Hasty Jr <hasty@netcom.com>
 
       Mach 386 support by:
 
-	       o Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
+               o Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
 
       Linux support by:
 
-	       o Orest Zborowski <orestz@eskimo.com>
+               o Orest Zborowski <orestz@eskimo.com>
 
 
 
@@ -463,57 +463,57 @@ README for XFree86[tm] 3.3.2
 
       SCO Unix support by:
 
-	       o David McCullough <davidm@stallion.oz.au>
+               o David McCullough <davidm@stallion.oz.au>
 
       Amoeba support by:
 
-	       o Kees Verstoep <versto@cs.vu.nl>
+               o Kees Verstoep <versto@cs.vu.nl>
 
       Minix-386 support by:
 
-	       o Philip Homburg <philip@cs.vu.nl>
+               o Philip Homburg <philip@cs.vu.nl>
 
       OSF/1 support by:
 
-	       o Marc Evans <Marc@XFree86.org>
+               o Marc Evans <Marc@XFree86.org>
 
       BSD/OS support by:
 
-	       o Hans Nasten <nasten@everyware.se>,
+               o Hans Nasten <nasten@everyware.se>,
 
-	       o Paul Vixie <paul@vix.com>
+               o Paul Vixie <paul@vix.com>
 
       Solaris support by:
 
-	       o Doug Anson <danson@lgc.com>,
+               o Doug Anson <danson@lgc.com>,
 
-	       o David Holland <davidh@use.com>
+               o David Holland <davidh@use.com>
 
       ISC SVR3 support by:
 
-	       o Michael Rohleder <michael.rohleder@stadt-frankfurt.de>
+               o Michael Rohleder <michael.rohleder@stadt-frankfurt.de>
 
       LynxOS support by:
 
-	       o Thomas Mueller <tmueller@sysgo.de>
+               o Thomas Mueller <tmueller@sysgo.de>
 
       OS/2 support by:
 
-	       o Holger Veit <Holger.Veit@gmd.de>
+               o Holger Veit <Holger.Veit@gmd.de>
 
-	       o Sebastien Marineau <s521936@aix1.uottawa.ca>
+               o Sebastien Marineau <s521936@aix1.uottawa.ca>
 
       Linux shared libraries by:
 
-	       o Orest Zborowski <orestz@eskimo.com>,
+               o Orest Zborowski <orestz@eskimo.com>,
 
-	       o Dirk Hohndel <hohndel@XFree86.org>
+               o Dirk Hohndel <hohndel@XFree86.org>
 
       PC98 support by:
 
-	       o Toyonori Fujiura <toyo@ibbsal.or.jp>,
+               o Toyonori Fujiura <toyo@ibbsal.or.jp>,
 
-	       o Hiroyuki Aizu <aizu@jaist.ac.jp>,
+               o Hiroyuki Aizu <aizu@jaist.ac.jp>,
 
 
 
@@ -527,59 +527,59 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Tetsuya Kakefuda <kakefuda@tag.iijnet.or.jp>,
+               o Tetsuya Kakefuda <kakefuda@tag.iijnet.or.jp>,
 
-	       o Takefumi Tsukada <tsuka@linkt.imasy.or.jp>,
+               o Takefumi Tsukada <tsuka@linkt.imasy.or.jp>,
 
-	       o H.Komatsuzaki,
+               o H.Komatsuzaki,
 
-	       o Naoki Katsurakawa <katsura@prc.tsukuba.ac.jp>,
+               o Naoki Katsurakawa <katsura@prc.tsukuba.ac.jp>,
 
-	       o Shuichiro Urata <s-urata@nmit.tmg.nec.co.jp>,
+               o Shuichiro Urata <s-urata@nmit.tmg.nec.co.jp>,
 
-	       o Yasuyuki Kato <yasuyuki@acaets0.anritsu.co.jp>,
+               o Yasuyuki Kato <yasuyuki@acaets0.anritsu.co.jp>,
 
-	       o Michio Jinbo <karl@spnet.ne.jp>,
+               o Michio Jinbo <karl@spnet.ne.jp>,
 
-	       o Tatsuya Koike <koiket@focus.rim.or.jp>,
+               o Tatsuya Koike <koiket@focus.rim.or.jp>,
 
-	       o Koichiro Suzuki <s-koichi@nims.nec.co.jp>,
+               o Koichiro Suzuki <s-koichi@nims.nec.co.jp>,
 
-	       o Tsuyoshi Tamaki <tamaki@sail.t.u-tokyo.ac.jp>,
+               o Tsuyoshi Tamaki <tamaki@sail.t.u-tokyo.ac.jp>,
 
-	       o Isao Ohishi <ohishi@hf.rim.or.jp>,
+               o Isao Ohishi <ohishi@hf.rim.or.jp>,
 
-	       o Kohji Ohishi <atena@njk.co.jp>,
+               o Kohji Ohishi <atena@njk.co.jp>,
 
-	       o Shin'ichi Yairo <QZR00522@niftyserve.or.jp>,
+               o Shin'ichi Yairo <QZR00522@niftyserve.or.jp>,
 
-	       o Kazuo Ito <ft4k-itu@asahi-net.or.jp>,
+               o Kazuo Ito <ft4k-itu@asahi-net.or.jp>,
 
-	       o Jun Sakuma <i931361@jks.is.tsukuba.ac.jp>,
+               o Jun Sakuma <i931361@jks.is.tsukuba.ac.jp>,
 
-	       o Shuichi Ueno <uenos@ppp.bekkoame.or.jp>,
+               o Shuichi Ueno <uenos@ppp.bekkoame.or.jp>,
 
-	       o Ishida Kazuo <ishidakz@obp.cl.nec.co.jp>,
+               o Ishida Kazuo <ishidakz@obp.cl.nec.co.jp>,
 
-	       o Takaaki Nomura <amadeus@yk.rim.or.jp>,
+               o Takaaki Nomura <amadeus@yk.rim.or.jp>,
 
-	       o Tadaaki Nagao <nagao@cs.titech.ac.jp>,
+               o Tadaaki Nagao <nagao@cs.titech.ac.jp>,
 
-	       o Minoru Noda <mnoda@cv.tottori-u.ac.jp>,
+               o Minoru Noda <mnoda@cv.tottori-u.ac.jp>,
 
-	       o Naofumi Honda <honda@Kururu.math.hokudai.ac.jp>,
+               o Naofumi Honda <honda@Kururu.math.hokudai.ac.jp>,
 
-	       o Akio Morita <amorita@bird.scphys.kyoto-u.ac.jp>,
+               o Akio Morita <amorita@bird.scphys.kyoto-u.ac.jp>,
 
-	       o Takashi Sakamoto <sakamoto@yajima.kuis.kyoto-u.ac.jp>,
+               o Takashi Sakamoto <sakamoto@yajima.kuis.kyoto-u.ac.jp>,
 
-	       o Yasuhiro Ichikawa <cs94006@mbox.sist.ac.jp>,
+               o Yasuhiro Ichikawa <cs94006@mbox.sist.ac.jp>,
 
-	       o Kazunori Ueno <jagarl@creator.club.or.jp>,
+               o Kazunori Ueno <jagarl@creator.club.or.jp>,
 
-	       o Yasushi Suzuki <suz@d2.bs1.fc.nec.co.jp>,
+               o Yasushi Suzuki <suz@d2.bs1.fc.nec.co.jp>,
 
-	       o Satoshi Kimura <KFB03633@niftyserve.or.jp>,
+               o Satoshi Kimura <KFB03633@niftyserve.or.jp>,
 
 
 
@@ -593,59 +593,59 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Kazuhiko Uno <Kazuhiko.Uno@softvision.co.jp>,
+               o Kazuhiko Uno <Kazuhiko.Uno@softvision.co.jp>,
 
-	       o Tomiharu Takigami <takigami@elsd.mt.nec.co.jp>,
+               o Tomiharu Takigami <takigami@elsd.mt.nec.co.jp>,
 
-	       o Tomomi Suzuki <suzuki@grelot.elec.ryukoku.ac.jp>,
+               o Tomomi Suzuki <suzuki@grelot.elec.ryukoku.ac.jp>,
 
-	       o Toshihiko Yagi <j2297222@ed.kagu.sut.ac.jp>,
+               o Toshihiko Yagi <j2297222@ed.kagu.sut.ac.jp>,
 
-	       o Masato Yoshida (Contributor of PW805i support)
+               o Masato Yoshida (Contributor of PW805i support)
 
       Original accelerated code by:
 
-	       o Kevin Martin <martin@cs.unc.edu>,
+               o Kevin Martin <martin@cs.unc.edu>,
 
-	       o Rik Faith <faith@cs.unc.edu>,
+               o Rik Faith <faith@cs.unc.edu>,
 
-	       o Jon Tombs <tombs@XFree86.org>
+               o Jon Tombs <tombs@XFree86.org>
 
       XFree86 Acceleration Architecture (XAA) by:
 
-	       o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
+               o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
 
       S3 accelerated code by:
 
-	       o Jon Tombs <tombs@XFree86.org>,
+               o Jon Tombs <tombs@XFree86.org>,
 
-	       o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>,
+               o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>,
 
-	       o David Wexelblat <dwex@XFree86.org>,
+               o David Wexelblat <dwex@XFree86.org>,
 
-	       o David Dawes <dawes@XFree86.org>,
+               o David Dawes <dawes@XFree86.org>,
 
-	       o Robin Cutshaw <robin@XFree86.org>,
+               o Robin Cutshaw <robin@XFree86.org>,
 
-	       o Amancio Hasty <hasty@netcom.com>,
+               o Amancio Hasty <hasty@netcom.com>,
 
-	       o Norbert Distler <Norbert.Distler@physik.tu-muenchen.de>,
+               o Norbert Distler <Norbert.Distler@physik.tu-muenchen.de>,
 
-	       o Leonard N. Zubkoff <lnz@dandelion.com>,
+               o Leonard N. Zubkoff <lnz@dandelion.com>,
 
-	       o Bernhard Bender <br@elsa.mhs.compuserve.com>,
+               o Bernhard Bender <br@elsa.mhs.compuserve.com>,
 
-	       o Dirk Hohndel <hohndel@XFree86.org>,
+               o Dirk Hohndel <hohndel@XFree86.org>,
 
-	       o Joe Moss <joe@XFree86.org>
+               o Joe Moss <joe@XFree86.org>
 
       S3V accelerated code by:
 
-	       o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>,
+               o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>,
 
-	       o Kevin Brosius <Cobra@compuserve.com>
+               o Kevin Brosius <Cobra@compuserve.com>
 
-	       o Berry Dijk <berry_dijk@tasking.nl>
+               o Berry Dijk <berry_dijk@tasking.nl>
 
 
 
@@ -659,57 +659,57 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Dirk Hohndel <hohndel@XFree86.org>
+               o Dirk Hohndel <hohndel@XFree86.org>
 
-	       o Huver Hu <huver@amgraf.com>
+               o Huver Hu <huver@amgraf.com>
 
-	       o Dirk Vangestel <gesteld@sh.bel.alcatel.be>
+               o Dirk Vangestel <gesteld@sh.bel.alcatel.be>
 
       Mach32 accelerated code by:
 
-	       o Kevin Martin <martin@cs.unc.edu>,
+               o Kevin Martin <martin@cs.unc.edu>,
 
-	       o Rik Faith <faith@cs.unc.edu>,
+               o Rik Faith <faith@cs.unc.edu>,
 
-	       o Mike Bernson <mike@mbsun.mlb.org>,
+               o Mike Bernson <mike@mbsun.mlb.org>,
 
-	       o Mark Weaver <Mark_Weaver@brown.edu>,
+               o Mark Weaver <Mark_Weaver@brown.edu>,
 
-	       o Craig Groeschel <craig@metrolink.com>
+               o Craig Groeschel <craig@metrolink.com>
 
-	       o Bryan Feir <jenora@istar.ca>
+               o Bryan Feir <jenora@istar.ca>
 
       Mach64 accelerated code by:
 
-	       o Kevin Martin <martin@cs.unc.edu>,
+               o Kevin Martin <martin@cs.unc.edu>,
 
       Mach8, 8514 accelerated code by:
 
-	       o Kevin Martin <martin@cs.unc.edu>,
+               o Kevin Martin <martin@cs.unc.edu>,
 
-	       o Rik Faith <faith@cs.unc.edu>,
+               o Rik Faith <faith@cs.unc.edu>,
 
-	       o Tiago Gons <tiago@comosjn.hobby.nl>,
+               o Tiago Gons <tiago@comosjn.hobby.nl>,
 
-	       o Hans Nasten <nasten@everyware.se>,
+               o Hans Nasten <nasten@everyware.se>,
 
-	       o Scott Laird <scott@laird.com>
+               o Scott Laird <scott@laird.com>
 
       Cirrus accelerated code by:
 
-	       o Simon Cooper <scooper@vizlab.rutgers.edu>,
+               o Simon Cooper <scooper@vizlab.rutgers.edu>,
 
-	       o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
+               o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
 
-	       o Bill Reynolds <bill@goshawk.lanl.gov>,
+               o Bill Reynolds <bill@goshawk.lanl.gov>,
 
-	       o Corin Anderson <corina@the4cs.com>
+               o Corin Anderson <corina@the4cs.com>
 
       Western Digital accelerated code by:
 
-	       o Mike Tierney <floyd@pepsi.eng.umd.edu>,
+               o Mike Tierney <floyd@pepsi.eng.umd.edu>,
 
-	       o Bill Conn <conn@bnr.ca>
+               o Bill Conn <conn@bnr.ca>
 
       P9000 accelerated code by:
 
@@ -725,58 +725,58 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Erik Nygren <nygren@mit.edu>,
+               o Erik Nygren <nygren@mit.edu>,
 
-	       o Harry Langenbacher <harry@brain.jpl.nasa.gov>
+               o Harry Langenbacher <harry@brain.jpl.nasa.gov>
 
-	       o Chris Mason <mason@mail.csh.rit.edu>
+               o Chris Mason <mason@mail.csh.rit.edu>
 
-	       o Henrik Harmsen <harmsen@eritel.se>
+               o Henrik Harmsen <harmsen@eritel.se>
 
       AGX accelerated code by:
 
-	       o Henry Worth <haworth@wco.com>,
+               o Henry Worth <haworth@wco.com>,
 
       Number Nine I128 driver by:
 
-	       o Robin Cutshaw <robin@XFree86.org>,
+               o Robin Cutshaw <robin@XFree86.org>,
 
       ET4000/W32 accelerated code by:
 
-	       o Glenn Lai <glenn@cs.utexas.edu>,
+               o Glenn Lai <glenn@cs.utexas.edu>,
 
       ET6000 SVGA and accelerated support (both based on the existing W32 code) by:
 
-	       o Koen Gadeyne <koen.gadeyne@barco.com>,
+               o Koen Gadeyne <koen.gadeyne@barco.com>,
 
       Oak Technologies Inc. accelerated code by:
 
-	       o Jorge Delgado <ernar@dit.upm.es>,
+               o Jorge Delgado <ernar@dit.upm.es>,
 
       16 color VGA server by:
 
-	       o Gertjan Akkerman <akkerman@dutiba.twi.tudelft.nl>
+               o Gertjan Akkerman <akkerman@dutiba.twi.tudelft.nl>
 
       2 color VGA and non-VGA mono servers by:
 
-	       o Pascal Haible <haible@izfm.uni-stuttgart.de>
+               o Pascal Haible <haible@izfm.uni-stuttgart.de>
 
       ATI SVGA driver by:
 
-	       o Per Lindqvist <pgd@compuram.bbt.se> and Doug Evans
-		 <dje@cygnus.com>.
+               o Per Lindqvist <pgd@compuram.bbt.se> and Doug Evans
+                 <dje@cygnus.com>.
 
-	       o Ported to X11R5 by Rik Faith <faith@cs.unc.edu>.
+               o Ported to X11R5 by Rik Faith <faith@cs.unc.edu>.
 
-	       o Rewritten by Marc Aurele La France <tsi@ualberta.ca>
+               o Rewritten by Marc Aurele La France <tsi@ualberta.ca>
 
       WD90C24 support by:
 
-	       o Brad Bosch <brad@lachman.com>
+               o Brad Bosch <brad@lachman.com>
 
       Trident SVGA driver by:
 
-	       o Alan Hourihane <alanh@fairlite.demon.co.uk>
+               o Alan Hourihane <alanh@fairlite.demon.co.uk>
 
 
 
@@ -793,54 +793,54 @@ README for XFree86[tm] 3.3.2
 
       SiS SVGA driver by:
 
-	       o Alan Hourihane <alanh@fairlite.demon.co.uk>
+               o Alan Hourihane <alanh@fairlite.demon.co.uk>
 
-	       o Xavier Ducoin <xavier@rd.lectra.fr>
+               o Xavier Ducoin <xavier@rd.lectra.fr>
 
       DEC 21030 (TGA) server by:
 
-	       o Alan Hourihane <alanh@fairlite.demon.co.uk>
+               o Alan Hourihane <alanh@fairlite.demon.co.uk>
 
-	       o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
+               o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
 
       NCR SVGA driver by:
 
-	       o Stuart Anderson <anderson@metrolink.com> with the permission
-		 of NCR Corporation
+               o Stuart Anderson <anderson@metrolink.com> with the permission
+                 of NCR Corporation
 
       Cirrus SVGA driver by:
 
-	       o Bill Reynolds <bill@goshawk.lanl.gov>,
+               o Bill Reynolds <bill@goshawk.lanl.gov>,
 
-	       o Hank Dietz <hankd@ecn.purdue.edu>,
+               o Hank Dietz <hankd@ecn.purdue.edu>,
 
-	       o Simon Cooper <scooper@vizlab.rutgers.edu>,
+               o Simon Cooper <scooper@vizlab.rutgers.edu>,
 
-	       o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
+               o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
 
-	       o Corin Anderson <corina@the4cs.com>
+               o Corin Anderson <corina@the4cs.com>
 
       Cirrus CL64xx driver by:
 
-	       o Manfred Brands <mb@oceonics.nl>
+               o Manfred Brands <mb@oceonics.nl>
 
-	       o Randy Hendry <randy@sgi.com>
+               o Randy Hendry <randy@sgi.com>
 
-	       o Jeff Kirk <jeff@bambam.dsd.ES.COM>
+               o Jeff Kirk <jeff@bambam.dsd.ES.COM>
 
       Compaq SVGA driver by:
 
-	       o Hans Oey <hans@mo.hobby.nl>
+               o Hans Oey <hans@mo.hobby.nl>
 
-	       o Ming Yu <yum@itp.ac.cn>
+               o Ming Yu <yum@itp.ac.cn>
 
-	       o Gerry Toll <gtoll@tc.cornell.edu>
+               o Gerry Toll <gtoll@tc.cornell.edu>
 
       Oak SVGA driver by:
 
-	       o Steve Goldman <sgoldman@encore.com>
+               o Steve Goldman <sgoldman@encore.com>
 
-	       o Jorge Delgado <ernar@dit.upm.es>
+               o Jorge Delgado <ernar@dit.upm.es>
 
       ARK Logic SVGA driver by:
 
@@ -857,59 +857,59 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>
+               o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>
 
-	       o Leon Bottou <bottou@laforia.ibp.fr>
+               o Leon Bottou <bottou@laforia.ibp.fr>
 
       AL2101 SVGA driver by:
 
-	       o Paolo Severini <lendl@dist.dist.unige.it>
+               o Paolo Severini <lendl@dist.dist.unige.it>
 
       Avance Logic ``ali'' SVGA driver by:
 
-	       o Ching-Tai Chiu <cchiu@netcom.com>
+               o Ching-Tai Chiu <cchiu@netcom.com>
 
       Chips & Technologies SVGA driver by:
 
-	       o Regis Cridlig <cridlig@dmi.ens.fr>
+               o Regis Cridlig <cridlig@dmi.ens.fr>
 
-	       o Jon Block <block@frc.com>
+               o Jon Block <block@frc.com>
 
-	       o Mike Hollick <hollick@graphics.cis.upenn.edu>
+               o Mike Hollick <hollick@graphics.cis.upenn.edu>
 
-	       o Nozomi Ytow
+               o Nozomi Ytow
 
-	       o Egbert Eich <Egbert.Eich@Physik.TH-Darmstadt.DE>
+               o Egbert Eich <Egbert.Eich@Physik.TH-Darmstadt.DE>
 
-	       o David Bateman <dbateman@ee.uts.edu.au>
+               o David Bateman <dbateman@ee.uts.edu.au>
 
-	       o Xavier Ducoin <xavier@rd.lectra.fr>
+               o Xavier Ducoin <xavier@rd.lectra.fr>
 
       MX SVGA driver by:
 
-	       o Frank Dikker <dikker@cs.utwente.nl>
+               o Frank Dikker <dikker@cs.utwente.nl>
 
       Video7 SVGA driver by:
 
-	       o Craig Struble <cstruble@acm.vt.edu>
+               o Craig Struble <cstruble@acm.vt.edu>
 
       RealTek SVGA driver by:
 
-	       o Peter Trattler <peter@sbox.tu-graz.ac.at>
+               o Peter Trattler <peter@sbox.tu-graz.ac.at>
 
       Apollo Mono driver by:
 
-	       o Hamish Coleman <hamish@zot.apana.org.au>
+               o Hamish Coleman <hamish@zot.apana.org.au>
 
       Matrox SVGA driver by:
 
-	       o Guy Desbief <g.desbief@aix.pacwan.net>
+               o Guy Desbief <g.desbief@aix.pacwan.net>
 
-	       o Radoslaw Kapitan <kapitan@student.uci.agh.edu.pl>
+               o Radoslaw Kapitan <kapitan@student.uci.agh.edu.pl>
 
-	       o Andrew Vanderstock <vanderaj@mail2.svhm.org.au>
+               o Andrew Vanderstock <vanderaj@mail2.svhm.org.au>
 
-	       o Angsar Hockmann <Ansgar.Hockmann@hrz.uni-dortmund.de>
+               o Angsar Hockmann <Ansgar.Hockmann@hrz.uni-dortmund.de>
 
 
 
@@ -923,57 +923,57 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Michael Will <Michael.Will@student.uni-tuebingen.de>
+               o Michael Will <Michael.Will@student.uni-tuebingen.de>
 
-	       o Andrew Mileski <aem@ott.hookup.net>
+               o Andrew Mileski <aem@ott.hookup.net>
 
-	       o Stephen Pitts <pitts2@memphisonline.com>
+               o Stephen Pitts <pitts2@memphisonline.com>
 
-	       o Dirk Hohndel <hohndel@XFree86.Org>
+               o Dirk Hohndel <hohndel@XFree86.Org>
 
-	       o Leonard N. Zubkoff <lnz@dandelion.com>
+               o Leonard N. Zubkoff <lnz@dandelion.com>
 
       ViRGE SVGA driver by:
 
-	       o Sebastien Marineau <marineau@genie.uottawa.ca>,
+               o Sebastien Marineau <marineau@genie.uottawa.ca>,
 
-	       o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
+               o Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
 
       Linux/m68k Frame Buffer Device driver by:
 
-	       o Martin Schaller
+               o Martin Schaller
 
-	       o Geert Uytterhoeven <Geert.Uytterhoeven@cs.kuleuven.ac.be>
+               o Geert Uytterhoeven <Geert.Uytterhoeven@cs.kuleuven.ac.be>
 
-	       o Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+               o Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
-	       o Guenther Kelleter <guenther@Pool.Informatik.RWTH-Aachen.de>
+               o Guenther Kelleter <guenther@Pool.Informatik.RWTH-Aachen.de>
 
       Tseng ET4000 and ET6000 SVGA driver by:
 
-	       o [Unknown authors]
+               o [Unknown authors]
 
-	       o Dirk Hohndel <hohndel@XFree86.Org>
+               o Dirk Hohndel <hohndel@XFree86.Org>
 
-	       o Koen Gadeyne <koen.gadeyne@barco.com>
+               o Koen Gadeyne <koen.gadeyne@barco.com>
 
-	       o ... and others
+               o ... and others
 
       XFree86-VidModeExtension and xvidtune client by:
 
-	       o Kaleb S. Keithley <kaleb@x.org>
+               o Kaleb S. Keithley <kaleb@x.org>
 
-	       o David Dawes <dawes@XFree86.org>
+               o David Dawes <dawes@XFree86.org>
 
-	       o Jon Tombs <tombs@XFree86.org>
+               o Jon Tombs <tombs@XFree86.org>
 
-	       o Joe Moss <joe@XFree86.org>
+               o Joe Moss <joe@XFree86.org>
 
       XFree86-Misc extension by:
 
-	       o Joe Moss <joe@XFree86.org>
+               o Joe Moss <joe@XFree86.org>
 
-	       o David Dawes <dawes@XFree86.org>
+               o David Dawes <dawes@XFree86.org>
 
       XFree86-DGA extension by:
 
@@ -989,36 +989,36 @@ README for XFree86[tm] 3.3.2
 
 
 
-	       o Jon Tombs <tombs@XFree86.org>
+               o Jon Tombs <tombs@XFree86.org>
 
-	       o Mark Vojkovich <mvojkovi@ucsd.edu>
+               o Mark Vojkovich <mvojkovi@ucsd.edu>
 
-	       o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
+               o Harm Hanemaayer <H.Hanemaayer@inter.nl.net>,
 
-	       o David Dawes <dawes@XFree86.org>
+               o David Dawes <dawes@XFree86.org>
 
       XInput integration, devices and clients by:
 
-	       o Frederic Lepied <lepied@XFree86.Org> (XInput integration,
-		 Wacom tablet, Joystick and extended mouse devices, xsetpointer
-		 and xsetmode clients)
+               o Frederic Lepied <lepied@XFree86.Org> (XInput integration,
+                 Wacom tablet, Joystick and extended mouse devices, xsetpointer
+                 and xsetmode clients)
 
-	       o Patrick Lecoanet <lecoanet@cena.dgac.fr> (Elographics touch-
-		 screen device)
+               o Patrick Lecoanet <lecoanet@cena.dgac.fr> (Elographics touch-
+                 screen device)
 
-	       o Steven Lang <tiger@tyger.org> (Summagraphics tablet device)
+               o Steven Lang <tiger@tyger.org> (Summagraphics tablet device)
 
       Other contributors:
 
-	       o Joerg Wunsch <joerg_wunsch@uriah.sax.de> (ET3000 banked mono),
+               o Joerg Wunsch <joerg_wunsch@uriah.sax.de> (ET3000 banked mono),
 
-	       o Thomas Dickey <dickey@clark.net> (xterm "new" model ANSI col-
-		 ors and VT220, VT520 emulation).
+               o Thomas Dickey <dickey@clark.net> (xterm "new" model ANSI col-
+                 ors and VT220, VT520 emulation).
 
-	       o Eric Raymond <esr@snark.thyrsus.com> (new video mode documen-
-		 tation),
+               o Eric Raymond <esr@snark.thyrsus.com> (new video mode documen-
+                 tation),
 
-	       o and an entire horde of beta-testers around the world!
+               o and an entire horde of beta-testers around the world!
 
 
 7.  Contact information
@@ -1073,7 +1073,7 @@ The XFree86 Project, Inc, was founded to accomplish two major goals:
       XFree86 development, largely to consist of new video hardware and basic
       computing facilities.
 
-The first of these was the primary motivation.	We have held discussions with
+The first of these was the primary motivation.  We have held discussions with
 the X Consortium on and off for many months, attempting to find an avenue by
 which our loosely-organized free software project could be given a voice within
 the X Consortium.  The bylaws of the Consortium would not recognize such an
@@ -1140,30 +1140,30 @@ release policy.  The main points of the new policy are:
 
    o The source access/use is divided into three categories:
 
-	o End users.  End users have access to only the source of full public
-	  releases.  The main reason for this restriction is that our develop-
-	  ment code often contains code from other sources which cannot be
-	  released to the public immediately.
-
-	o Active developers (members of the XFree86 ``developer team'').
-	  Active developers must formally become non-voting members of the
-	  XFree86 Project, and have full access to our internal development
-	  source.  They are permitted to make time-limited binaries (in coordi-
-	  nation with the Core Team) of the servers they are actively working
-	  on available to external testers for specific testing.
-
-	o Commercial members.  Commercial members are non-voting members of The
-	  XFree86 Project who donate US$5000/year to the Project.  Addition-
-	  ally, companies who contribute significantly to the development
-	  effort of XFree86 can be awarded commercial membership by the Core
-	  Team on a yearly bases.  Commercial members can use the internal
-	  XFree86 development source for derived binary-only products providing
-	  that they take full responsibility for supporting the product, and
-	  don't call it ``XFree86'' (although the derivation of the product
-	  must be acknowledged in any accompanying documentation).  Binary
-	  packages for the OSs we support which are simply compiled from our
-	  internal source without significant added value are explicitly NOT
-	  allowed.
+        o End users.  End users have access to only the source of full public
+          releases.  The main reason for this restriction is that our develop-
+          ment code often contains code from other sources which cannot be
+          released to the public immediately.
+
+        o Active developers (members of the XFree86 ``developer team'').
+          Active developers must formally become non-voting members of the
+          XFree86 Project, and have full access to our internal development
+          source.  They are permitted to make time-limited binaries (in coordi-
+          nation with the Core Team) of the servers they are actively working
+          on available to external testers for specific testing.
+
+        o Commercial members.  Commercial members are non-voting members of The
+          XFree86 Project who donate US$5000/year to the Project.  Addition-
+          ally, companies who contribute significantly to the development
+          effort of XFree86 can be awarded commercial membership by the Core
+          Team on a yearly bases.  Commercial members can use the internal
+          XFree86 development source for derived binary-only products providing
+          that they take full responsibility for supporting the product, and
+          don't call it ``XFree86'' (although the derivation of the product
+          must be acknowledged in any accompanying documentation).  Binary
+          packages for the OSs we support which are simply compiled from our
+          internal source without significant added value are explicitly NOT
+          allowed.
 
 Here is a list of the organizations and individuals who have provided sponsor-
 ship to The XFree86 Project, Inc, either by financial contribution or by the
@@ -1337,41 +1337,41 @@ and the following mirror sites:
 
    o North America:
 
-	o ftp://ftp2.XFree86.org/pub/XFree86 (source and binaries)
+        o ftp://ftp2.XFree86.org/pub/XFree86 (source and binaries)
 
-	o ftp://ftp.infomagic.com/pub/mirrors/XFree86-current (source and bina-
-	  ries)
+        o ftp://ftp.infomagic.com/pub/mirrors/XFree86-current (source and bina-
+          ries)
 
-	o ftp://ftp.rge.com/pub/X/XFree86 and http://www.rge.com/pub/X/XFree86
-	  (source and binaries)
+        o ftp://ftp.rge.com/pub/X/XFree86 and http://www.rge.com/pub/X/XFree86
+          (source and binaries)
 
-	o ftp://ftp.varesearch.com/pub/mirrors/xfree86 (source and binaries)
+        o ftp://ftp.varesearch.com/pub/mirrors/xfree86 (source and binaries)
 
-	o ftp://ftp.cs.umn.edu/pub/XFree86 (source and binaries)
+        o ftp://ftp.cs.umn.edu/pub/XFree86 (source and binaries)
 
-	o ftp://ftp.kernel.org/pub/mirrors/xfree86 (source and binaries)
+        o ftp://ftp.kernel.org/pub/mirrors/xfree86 (source and binaries)
 
 
    o Europe:
 
-	o ftp://fvkma.tu-graz.ac.at/pub/XFree86 (source and binaries)
+        o ftp://fvkma.tu-graz.ac.at/pub/XFree86 (source and binaries)
 
-	o ftp://gd.tuwien.ac.at/hci/X11/XFree86 and
-	  http://gd.tuwien.ac.at/hci/X11/XFree86 (source and binaries)
+        o ftp://gd.tuwien.ac.at/hci/X11/XFree86 and
+          http://gd.tuwien.ac.at/hci/X11/XFree86 (source and binaries)
 
-	o ftp://ftp.fee.vutbr.cz/pub/XFree86 (source patches and binaries)
+        o ftp://ftp.fee.vutbr.cz/pub/XFree86 (source patches and binaries)
 
-	o ftp://ftp.gwdg.de/pub/xfree86/XFree86 (source and binaries)
+        o ftp://ftp.gwdg.de/pub/xfree86/XFree86 (source and binaries)
 
-	o ftp://ftp.mpi-sb.mpg.de/pub/X/mirror/ftp.xfree86.org (source and
-	  binaries)
+        o ftp://ftp.mpi-sb.mpg.de/pub/X/mirror/ftp.xfree86.org (source and
+          binaries)
 
-	o ftp://ftp.cs.tu-berlin.de/pub/X/XFree86 (source and binaries)
+        o ftp://ftp.cs.tu-berlin.de/pub/X/XFree86 (source and binaries)
 
-	o ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.xfree86 (source and Linux
-	  binaries)
+        o ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.xfree86 (source and Linux
+          binaries)
 
-	o ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86 (source and binaries)
+        o ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86 (source and binaries)
 
 
 
@@ -1385,28 +1385,28 @@ README for XFree86[tm] 3.3.2
 
 
 
-	o ftp://ftp.funet.fi/pub/X11/XFree86 (source and binaries)
+        o ftp://ftp.funet.fi/pub/X11/XFree86 (source and binaries)
 
-	o ftp://ftp.ibp.fr/pub/X11/XFree86 (source and binaries)
+        o ftp://ftp.ibp.fr/pub/X11/XFree86 (source and binaries)
 
-	o ftp://ftp.unina.it/pub/XFree86 (source and binaries)
+        o ftp://ftp.unina.it/pub/XFree86 (source and binaries)
 
-	o ftp://ftp.pvv.unit.no/pub/XFree86 (source and binaries)
+        o ftp://ftp.pvv.unit.no/pub/XFree86 (source and binaries)
 
-	o ftp://sunsite.doc.ic.ac.uk/packages/XFree86 (source and binaries)
+        o ftp://sunsite.doc.ic.ac.uk/packages/XFree86 (source and binaries)
 
 
 
 
    o Asia/Australia:
 
-	o ftp://x.physics.usyd.edu.au/pub/XFree86 (source and binaries)
+        o ftp://x.physics.usyd.edu.au/pub/XFree86 (source and binaries)
 
-	o ftp://ftp.netlab.is.tsukuba.ac.jp/pub/XFree86 (source and binaries)
+        o ftp://ftp.netlab.is.tsukuba.ac.jp/pub/XFree86 (source and binaries)
 
-	o ftp://ftp.iij.ad.jp/pub/X/XFree86/XFree86 (source and binaries)
+        o ftp://ftp.iij.ad.jp/pub/X/XFree86/XFree86 (source and binaries)
 
-	o ftp://ftp.kreonet.re.kr/pub/Linux/xfree86 (source and binaries)
+        o ftp://ftp.kreonet.re.kr/pub/Linux/xfree86 (source and binaries)
 
 
 Ensure that you are getting XFree86 3.3.2 - some of these sites may archive
@@ -1517,7 +1517,7 @@ README for XFree86[tm] 3.3.2
 
 
 
-				   CONTENTS
+                                   CONTENTS
 
 
 
@@ -1573,7 +1573,7 @@ README for XFree86[tm] 3.3.2
 
 
 
-				       i
+                                       i
 
 
 
diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp
index c7fdb0a..690a5f1 100644
--- a/release/sysinstall/help/hardware.hlp
+++ b/release/sysinstall/help/hardware.hlp
@@ -59,7 +59,7 @@ fdc0    3f0     6       2       n/a     Floppy disk controller
 wdc0    1f0     14      n/a     n/a     IDE/MFM/RLL disk controller
 wdc1    170     15      n/a     n/a     IDE/MFM/RLL disk controller
 
-adv0	n/a	n/a	n/a	n/a	AdvanSys ADP-9xx SCSI controller
+adv0    n/a     n/a     n/a     n/a     AdvanSys ADP-9xx SCSI controller
 ncr0    n/a     n/a     n/a     n/a     NCR PCI SCSI controller
 bt0     330     dyn     dyn     dyn     Buslogic SCSI controller
 uha0    330     dyn     6       dyn     Ultrastore 14f
@@ -69,7 +69,7 @@ ahc0    dyn     dyn     dyn     dyn     Adaptec 274x/284x/294x SCSI controller
 aic0*   340     11      dyn     dyn     Adaptec 152x/AIC-6360 SCSI
                                         controller
 amd0    n/a     n/a     n/a     n/a     Tekram DC-390(T) / AMD 53c974 PCI SCSI
-dpt	n/a	n/a	n/a	n/a	DPT RAID SCSI controllers.
+dpt     n/a     n/a     n/a     n/a     DPT RAID SCSI controllers.
 nca0*   1f88    10      dyn     dyn     ProAudioSpectrum cards
 sea0*   dyn     5       dyn     c8000   Seagate ST01/02 8 bit controller
 
@@ -108,8 +108,8 @@ lnc0    280     10      n/a     dyn     Lance/PCnet cards
                                         (Isolan, Novell NE2100, NE32-VL,
 					 some PCnet-PCI cards)
 vx0     dyn     dyn     n/a     dyn     3Com 3c59x ((Fast) Etherlink III)
-xl0	dyn	dyn	n/a	dyn	3Com 3c900, 3c905 and 3c905B
-					((Fast) Etherlink XL)
+xl0     dyn     dyn     n/a     dyn     3Com 3c900, 3c905 and 3c905B
+                                        ((Fast) Etherlink XL)
 cs0     0x300   dyn     n/a     n/a     Crystal Semiconductor CS89x0-based
                                         cards.
 ze0     300     5       n/a     d8000   IBM/National Semiconductor
@@ -271,6 +271,8 @@ gp:     National Instruments AT-GPIB and AT-GPIB/TNT board
 gsc:    Genius GS-4500 hand scanner
 gus:    Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX
 gusxvi: Gravis Ultrasound 16-bit PCM
+hea:    Efficient ENI-155p ATM PCI adapter
+hfa:    FORE PCA-200E ATM PCI adapter
 joy:    Joystick
 labpc:  National Instrument's Lab-PC and Lab-PC+
 meteor: Matrox Meteor frame-grabber card
@@ -395,8 +397,8 @@ The following CD-ROM type systems are supported at this time:
 (wcd)   ATAPI IDE interface.
 
 
-4.2.    Ethernet cards
-----    --------------
+4.2.    Network cards
+----    -------------
 
 Allied-Telesis AT1700 and RE2000 cards
 
@@ -417,6 +419,10 @@ DEC EtherWORKS II NICs (DE200, DE201, DE202, and DE422)
 DEC DC21040, DC21041, or DC21140 based NICs (SMC Etherpower 8432T, DE245, etc)
 DEC FDDI (DEFPA/DEFEA) NICs
 
+Efficient ENI-155p ATM PCI
+
+FORE PCA-200E ATM PCI
+
 Fujitsu MB86960A/MB86965A
 
 HP PC Lan+ cards (model numbers: 27247B and 27252A).
diff --git a/release/sysinstall/help/partition.hlp b/release/sysinstall/help/partition.hlp
index 5240d72..8e07d3d 100644
--- a/release/sysinstall/help/partition.hlp
+++ b/release/sysinstall/help/partition.hlp
@@ -118,18 +118,9 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
       drive, but only the first one will be mapped to the compatibility
       slice!
 
-      The compatibility slice will eventually be phased out, but
-      it is still important right now for several reasons:
-
-              1. Some programs, as mentioned before, still don't work
-                 with the slice paradigm and need time to catch up.
-
-              2. The FreeBSD boot blocks are unable to look for
-                 a root file system in anything but a compatibility
-                 slice right now.  This means that our root will always
-                 show up on "sd0a" in the above scenario, even though
-                 it really lives over on sd0s1a and would otherwise be
-                 referred to by its full slice name.
+      The compatibility slice has essentially been phased out, but
+      it's important to be aware of when looking at or upgrading
+      older systems.
 
 Once you understand all this, then the purpose of the label editor
 becomes fairly clear:  You're carving up the FreeBSD slices displayed
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index 5e1b3fd..ff277a0 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -210,7 +210,7 @@ o An interrupt driven configuration hook mechanism has been implemented.
 o The timeout(9) system in the kernel has been overhauled.  This gives
   O(1) insertion and removal of callouts and an O(hash chain length)
   amount of work to be performed in softclock.  The original paper is at:
-	http://www.cs.berkeley.edu/~amc/research/timer/ 
+        http://www.cs.berkeley.edu/~amc/research/timer/ 
 
 o Changes in driver buffer queuing to deal with ordered transactions.  This
   is intended for sequencing data and metadata writes in the filesystem code
@@ -263,19 +263,19 @@ o Added full bus master DMA support for 3c900 and 3c905 adapters and
 -------------------
 [MERGED: all changes soon after specified date in 2.2-STABLE branch]
 
-97/7/29	Lots of lpr/lpd security fixes merged from OpenBSD.
-97/8/22	buffer overflows in tip corrected (benign since tip isn't
-	set[ug]id)
-97/8/26	buffer overflow in glob fixed, no know exploits
-97/8/27	vacation security problem with sendmail corrected (SNI)
-97/8/29	inetd sleeps less when children exit, making DoS attacks much
-	harder.
-97/8/29	fts now race-proof and find -execdir added (-current only)
-97/8/31	games setuid -> setgid.  Makes any games exploits benign (only
-	score files vulnerable).  Please report any problems to
-	eivind@FreeBSD.org (score-file ownership problems are known)
-97/12/3	Add Intel's suggested fix for the F00F bug.  If you don't have
-	a Pentium, the NO_F00F_HACK kernel option will disable it.
+97/7/29 Lots of lpr/lpd security fixes merged from OpenBSD.
+97/8/22 buffer overflows in tip corrected (benign since tip isn't
+        set[ug]id)
+97/8/26 buffer overflow in glob fixed, no know exploits
+97/8/27 vacation security problem with sendmail corrected (SNI)
+97/8/29 inetd sleeps less when children exit, making DoS attacks much
+        harder.
+97/8/29 fts now race-proof and find -execdir added (-current only)
+97/8/31 games setuid -> setgid.  Makes any games exploits benign (only
+        score files vulnerable).  Please report any problems to
+        eivind@FreeBSD.org (score-file ownership problems are known)
+97/12/3 Add Intel's suggested fix for the F00F bug.  If you don't have
+        a Pentium, the NO_F00F_HACK kernel option will disable it.
 98/1/20 More robust protection against LAND attacks now incorporated.
 
 The suidperl vulnerability mentioned in the CERT advisory CA-97.17 is
@@ -423,12 +423,12 @@ Buslogic 956c PCI SCSI controller
 
 SymBios (formerly NCR) 53C810, 53C825, 53c860 and 53c875 PCI SCSI
 controllers:
-	ASUS SC-200
-  	Data Technology DTC3130 (all variants)
-	NCR cards (all)
-	Symbios cards (all)
-	Tekram DC390W, 390U and 390F
-	Tyan S1365
+        ASUS SC-200
+        Data Technology DTC3130 (all variants)
+        NCR cards (all)
+        Symbios cards (all)
+        Tekram DC390W, 390U and 390F
+        Tyan S1365
 
 Tekram DC390 and DC390T controllers (maybe other cards based on the
 AMD 53c974 as well).