patch-2.1.131 linux/Documentation/Configure.help

Next file: linux/Documentation/joystick-parport.txt
Previous file: linux/CREDITS
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.130/linux/Documentation/Configure.help linux/Documentation/Configure.help
@@ -2397,9 +2397,6 @@
   information on the WWW at
   http://www.tor.shaw.wave.ca/~ambrose/kernel21.html. 
 
-  If you say Y here, you should also say Y to "IP: always defragment",
-  below. 
-
   If you say Y here, then the modules ip_masq_ftp.o (for ftp file
   transfers), ip_masq_irc.o (for irc chats), ip_masq_quake.o (you
   guessed it), ip_masq_vdolive.o (for VDOLive video connections),
@@ -2503,7 +2500,7 @@
   The module will be called ip_masq_markfw.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-IP: always defragment 
+IP: always defragment (required for masquerading)
 CONFIG_IP_ALWAYS_DEFRAG
   If you say Y here, then all incoming fragments (parts of IP packets
   that arose when some host between origin and destination decided
@@ -2511,18 +2508,13 @@
   reassembled (defragmented) before being processed, even if they are
   about to be forwarded.
 
-  This option is highly recommended if you have said Y to "IP:
-  masquerading" because that facility requires that second and further
-  fragments can be related to TCP or UDP port numbers, which are only
-  stored in the first fragment.
+  You must say Y here if you want to enable "IP: masquerading" or "IP:
+  transparent proxying".
 
   When using "IP: firewalling" support, you might also want to say Y
   here, to have a more reliable firewall (otherwise second and further
   fragments must be dealt with by the firewall, which can be tricky).
 
-  When using "IP: transparent proxying", this option is implicit,
-  although it is safe to say Y here.
-
   Only say Y here if running either a firewall that is the sole link
   to your network or a transparent proxy; never ever say Y here for a
   normal router or host.
@@ -3868,7 +3860,7 @@
 
 NCR53C8XX SCSI support
 CONFIG_SCSI_NCR53C8XX
-  This is the BSD ncr driver adapted to linux for the NCR53C8XX family
+  This is the BSD ncr driver adapted to Linux for the NCR53C8XX family
   of PCI-SCSI controllers. This driver supports parity checking,
   tagged command queuing and fast synchronous data transfers up to 80
   MB/s with wide FAST-40 LVD devices and controllers.
@@ -8328,6 +8320,16 @@
   ignored. Without this the Thinkpad 560 has troubles with the user
   level daemon apmd, and with the PCMCIA package pcmcia-cs.
 
+Ignore multiple suspend/resume cycles
+CONFIG_APM_IGNORE_SUSPEND_BOUNCE
+  This option is necessary on the Dell Inspiron 3200, but should be
+  safe for all other laptops. When enabled, a system suspend event
+  that occurs within one second of a resume is ignored. Without this
+  the Inspiron will shut itself off a few seconds after you open the
+  lid, requiring you to press the power button to resume it a second
+  time.
+  Say Y.
+
 Watchdog Timer Support 
 CONFIG_WATCHDOG
   If you say Y here (and to one of the following options) and create a
@@ -8490,13 +8492,14 @@
   The module will be called joystick.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Classic PC analog joysticks
+Classic PC analog joysticks and gamepads
 CONFIG_JOY_ANALOG
   Say Y here if you have an analog joystick or gamepad that connects
   to the PC gameport. This supports many different types, including
-  joysticks with throttle control, and with CHF / FCS / 6-button
-  extensions. For more information on how to use the driver please
-  read Documentation/joystick.txt
+  joysticks with throttle control, with rudders, or with extensions
+  like additional hats and buttons compatible with CH Flightstick Pro,
+  ThrustMaster FCS or 6 and 8 button gamepads. For more information on
+  how to use the driver please read Documentation/joystick.txt
 
 FPGaming and MadCatz A3D controllers
 CONFIG_JOY_ASSASIN
@@ -8504,25 +8507,26 @@
   MadCatz Panther XL. For more information on how to use the driver
   please read Documentation/joystick.txt
 
-Gravis GrIP gamepads
+Gravis GrIP joysticks and gamepads
 CONFIG_JOY_GRAVIS
-  Say Y here if you have a Gravis GamePad Pro. For more information
-  on how to use the driver please read Documentation/joystick.txt
+  Say Y here if you have a Gravis GamePad Pro, Gravis Xterminator or
+  Gravis Blackhawk Digital. For more information on how to use the
+  driver please read Documentation/joystick.txt
 
-PDPI Lightning L4 gamecards
+PDPI Lightning 4 gamecards
 CONFIG_JOY_LIGHTNING
-  Say Y here if you have a PDPI Lightning L4 gamecard and an analog
+  Say Y here if you have a PDPI Lightning 4 gamecard and an analog
   joystick or gamepad connected to it. For more information on how to
   use the driver please read Documentation/joystick.txt
 
-Logitech Digital joysticks
+Logitech Digital joysticks and gamepads
 CONFIG_JOY_LOGITECH
   Say Y here if you have a Logitech WingMan Extreme Digital,
   Logitech ThunderPad Digital or Logitech CyberMan 2. For more
   information on how to use the driver please read
   Documentation/joystick.txt
 
-Microsoft SideWinder, Genius Digital joysticks
+Microsoft SideWinder, Genius Digital joysticks and gamepads
 CONFIG_JOY_SIDEWINDER
   Say Y here if you have a Microsoft SideWinder 3d Pro, Microsoft
   SideWinder Precision Pro, Microsoft SideWinder Force Feedback Pro,
@@ -8530,34 +8534,35 @@
   more information on how to use the driver please read
   Documentation/joystick.txt
 
-ThrustMaster DirectConnect (BSP) joysticks
+ThrustMaster DirectConnect joysticks and gamepads
 CONFIG_JOY_THRUSTMASTER
-  Say Y here if you have a ThrustMaster Millenium 3D Inceptor,
-  ThrustMaster 3D Rage Pad, or ThrustMaster WCS III. For more
-  information on how to use the driver please read
-  Documentation/joystick.txt
+  Say Y here if you have a ThrustMaster Millenium 3D Inceptor or a
+  ThrustMaster 3D Rage Pad. For more information on how to use the
+  driver please read Documentation/joystick.txt
 
-NES, SNES, PSX, Multisystem gamepads
+NES, SNES, PSX, Multisystem joysticks and gamepads
 CONFIG_JOY_CONSOLE
   Say Y here if you have a Nintendo Entertainment System gamepad,
   Super Nintendo Entertainment System gamepad, Sony PlayStation
   gamepad or a Multisystem -- Atari, Amiga, Commodore, Amstrad CPC
   joystick. For more information on how to use the driver please read
-  Documentation/joystick.txt
+  Documentation/joystick.txt and Documentation/joystick-parport.txt
 
-Sega, Multisystem gamepads
+Sega, Multisystem joysticks and gamepads
 CONFIG_JOY_DB9
   Say Y here if you have a Sega Master System gamepad, Sega Genesis
   gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,
   Commodore, Amstrad CPC joystick. For more information on how to use
-  the driver please read Documentation/joystick.txt
+  the driver please read Documentation/joystick.txt and
+  Documentation/joystick-parport.txt
 
 TurboGraFX Multisystem joystick interface
 CONFIG_JOY_TURBOGRAFX
   Say Y here if you have the TurboGraFX interface by Steffen Schwenke,
   and want to use it with Multiststem -- Atari, Amiga, Commodore,
   Amstrad CPC joystick. For more information on how to use the driver
-  please read Documentation/joystick-parport.txt
+  please read Documentation/joystick-parport.txt and
+  Documentation/joystick-parport.txt
 
 Amiga joysticks
 CONFIG_JOY_AMIGA

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov