diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c globus_gass_transfer-3.4/library/globus_gass_transfer_client.c
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_client.c	2009-06-14 09:26:35.000000000 +0200
@@ -533,11 +533,6 @@
  *        The length of the data to append to the url, if known. If this
  *        parameter is set to @a GLOBUS_GASS_LENGTH_UNKNOWN, then the append
  *        may fail if the protocol does not support arbitrarily-length files.
- * @param callback
- *        Function to call once the URL has been accepted, referred, or
- *        denied by the server.
- * @param user_arg
- *        User-supplied argument to the callback function.
  *
  * @retval GLOBUS_SUCCESS
  *         The put was successfully initiated.
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h globus_gass_transfer-3.4/library/globus_gass_transfer.h
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer.h	2009-06-14 09:39:51.000000000 +0200
@@ -47,8 +47,8 @@
  * simple protocol-independent API.
  *
  * The GASS Transfer API provides a way to implement both
- * @link globus_gass_transfer_client client @endlink and
- * @link globus_gass_transfer_server server @endlink
+ * @link globus_gass_transfer_client client@endlink and
+ * @link globus_gass_transfer_server server@endlink
  * components. These share common data block and request management
  * functionality. Client-specific functions are provided to implement file
  * "get", "put", and "append" operations. Server-specific functions are
@@ -62,7 +62,7 @@
  * server-side support for the http and https protocols. 
  * An application which requires additional
  * protocol support may add this through the @link
- * globus_gass_transfer_protocol protocol module interface @endlink.
+ * globus_gass_transfer_protocol protocol module interface@endlink.
  *
  * The GASS Transfer API is defined in the header file
  * "globus_gass_transfer.h"
@@ -122,9 +122,9 @@
  * For server operations, the request is initialized by calling
  * globus_gass_transfer_accept().
  *
- * The functions in the @link globus_gass_transfer_request request section
- * @endlink of this manual describe the functions available for accessing
- * information from a request handle.
+ * The functions in the @link globus_gass_transfer_request request
+ * section@endlink of this manual describe the functions available for
+ * accessing information from a request handle.
  *
  * Each request handle should be destroyed by calling
  * globus_gass_transfer_request_destroy() once the user has completed
@@ -340,7 +340,7 @@
  * file transfers. The operations supported by the GASS Transfer API
  * are file get, put, and append. These operations are provided for
  * HTTP, and HTTPS file servers. The @link
- * globus_gass_transfer_protocol protocol module interface @endlink
+ * globus_gass_transfer_protocol protocol module interface@endlink
  * allows support for additional protocols to be added
  * easily.
  *
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c	2009-06-14 09:36:49.000000000 +0200
@@ -150,9 +150,9 @@
  * This function notifies the GASS Transfer Library that the protocol module
  * has decided that a new request can be accepted on this particular listener.
  * It must only be called after the GASS Transfer Library has called the
- * @link globus_gass_transfer_listener_proto_t::listen listen function @endlink
+ * @link globus_gass_transfer_listener_proto_s::listen listen function@endlink
  * in a @link #globus_gass_transfer_listener_proto_t protocol module-specific
- * listener structure.
+ * listener structure@endlink.
  *
  * @param listener
  *        The listener handle which is now ready for accepting a new
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h	2009-06-14 10:14:51.000000000 +0200
@@ -65,8 +65,8 @@
  * must be called after the #GLOBUS_GASS_TRANSFER_MODULE has already been
  * activated. Once registered, applications may use URLs of the scheme type
  * provided by the protocol module for the standard @link
- * globus_gass_transfer_client client @endlink or @link
- * globus_gass_transfer_server server @endlink operations.
+ * globus_gass_transfer_client client@endlink or @link
+ * globus_gass_transfer_server server@endlink operations.
  */
 
 #ifndef GLOBUS_GASS_INCLUDE_GLOBUS_GASS_PROTO_H
@@ -88,9 +88,17 @@
 EXTERN_C_BEGIN
 
 /* Module-specific types */
+/**
+ * Protocol module request handling structure.
+ * @ingroup globus_gass_transfer_protocol
+ * @see #globus_gass_transfer_request_proto_s */
 typedef struct globus_gass_transfer_request_proto_s
 globus_gass_transfer_request_proto_t;
 
+/**
+ * Protocol module listener handling structure.
+ * @ingroup globus_gass_transfer_protocol
+ * @see #globus_gass_transfer_listener_proto_s */
 typedef struct globus_gass_transfer_listener_proto_s
 globus_gass_transfer_listener_proto_t;
 
@@ -223,7 +231,7 @@
  *        A protocol-specific attribute set, created by calling the
  *        protocol module's
  *        @link globus_gass_transfer_proto_descriptor_t::new_requestattr
- *        new_requestattr function pointer @endlink.
+ *        new_requestattr function pointer@endlink.
  */
 typedef void
 (* globus_gass_transfer_proto_new_request_t)(
@@ -246,7 +254,7 @@
  *        A protocol-specific attribute set, created by calling the
  *        protocol module's
  *        @link globus_gass_transfer_proto_descriptor_t::new_listenerattr
- *        new_listenerattr function pointer @endlink.
+ *        new_listenerattr function pointer@endlink.
  * @param scheme
  *        The URL scheme that the server has requested for the new listener.
  *        This will be one the scheme associated with a particular
@@ -368,16 +376,16 @@
     globus_gass_transfer_requestattr_t *	attr);
 
 /**
- * @struct globus_gass_transfer_request_proto_t
+ * @struct globus_gass_transfer_request_proto_s
  * Protocol module request handling structure.
  * @ingroup globus_gass_transfer_protocol
  *
  * This structure is created by a GASS transfer protocol module to
  * handle a particular request. It is created in response to a
- * @link globus_gass_transfer_listener_proto_t::accept
- * listener's accept method @endlink or a @link
+ * @link globus_gass_transfer_listener_proto_s::accept
+ * listener's accept method@endlink or a @link
  * globus_gass_transfer_proto_descriptor_t::new_request
- * protocol module's new_request method @endlink.
+ * protocol module's new_request method@endlink.
  *
  * Memory management of this structure is the responsibility of the protocol
  * module. The destroy method will be called when the GASS Transfer library
@@ -431,7 +439,7 @@
 };
 
 /**
- * @struct globus_gass_transfer_listener_proto_t
+ * @struct globus_gass_transfer_listener_proto_s
  * Protocol module listener handling structure.
  * @ingroup globus_gass_transfer_protocol
  */
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c globus_gass_transfer-3.4/library/globus_gass_transfer_request.c
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_request.c	2009-06-14 09:38:41.000000000 +0200
@@ -41,7 +41,7 @@
  * @param request
  *        The request to query.
  *
- * @return The @link #globus_gass_transfer_request_type_t type @endlink
+ * @return The @link #globus_gass_transfer_request_type_t type@endlink
  * of the request.
  */
 globus_gass_transfer_request_type_t
@@ -627,9 +627,9 @@
  *
  * @param request
  *        The request to destroy.
- * @param GLOBUS_SUCCESS
+ * @retval GLOBUS_SUCCESS
  *        The request handle reference was successfully destroyed.
- * @param GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
+ * @retval GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
  *        Either an invalid request handle or one which is actively being
  *        used was passed to this function as the @a request parameter.
  */
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c globus_gass_transfer-3.4/library/globus_gass_transfer_server.c
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c	2006-01-19 06:54:50.000000000 +0100
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_server.c	2009-06-14 09:26:35.000000000 +0200
@@ -302,6 +302,8 @@
  * @param request
  *        A pointer to a new request handle. This request handle will
  *        be initialized when the callback function is invoked.
+ * @param attr
+ *        Request attributes.
  * @param listener
  *        The listener handle to register for the new request.
  * @param callback