[linuxdc-cvs] CVS: linux-sh-dc/Documentation Configure.help,1.4,1.5

[M. R. B. <mr...@us...>]

Update of /cvsroot/linuxdc/linux-sh-dc/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv19034/Documentation

Modified Files:
	Configure.help 
Log Message:
Sync'd tree against LinuxSH 2.4.18

Index: Configure.help
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Documentation/Configure.help,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Configure.help	17 Dec 2001 04:43:47 -0000	1.4
+++ Configure.help	1 May 2002 10:00:19 -0000	1.5
@@ -2,10 +2,10 @@
 #	Eric S. Raymond <mailto:es...@th...>
 #	Steven Cole <mailto:ele...@me...>
 #
-# Merged version 2.49: Current with 2.4.15-pre1 and 2.4.13-ac8.
+# Merged version 2.69: current with 2.4.17-pre8/2.5.1-pre10.
 #
 # This version of the Linux kernel configuration help texts
-# corresponds to the kernel versions 2.4.x.
+# corresponds to kernel versions 2.4.x and 2.5.x.
 #
 # Translations of this file available on the WWW:
[...4284 lines suppressed...]
 # A couple of things I keep forgetting:
 #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
@@ -23957,7 +24420,7 @@
 #
 # This is used by Emacs' spell checker ispell.el:
 #
-# LocalWords:  CONFIG coprocessor DX Pentium SX lilo loadlin HOWTO ftp metalab
+# LocalWords:  CONFIG coprocessor DX Pentium SX lilo loadlin HOWTO ftp ibiblio
 # LocalWords:  unc edu docs emu README kB BLK DEV FD Thinkpad fd MFM RLL IDE gz
 # LocalWords:  cdrom diskless netboot nfs xzvf ATAPI MB ide pavia rubini pl pd
 # LocalWords:  HD CD-ROMs IDECD NEC MITSUMI filesystem XT XD PCI BIOS cezar ATEN
@@ -24003,7 +24466,7 @@
 # LocalWords:  bsd comp SPARCstation le SunOS ie Gracilis PackeTwin PT pt LU FX
 # LocalWords:  FX TEAC CR LCS mS ramdisk IDETAPE cmd fperllo encis tcfs unisa
 # LocalWords:  Vertos Genoa Funai hsfs NCP NetWare tgz APM apm ioctls UltraLite
-# LocalWords:  TravelMate CDT LCD backlight VC RPC Mips AXP barlow cdrecord pg
+# LocalWords:  TravelMate CDT LCD backlight VC RPC Mips AXP barlow cdrtools pg
 # LocalWords:  PMAX MILO Alphas Multia Tseng linuxelf endian mipsel mips drv HT
 # LocalWords:  kerneld callouts AdvanSys advansys Admin WDT DataStor EP verden
 # LocalWords:  wdt hdb hdc bugfix SiS vlb Acculogic CSA DTC dtc Holtek ht QDI