Merge with Linux 2.4.0-test6-pre1.

1 files changed, 3 insertions, 3 deletions

diff --git a/Documentation/joystick-api.txt b/Documentation/joystick-api.txt
index b3a0c20c7..763a5c4ff 100644
--- a/Documentation/joystick-api.txt
+++ b/Documentation/joystick-api.txt
@@ -29,13 +29,13 @@ By default, the device is opened in blocking mode.
 where js_event is defined as
 
 	struct js_event {
-		__u32 time;     /* event timestamp in miliseconds */
+		__u32 time;     /* event timestamp in milliseconds */
 		__s16 value;    /* value */
 		__u8 type;      /* event type */
 		__u8 number;    /* axis/button number */
 	};
 
-If the read is successfull, it will return sizeof(struct js_event), unless
+If the read is successful, it will return sizeof(struct js_event), unless
 you wanted to read more than one event per read as described in section 3.1.
 
 
@@ -225,7 +225,7 @@ JS_VERSION symbol
 ~~~~~~~~~~~~~~
 
 JSIOCGNAME(len) allows you to get the name string of the joystick - the same
-as is being printed at boot time. The 'len' argument is the lenght of the
+as is being printed at boot time. The 'len' argument is the length of the
 buffer provided by the application asking for the name. It is used to avoid
 possible overrun should the name be too long.