diff -ur globus_gss_assist-4.0.orig/accept.c globus_gss_assist-4.0/accept.c
--- globus_gss_assist-4.0.orig/accept.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/accept.c	2008-10-17 19:06:48.000000000 +0200
@@ -45,13 +45,11 @@
  * and token processing, using the supplied get_token and
  * send_token routines. 
  *
- * @param token_status
- *        assist routine get/send token status
  * @param minor_status
  *        gssapi return code
  * @param context_handle
  *        pointer to returned context. 
- * @param initiator_cred_handle
+ * @param cred_handle
  *        the cred handle obtained by acquire_cred.
  * @param src_name_char
  *        Pointer to char string repersentation of the
@@ -68,9 +66,16 @@
  *        (Follwing are particular to this assist routine)
  * @param token_status
  *        assist routine get/send token status
+ * @param delegated_cred_handle
+ *        pointer to be set to the credential delegated by the client if
+ *        delegation occurs during the security handshake
+ * @param gss_assist_get_token
  *        a get token routine 
+ * @param gss_assist_get_context
  *        first arg for the get token routine 
+ * @param gss_assist_send_token
  *        a send token routine 
+ * @param gss_assist_send_context
  *        first arg for the send token routine
  * @return
  *        GSS_S_COMPLETE on sucess
@@ -276,13 +281,11 @@
  * itself it passes in and out the read and written buffers and
  * the calling application is responsible for doing the I/O directly.
  *
- * @param token_status
- *        assist routine get/send token status
  * @param minor_status
  *        gssapi return code
  * @param context_handle
  *        pointer to returned context. 
- * @param initiator_cred_handle
+ * @param cred_handle
  *        the cred handle obtained by acquire_cred.
  * @param src_name_char
  *        Pointer to char string repersentation of the
@@ -293,11 +296,9 @@
  *        the connection is established. Maybe NULL if not wanted. 
  *        We will also use this to pass in flags to the globus
  *        version of gssapi_ssleay
- *
  * @param user_to_user_flag
  *        Pointer to flag to be set if
  *        the src_name is the same as our name. 
- *
  * @param input_buffer
  *        pointer to a buffer received from peer.
  * @param input_buffer_len
@@ -308,11 +309,13 @@
  *        non-NULL the contents of this block should be written
  *        to the peer where they will be fed into the
  *        gss_assist_init_sec_context_async() function.
- *
  * @param output_buffer_lenp
  *        pointer to an integer which will be filled
  *        in with the length of the allocated output buffer
  *        pointed to by *output_bufferp.
+ * @param delegated_cred_handle
+ *        pointer to be set to the credential delegated by the client if
+ *        delegation occurs during the security handshake
  *
  * @return
  *        GSS_S_COMPLETE on successful completion when this function does not
diff -ur globus_gss_assist-4.0.orig/display.c globus_gss_assist-4.0/display.c
--- globus_gss_assist-4.0.orig/display.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/display.c	2008-10-17 19:06:48.000000000 +0200
@@ -45,7 +45,7 @@
  * @param msg
  *        char * (may not be null terminated) to first string or null
  * @param msglen
- *        length of msgring or null
+ *        length of msg
  * @param post
  *        char * to last string or null
  *
@@ -125,6 +125,8 @@
  *        The major status to display
  * @param minor_status
  *        The minor status to display
+ * @param token_status
+ *        token status to display
  * @return 
  *        0
  */
@@ -175,7 +177,8 @@
  *        The major status to display
  * @param minor_status
  *        The minor status to display
- *
+ * @param token_status
+ *        token status to display
  * @return
  *        0
  */
diff -ur globus_gss_assist-4.0.orig/export_sec_context.c globus_gss_assist-4.0/export_sec_context.c
--- globus_gss_assist-4.0.orig/export_sec_context.c	2006-01-19 06:56:01.000000000 +0100
+++ globus_gss_assist-4.0/export_sec_context.c	2008-10-17 19:06:48.000000000 +0200
@@ -29,14 +29,6 @@
 #include "gssapi.h"
 #include <stdio.h>
 
-/**
- * @anchor globus_gsi_gss_assist
- * @mainpage Globus GSI GSS Assist
- *
- * The GSS Assist code provides convenience functions
- * for using the Globus GSS-API.
- */
-
 /* @name Export Security Context
  * @ingroup globus_gsi_gss_assist
  */
diff -ur globus_gss_assist-4.0.orig/init.c globus_gss_assist-4.0/init.c
--- globus_gss_assist-4.0.orig/init.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/init.c	2008-10-17 19:06:48.000000000 +0200
@@ -49,7 +49,7 @@
  *        globus error object ID that can be passed to globus_error_get
  *        to get the error object.  The error object needs to be freed
  *        with globus_object_free.
- * @param initiator_cred_handle
+ * @param cred_handle
  *        the cred handle obtained by acquire_cred.
  * @param context_handle
  *        pointer to returned context. 
@@ -72,9 +72,9 @@
  * @param gss_assist_get_context
  *        first argument passed to the 
  *        gss_assist_get_token function
- * @param gss_assist_set_token
+ * @param gss_assist_send_token
  *        function pointer for setting the token
- * @param gss_assist_set_context
+ * @param gss_assist_send_context
  *        first argument passed to the 
  *        gss_assist_set_token function pointer
  *
@@ -306,7 +306,7 @@
  *        can be obtained via globus_error_get and should be destroyed
  *        with globus_object_free when no longer needed.  If no error
  *        occurred, the minor status is equal to GLOBUS_SUCCESS.
- * @param initiator_cred_handle
+ * @param cred_handle
  *        the cred handle obtained by acquire_cred.
  * @param context_handle
  *        pointer to returned context. 
diff -ur globus_gss_assist-4.0.orig/tokens_n.c globus_gss_assist-4.0/tokens_n.c
--- globus_gss_assist-4.0.orig/tokens_n.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/tokens_n.c	2008-10-17 19:06:48.000000000 +0200
@@ -51,7 +51,8 @@
  *        the globus_io_handle_t to get the token from
  * @param bufp
  *        the buffer to read the token into
- * @param the size of what gets read
+ * @param sizep
+ *        the size of what gets read
  *
  * @return 
  *        0 on success
diff -ur globus_gss_assist-4.0.orig/unwrap.c globus_gss_assist-4.0/unwrap.c
--- globus_gss_assist-4.0.orig/unwrap.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/unwrap.c	2008-10-17 19:06:48.000000000 +0200
@@ -43,9 +43,11 @@
  *        GSSAPI return code, @see gss_unwrap
  * @param context_handle
  *        the context 
- * @param conf_req_flag
- * @param qop_req
- * @param input_message_buffer
+ * @param data
+ *        pointer to be set to the unwrapped application data. This must be
+ *        freed by the caller.
+ * @param length
+ *        pointer to be set to the length of the @a data byte array.
  * @param token_status
  *        assist routine get/send token status 
  * @param gss_assist_get_token
diff -ur globus_gss_assist-4.0.orig/wrap.c globus_gss_assist-4.0/wrap.c
--- globus_gss_assist-4.0.orig/wrap.c	2007-08-09 16:24:23.000000000 +0200
+++ globus_gss_assist-4.0/wrap.c	2008-10-17 19:06:48.000000000 +0200
@@ -39,14 +39,14 @@
  *        GSSAPI return code.  If the call was successful, the minor 
  *        status is equal to GLOBUS_SUCCESS.  Otherwise, it is an
  *        error object ID for which  
- *        @ref globus_error_get and @ref globus_object free
+ *        globus_error_get() and globus_object_free()
  *        can be used to get and destroy it.
  * @param context_handle
  *        the context. 
- * @param conf_req_flag
- * @param qop_req
- * @param input_message_buffer
- *
+ * @param data
+ *        pointer to application data to wrap and send
+ * @param length
+ *        length of the @a data array
  * @param token_status
  *        assist routine get/send token status 
  * @param gss_assist_send_token
@@ -54,6 +54,7 @@
  * @param gss_assist_send_context
  *        first arg for the send_token
  * @param fperr
+ *        file handle to write error message to.
  *
  * @return
  *        GSS_S_COMPLETE on sucess