Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / Documentation / input / joystick-parport.txt

diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt
index 22f039d..56870c7 100644 (file)
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
@@ -2,7 +2,6 @@
               (c) 1998-2000 Vojtech Pavlik <vojtech@ucw.cz>
               (c) 1998 Andree Borrmann <a.borrmann@tu-bs.de>
                             Sponsored by SuSE
-       $Id: joystick-parport.txt,v 1.6 2001/09/25 09:31:32 vojtech Exp $
 ----------------------------------------------------------------------------
 
 0. Disclaimer
@@ -273,7 +272,7 @@ if you want to use gamecon.c.
 
   Also, the connection is a bit more complex. You'll need a bunch of diodes,
 and one pullup resistor. First, you connect the Directions and the button
-the same as for db9, however with the diodes inbetween.
+the same as for db9, however with the diodes between.
 
            Diodes
 (pin 2) -----|<|----> Up
@@ -456,8 +455,8 @@ uses the following kernel/module command line:
          8  | Sony PSX DDR controller
          9  | SNES mouse
 
-  The exact type of the PSX controller type is autoprobed when used so
-hot swapping should work (but is not recomended).
+  The exact type of the PSX controller type is autoprobed when used, so
+hot swapping should work (but is not recommended).
 
   Should you want to use more than one of parallel ports at once, you can use
 gamecon.map2 and gamecon.map3 as additional command line parameters for two