Index: java/org/apache/tomcat/jni/Local.java
===================================================================
--- java/org/apache/tomcat/jni/Local.java	(revision 815768)
+++ java/org/apache/tomcat/jni/Local.java	(working copy)
@@ -56,7 +56,6 @@
     /**
      * Accept a new connection request
      * @param sock The socket we are listening on.
-     * @param pool The pool for the new socket.
      * @return  A copy of the socket that is connected to the socket that
      *          made the connection request.  This is the socket which should
      *          be used for all future communication.
Index: java/org/apache/tomcat/jni/Poll.java
===================================================================
--- java/org/apache/tomcat/jni/Poll.java	(revision 815768)
+++ java/org/apache/tomcat/jni/Poll.java	(working copy)
@@ -79,7 +79,6 @@
      * descriptor is signalled in apr_pollset_poll().
      * @param pollset The pollset to which to add the descriptor
      * @param sock The sockets to add
-     * @param data Client data to add
      * @param reqevents requested events
      */
     public static native int add(long pollset, long sock,
Index: java/org/apache/tomcat/jni/Registry.java
===================================================================
--- java/org/apache/tomcat/jni/Registry.java	(revision 815768)
+++ java/org/apache/tomcat/jni/Registry.java	(working copy)
@@ -56,7 +56,8 @@
      * Create or open a Registry Key.
      * @param name Registry Subkey to open
      * @param root Root key, one of HKEY_*
-     * @param som Access mask that specifies the access rights for the key.
+     * @param sam Access mask that specifies the access rights for the key.
+     * @param pool TBA
      * @return Opened Registry key
      */
     public static native long create(int root, String name, int sam, long pool)
@@ -66,7 +67,8 @@
      * Opens the specified Registry Key.
      * @param name Registry Subkey to open
      * @param root Root key, one of HKEY_*
-     * @param som Access mask that specifies the access rights for the key.
+     * @param sam Access mask that specifies the access rights for the key.
+     * @param pool TBA
      * @return Opened Registry key
      */
     public static native long open(int root, String name, int sam, long pool)
@@ -197,7 +199,6 @@
     /**
      * Enumerate the Registry subkeys
      * @param key The Registry key descriptor to use.
-     * @param name The name of the value to query
      * @return Array of all subkey names
      */
     public static native String[] enumKeys(long key)
@@ -206,7 +207,6 @@
     /**
      * Enumerate the Registry values
      * @param key The Registry key descriptor to use.
-     * @param name The name of the value to query
      * @return Array of all value names
      */
     public static native String[] enumValues(long key)
Index: java/org/apache/tomcat/jni/Socket.java
===================================================================
--- java/org/apache/tomcat/jni/Socket.java	(revision 815768)
+++ java/org/apache/tomcat/jni/Socket.java	(working copy)
@@ -554,7 +554,7 @@
      * Set internal send ByteBuffer.
      * This function will preset internal Java ByteBuffer for
      * consecutive sendbb calls.
-     * @param thesocket The socket to use
+     * @param sock The socket to use
      * @param buf The ByteBuffer
      */
     public static native void setsbb(long sock, ByteBuffer buf);
@@ -563,7 +563,7 @@
      * Set internal receive ByteBuffer.
      * This function will preset internal Java ByteBuffer for
      * consecutive revcvbb/recvbbt calls.
-     * @param thesocket The socket to use
+     * @param sock The socket to use
      * @param buf The ByteBuffer
      */
     public static native void setrbb(long sock, ByteBuffer buf);
@@ -573,13 +573,11 @@
      * @param sock The currently open socket.
      * @param data The user data to associate with the socket.
      * @param key The key to associate with the data.
-     * @param cleanup The cleanup to call when the socket is destroyed.
      */
       public static native int dataSet(long sock, String key, Object data);
 
     /**
      * Return the data associated with the current socket
-     * @param data The user data associated with the socket.
      * @param key The key to associate with the user data.
      * @param sock The currently open socket.
      * @return Data or null in case of error.