--- Configure.help-2.0.39	2004-02-09 16:19:21.000000000 +0900
+++ Configure.help-2.0.40	2004-02-09 16:25:24.000000000 +0900
@@ -43 +43 @@
-  drivers, filesystems, network protocols, etc.) can be in a state
+  drivers, file systems, network protocols, etc.) can be in a state
@@ -125 +125 @@
-  memory as a block device, so that you can make filesystems on it,
+  memory as a block device, so that you can make file systems on it,
@@ -151 +151 @@
-  filesystem with encryption.  To use these features, you need a
+  file system with encryption.  To use these features, you need a
@@ -157 +157 @@
-Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support
+Enhanced IDE/MFM/RLL disk/CD-ROM/tape/floppy support
@@ -161 +161 @@
-  disk/cdrom/tape/floppy drives.  Useful information about large
+  disk/CD-ROM/tape/floppy drives.  Useful information about large
@@ -192 +192 @@
-  an IDE/ATAPI CDROM or tape drive connected to the primary IDE
+  an IDE/ATAPI CD-ROM or tape drive connected to the primary IDE
@@ -208 +208 @@
-Include IDE/ATAPI CDROM support
+Include IDE/ATAPI CD-ROM support
@@ -210,3 +210,3 @@
-  If you have a CDROM drive using the ATAPI protocol, say Y.  ATAPI is
-  a new protocol used by IDE CDROM and TAPE drives, similar to the
-  SCSI protocol.  Most new CDROM drives use ATAPI, including the
+  If you have a CD-ROM drive using the ATAPI protocol, say Y.  ATAPI is
+  a new protocol used by IDE CD-ROM and tape drives, similar to the
+  SCSI protocol.  Most new CD-ROM drives use ATAPI, including the
@@ -215 +215 @@
-  TAPE drive will be identified along with other IDE devices, as "hdb"
+  tape drive will be identified along with other IDE devices, as "hdb"
@@ -217,2 +217,2 @@
-  If this is your only CDROM drive, you can say N to all other CDROM
-  options, but be sure to say Y to the ISO9660 filesystem.  Read the
+  If this is your only CD-ROM drive, you can say N to all other CD-ROM
+  options, but be sure to say Y to the ISO9660 file system.  Read the
@@ -221,2 +221,2 @@
-  Documentation/cdrom/ide-cd.  Note that older versions of lilo (the
-  Linux boot loader) cannot properly deal with IDE/ATAPI CDROMs, so
+  Documentation/CD-ROM/ide-cd.  Note that older versions of lilo (the
+  Linux boot loader) cannot properly deal with IDE/ATAPI CD-ROMs, so
@@ -239 +239 @@
-  ATAPI is a new protocol used by IDE cdrom/tape/floppy drives,
+  ATAPI is a new protocol used by IDE CD-ROM/tape/floppy drives,
@@ -350 +350 @@
-  I/O to drives attached to the secondary interface.  CDROM and TAPE
+  I/O to drives attached to the secondary interface.  CD-ROM and TAPE
@@ -409,2 +409,2 @@
-  cdrom filesystem support" below, because that's the filesystem used
-  on CDROMs.
+  CD-ROM file system support" below, because that's the file system used
+  on CD-ROMs.
@@ -1083 +1083 @@
-  Normally when you have selected some drivers and/or filesystems to
+  Normally when you have selected some drivers and/or file systems to
@@ -1215 +1215 @@
-  you want to say Y to the /proc filesystem below, if you say Y here.
+  you want to say Y to the /proc file system below, if you say Y here.
@@ -1239 +1239 @@
-  it received.  The information is handled by the klogd demon which is
+  it received.  The information is handled by the klogd daemon which is
@@ -1496 +1496 @@
-  you'll also have to say Y to "NCP filesystem support", below. To
+  you'll also have to say Y to "NCP file system support", below. To
@@ -1635 +1635 @@
-  If you want to use a SCSI hard disk, SCSI tapedrive, SCSI CDROM or
+  If you want to use a SCSI hard disk, SCSI tapedrive, SCSI CD-ROM or
@@ -1653 +1653 @@
-  /pub/Linux/docs/HOWTO. This is NOT for SCSI CDROMs.
+  /pub/Linux/docs/HOWTO. This is NOT for SCSI CD-ROMs.
@@ -1664 +1664 @@
-  source. This is NOT for SCSI CDROMs. This driver is also available
+  source. This is NOT for SCSI CD-ROMs. This driver is also available
@@ -1670 +1670 @@
-SCSI CDROM support
+SCSI CD-ROM support
@@ -1672 +1672 @@
-  If you want to use a SCSI CDROM under Linux, say Y and read the
+  If you want to use a SCSI CD-ROM under Linux, say Y and read the
@@ -1675 +1675 @@
-  filesystem later. This driver is also available as a module ( = code
+  file system later. This driver is also available as a module ( = code
@@ -1684 +1684 @@
-  CDROMs or tapes, say Y here. Those won't be supported by the kernel
+  CD-ROMs or tapes, say Y here. Those won't be supported by the kernel
@@ -1711 +1711 @@
-  12KB.  If in doubt, say Y.
+  12kB.  If in doubt, say Y.
@@ -1837 +1837 @@
-  you also say Y to "/proc filesystem support", below. 
+  you also say Y to "/proc file system support", below. 
@@ -3395 +3395 @@
-  If you have a CDROM drive that is neither SCSI nor IDE/ATAPI, say Y
+  If you have a CD-ROM drive that is neither SCSI nor IDE/ATAPI, say Y
@@ -3400 +3400 @@
-  about these CDROM drives. If you are unsure what you have, say Y and
+  about these CD-ROM drives. If you are unsure what you have, say Y and
@@ -3402 +3402 @@
-  For each of these drivers, a file Documentation/cdrom/<driver_name>
+  For each of these drivers, a file Documentation/CD-ROM/<driver_name>
@@ -3408 +3408 @@
-  All these CDROM drivers are also usable as a module ( = code which
+  All these CD-ROM drivers are also usable as a module ( = code which
@@ -3412,3 +3412,3 @@
-  If you want to use any of these CDROM drivers, you also have to say
-  Y to "ISO9660 cdrom filesystem support" below (this answer will get
-  "defaulted" for you if you enable any of the Linux CDROM drivers).
+  If you want to use any of these CD-ROM drivers, you also have to say
+  Y to "ISO9660 CD-ROM file system support" below (this answer will get
+  "defaulted" for you if you enable any of the Linux CD-ROM drivers).
@@ -3416 +3416 @@
-Sony CDU31A/CDU33A CDROM support
+Sony CDU31A/CDU33A CD-ROM support
@@ -3418,2 +3418,2 @@
-  These CDROM drives have a spring-pop-out caddyless drawer, and a
-  rectangular green LED centered beneath it.  NOTE: these CDROM drives
+  These CD-ROM drives have a spring-pop-out caddyless drawer, and a
+  rectangular green LED centered beneath it.  NOTE: these CD-ROM drives
@@ -3427 +3427 @@
-Standard Mitsumi [no XA/Multisession] CDROM support
+Standard Mitsumi [no XA/Multisession] CD-ROM support
@@ -3434 +3434 @@
-  cd insertion. The FX-xxx models use a motorized tray type mechanism.
+  CD insertion. The FX-xxx models use a motorized tray type mechanism.
@@ -3445 +3445 @@
-  FX-001 or FX-001D CDROM drive.  In addition, this driver uses much
+  FX-001 or FX-001D CD-ROM drive.  In addition, this driver uses much
@@ -3450 +3450 @@
-Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support
+Matsushita/Panasonic/Creative, Longshine, TEAC CD-ROM support
@@ -3470,2 +3470,2 @@
-  This driver can support up to four CDROM interface cards, and each
-  card can support up to four CDROM drives; if you say Y here, you
+  This driver can support up to four CD-ROM interface cards, and each
+  card can support up to four CD-ROM drives; if you say Y here, you
@@ -3476 +3476 @@
-Matsushita/Panasonic, ... second CDROM controller support
+Matsushita/Panasonic, ... second CD-ROM controller support
@@ -3478 +3478 @@
-  Say Y here only if you have two CDROM controller boards of this type
+  Say Y here only if you have two CD-ROM controller boards of this type
@@ -3483 +3483 @@
-Aztech/Orchid/Okano/Wearnes/TXC/CyDROM  CDROM support
+Aztech/Orchid/Okano/Wearnes/TXC/CyDROM  CD-ROM support
@@ -3487,2 +3487,2 @@
-  CR540 CDROM drive. This driver -- just like all these CDROM drivers
-  -- is NOT for CDROM drives with IDE/ATAPI interface, such as Aztech
+  CR540 CD-ROM drive. This driver -- just like all these CD-ROM drivers
+  -- is NOT for CD-ROM drives with IDE/ATAPI interface, such as Aztech
@@ -3491 +3491 @@
-Sony CDU535 CDROM support
+Sony CDU535 CD-ROM support
@@ -3493 +3493 @@
-  This is the driver for the older Sony CDU-535 and CDU-531 CDROM
+  This is the driver for the older Sony CDU-535 and CDU-531 CD-ROM
@@ -3496 +3496 @@
-Goldstar R420 CDROM support
+Goldstar R420 CD-ROM support
@@ -3498 +3498 @@
-  If this is your CDROM drive, say Y here.
+  If this is your CD-ROM drive, say Y here.
@@ -3503 +3503 @@
-Philips/LMS CM206 CDROM support
+Philips/LMS CM206 CD-ROM support
@@ -3505 +3505 @@
-  If you have a Philips/LMS CDROM drive cm206 in combination with a
+  If you have a Philips/LMS CD-ROM drive cm206 in combination with a
@@ -3508 +3508 @@
-Optics Storage DOLPHIN 8000AT CDROM support
+Optics Storage DOLPHIN 8000AT CD-ROM support
@@ -3513 +3513 @@
-  Optics Storage 8001 drive; use the IDE-ATAPI CDROM driver for that
+  Optics Storage 8001 drive; use the IDE-ATAPI CD-ROM driver for that
@@ -3516 +3516 @@
-Sanyo CDR-H94A CDROM support
+Sanyo CDR-H94A CD-ROM support
@@ -3518 +3518 @@
-  If this is your CDROM drive, say Y here. Command line option
+  If this is your CD-ROM drive, say Y here. Command line option
@@ -3524 +3524 @@
-Soft configurable cdrom interface card support
+Soft configurable CD-ROM interface card support
@@ -3526 +3526 @@
-  If you want to include boot-time initialization of any cdrom
+  If you want to include boot-time initialization of any CD-ROM
@@ -3530 +3530 @@
-ISP16/MAD16/Mozart soft configurable cdrom interface support
+ISP16/MAD16/Mozart soft configurable CD-ROM interface support
@@ -3532 +3532 @@
-  If you want any of these cdrom interface cards based on the
+  If you want any of these CD-ROM interface cards based on the
@@ -3538,2 +3538,2 @@
-  DMA line assumed to be used by the attached cdrom
-  drive. 'drive_type' is the type of cdrom drive or its emulation
+  DMA line assumed to be used by the attached CD-ROM
+  drive. 'drive_type' is the type of CD-ROM drive or its emulation
@@ -3553 +3553 @@
-  ext2 filesystem. You need additional software in order to use quota
+  ext2 file system. You need additional software in order to use quota
@@ -3573,3 +3573,3 @@
-  The minix filesystem ( = method to organize files on a hard disk
-  partition or a floppy disk) was the original filesystem for Linux,
-  has been superseded by the second extended filesystem ext2fs but is
+  The minix file system ( = method to organize files on a hard disk
+  partition or a floppy disk) was the original file system for Linux,
+  has been superseded by the second extended file system ext2fs but is
@@ -3583 +3583 @@
-  Documentation/modules.txt. Note that the filesystem of your root
+  Documentation/modules.txt. Note that the file system of your root
@@ -3588 +3588 @@
-  This is the old Linux filesystem ( = method to organize files on a
+  This is the old Linux file system ( = method to organize files on a
@@ -3595 +3595 @@
-  This is the de facto standard Linux filesystem ( = method to
+  This is the de facto standard Linux file system ( = method to
@@ -3598 +3598 @@
-  partition using the umsdos filesystem. The advantage of the latter
+  partition using the umsdos file system. The advantage of the latter
@@ -3608 +3608 @@
-  it's sufficient to enable NFS filesystem support below; if you are
+  it's sufficient to enable NFS file system support below; if you are
@@ -3616 +3616 @@
-xiafs filesystem support
+xiafs file system support
@@ -3618 +3618 @@
-  This is an old filesystem ( = method to organize files on a hard
+  This is an old file system ( = method to organize files on a hard
@@ -3624 +3624 @@
-  filesystem of your root partition cannot be compiled as a module.
+  file system of your root partition cannot be compiled as a module.
@@ -3626 +3626 @@
-fat fs support
+FAT fs support
@@ -3628,4 +3628,4 @@
-  If you want to use one of the FAT-based filesystems (the MS-DOS,
-  VFAT (Windows'95) and UMSDOS filesystems), then you must include
-  FAT support. This is not a filesystem in itself, but it provides
-  the foundation for the other filesystems. This option will enlarge
+  If you want to use one of the FAT-based file systems (the MS-DOS,
+  VFAT (Windows'95) and UMSDOS file systems), then you must include
+  FAT support. This is not a file system in itself, but it provides
+  the foundation for the other file systems. This option will enlarge
@@ -3637,2 +3637,2 @@
-  filesystems into the kernel -- they will have to be modules as well.
-  The filesystem of your root partition cannot be a module.
+  file systems into the kernel -- they will have to be modules as well.
+  The file system of your root partition cannot be a module.
@@ -3640 +3640 @@
-msdos fs support
+MSDOS fs support
@@ -3653,2 +3653,2 @@
-  which doesn't require the msdos filesystem support.  If you want to
-  use umsdos, the Unix-like filesystem on top of DOS, which allows you
+  which doesn't require the MSDOS file system support.  If you want to
+  use umsdos, the Unix-like file system on top of DOS, which allows you
@@ -3658 +3658 @@
-  filesystem instead, or you will not be able to see the long
+  file system instead, or you will not be able to see the long
@@ -3661 +3661 @@
-  work if you said Y to "fat fs support" as well. If you want to
+  work if you said Y to "FAT fs support" as well. If you want to
@@ -3664 +3664 @@
-  and read Documentation/modules.txt. Note that the filesystem of your
+  and read Documentation/modules.txt. Note that the file system of your
@@ -3667 +3667 @@
-vfat fs support
+VFAT fs support
@@ -3671,3 +3671,3 @@
-  filenames used by Windows'95 and Windows NT fat-based (not NTFS)
-  partitions. It does not support Windows'95 compressed filesystems.
-  You cannot use the VFAT filesystem for your root partition; use
+  filenames used by Windows'95 and Windows NT FAT-based (not NTFS)
+  partitions. It does not support Windows'95 compressed file systems.
+  You cannot use the VFAT file system for your root partition; use
@@ -3675 +3675 @@
-  it only works if you enabled the "fat fs support" above. Please read
+  it only works if you enabled the "FAT fs support" above. Please read
@@ -3695 +3695 @@
-  enabled both "fat fs support" and "msdos fs support" above. If
+  enabled both "FAT fs support" and "MSDOS fs support" above. If
@@ -3699 +3699 @@
-  Note that the filesystem of your root partition cannot be a module.
+  Note that the file system of your root partition cannot be a module.
@@ -3703,3 +3703,3 @@
-  This is required by the FAT based filesystems and by the ISO9660
-  filesystem with Joliet support.  Joliet is a Microsoft extension
-  for CDROMs that supports Unicode.
+  This is required by the FAT based file systems and by the ISO9660
+  file system with Joliet support.  Joliet is a Microsoft extension
+  for CD-ROMs that supports Unicode.
@@ -3707 +3707 @@
-  dealing with the FAT based filesystems, there are two character
+  dealing with the FAT based file systems, there are two character
@@ -3853 +3853 @@
-/proc filesystem support
+/proc file system support
@@ -3855 +3855 @@
-  This is a virtual filesystem providing information about the status
+  This is a virtual file system providing information about the status
@@ -3859 +3859 @@
-  more or cat. The filesystem is explained in the Kernel Hacker's
+  more or cat. The file system is explained in the Kernel Hacker's
@@ -3871 +3871,8 @@
-NFS filesystem support
+Enable mmap on /proc/*/mem (UNSECURE!)
+CONFIG_UNSAFE_MMAP
+  As of linux-2.0.40, mmap on /proc/*/mem has been disabled due to
+  security problems.  If you need this functionality, and have no
+  (potentially hostile) local users, you can enable this option to
+  restore the old functionality. If unsure, say N.
+
+NFS file system support
@@ -3880 +3887 @@
-  filesystem support enabled). NFS is explained in the Network
+  file system support enabled). NFS is explained in the Network
@@ -3886 +3893 @@
-  would enlarge your kernel by about 27 kB. This filesystem is also
+  would enlarge your kernel by about 27 kB. This file system is also
@@ -3891 +3898 @@
-  filesystem over NFS, you cannot compile this driver as a module.
+  file system over NFS, you cannot compile this driver as a module.
@@ -3896 +3903 @@
-  If you want your Linux box to mount its whole root filesystem from
+  If you want your Linux box to mount its whole root file system from
@@ -3903 +3910 @@
-  If you want your Linux box to mount its whole root filesystem from
+  If you want your Linux box to mount its whole root file system from
@@ -3916 +3923 @@
-  If you want your Linux box to mount its whole root filesystem from
+  If you want your Linux box to mount its whole root file system from
@@ -3924 +3931 @@
-ISO9660 cdrom filesystem support
+ISO9660 CD-ROM file system support
@@ -3926 +3933 @@
-  This is the standard filesystem used on CDROMs. It was previously
+  This is the standard file system used on CD-ROMs. It was previously
@@ -3930 +3937 @@
-  CDROM drive and want to do more with it than just listen to audio
+  CD-ROM drive and want to do more with it than just listen to audio
@@ -3939 +3946 @@
-OS/2 HPFS filesystem support (read only)
+OS/2 HPFS file system support (read only)
@@ -3942 +3949 @@
-  is the filesystem used for organizing files on OS/2 hard disk
+  is the file system used for organizing files on OS/2 hard disk
@@ -3947 +3954 @@
-  filesystem is also available as a module ( = code which can be
+  file system is also available as a module ( = code which can be
@@ -3952 +3959 @@
-System V and Coherent filesystem support
+System V and Coherent file system support
@@ -3965,2 +3972,2 @@
-  NFS, you don't need the System V filesystem support (but you need
-  NFS filesystem support obviously). Note that this option is
+  NFS, you don't need the System V file system support (but you need
+  NFS file system support obviously). Note that this option is
@@ -3971 +3978 @@
-  "System V IPC". Read about the System V filesystem in
+  "System V IPC". Read about the System V file system in
@@ -3980 +3987 @@
-  The automounter is a tool to automatically mount remote filesystems
+  The automounter is a tool to automatically mount remote file systems
@@ -3989 +3996 @@
-BSD UFS filesystem support (read only)
+BSD UFS file system support (read only)
@@ -3992,2 +3999,2 @@
-  and NeXTstep) use a filesystem called UFS. Some System V Unixes can
-  create and mount partitions and diskettes using this filesystem
+  and NeXTstep) use a file system called UFS. Some System V Unixes can
+  create and mount partitions and diskettes using this file system
@@ -3997 +4004 @@
-  UFS filesystem support (but you need NFS filesystem support
+  UFS file system support (but you need NFS file system support
@@ -4017 +4024 @@
-  your Linux box if you also have configured BSD ufs filesystem
+  your Linux box if you also have configured BSD UFS file system
@@ -4025 +4032 @@
-  Linux box if you also have configured BSD ufs filesystem support.
+  Linux box if you also have configured BSD UFS file system support.
@@ -4030 +4037 @@
-SMB filesystem support (to mount WfW shares etc...)
+SMB file system support (to mount WfW shares etc...)
@@ -4034 +4041 @@
-  Ethernet. Enabling this allows you to mount their filesystems and
+  Ethernet. Enabling this allows you to mount their file systems and
@@ -4039 +4046 @@
-  you don't need to enable this filesystem support; you can use the
+  you don't need to enable this file system support; you can use the
@@ -4057 +4064 @@
-NCP filesystem support (to mount NetWare volumes)
+NCP file system support (to mount NetWare volumes)
@@ -4116 +4123 @@
-Amiga FFS filesystem support (EXPERIMENTAL)
+Amiga FFS file system support (EXPERIMENTAL)
@@ -4118 +4125 @@
-  The Fast File System (FFS) is the common filesystem used on
+  The Fast File System (FFS) is the common file system used on
@@ -4129 +4136 @@
-  Documentation/filesystems/affs.txt.  This filesystem is also
+  Documentation/filesystems/affs.txt.  This file system is also
@@ -4700 +4707 @@
-  /proc/profile (enable the /proc filesystem!) and in order to read
+  /proc/profile (enable the /proc file system!) and in order to read
@@ -4979,0 +4987,33 @@
+Memory flooding
+CONFIG_SADISTIC_KMALLOC
+  A common class of errors, both in user space programs and the kernel,
+  is accessing memory areas after freeing them.  Programs with such
+  errors often work anyway most of the time, since the bug only bites
+  if something else happens to allocate the same area in a short time
+  window.
+  This option will cause the memory allocator to immediately destroy 
+  any data that has been freed within the kernel, causing such bugs to
+  manifest consistently so they may be solved.  Newly allocated memory
+  is also flooded, making failure-to-initialize bugs easier to detect.
+  This feature does not affect bugs in user space programs.
+  Non-kernel hackers should say N.  If there are any such bugs in the
+  kernel, there is no point provoking them if you are not prepared to
+  fix them.  And it will run slightly slower.
+
+Socket-buffer consistency checking
+CONFIG_SKB_CHECK
+  The networking facilities of Linux use a special system of memory
+  management, known as socket buffers or SKBs.  SKB structures are
+  moderately complicated and could be corrupted by kernel bugs, later 
+  causing puzzling crashes.
+  This option causes SKBs to be rechecked almost every time they are
+  used, leading to earlier detection of such problems.  This will
+  reduce performance -- however it does not affect the likelihood of
+  the kernel crashing.  Non-kernel hackers should say N.
+
+Whole-queue checking
+CONFIG_SKB_CHECK_WHOLE_QUEUE
+  This option is an extension of CONFIG_SKB_CHECK.  Whenever a list
+  header is validated, this mode will traverse the entire list looking
+  for inconsistent pointers.
+
@@ -4987 +5027 @@
-# LocalWords:  cdrom diskless netboot nfs xzvf ATAPI MB ide
+# LocalWords:  cdrom CD-ROM diskless netboot nfs xzvf ATAPI MB ide
@@ -5035 +5075 @@
-# LocalWords:  QD qd UMC umc ALI ali lena fnet fr homepage azstarnet axplinux
+# LocalWords:  QD qd UMC umc ALI ali lena fnet fr azstarnet axplinux
