*** empty log message ***

3 files changed, 16 insertions, 10 deletions

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index faa27e884a..166d5fc207 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -258,8 +258,10 @@ int gnutls_certificate_type_set_priority(gnutls_session session,
   * The order is TLS1, SSL3 for protocols.
   * GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA for key exchange algorithms.
   * GNUTLS_MAC_SHA, GNUTLS_MAC_MD5 for MAC algorithms.
-  * GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
-  * and GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128 for ciphers.
+  * GNUTLS_CIPHER_RIJNDAEL_256_CBC, 
+  * GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
+  * and GNUTLS_CIPHER_3DES_CBC, 
+  * GNUTLS_CIPHER_ARCFOUR_128 for ciphers.
   *
   **/
 int gnutls_set_default_priority(gnutls_session session)
@@ -296,8 +298,8 @@ int gnutls_set_default_priority(gnutls_session session)
   * GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA_EXPORT for key exchange algorithms.
   * GNUTLS_MAC_SHA, GNUTLS_MAC_MD5 for MAC algorithms,
   * GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
-  * and GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_ARCFOUR_40
-  * for ciphers.
+  * and GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 
+  * GNUTLS_CIPHER_ARCFOUR_40 for ciphers.
   *
   **/
 int gnutls_set_default_export_priority(gnutls_session session)
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index e74db7b469..92fd6e4801 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -128,8 +128,8 @@ gnutls_transport_ptr gnutls_transport_get_ptr(gnutls_session session) {
   * @recv_ptr: will hold the value for the pull function
   * @send_ptr: will hold the value for the push function
   *
-  * Used to get the first argument of the transport function (like PUSH and
-  * PULL). This must have been set using gnutls_transport_set_ptr().
+  * Used to get the arguments of the transport functions (like PUSH and
+  * PULL). These should have been set using gnutls_transport_set_ptr2().
   *
   **/
 void gnutls_transport_get_ptr2(gnutls_session session,
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c
index d1d08735cf..a3a2eb0266 100644
--- a/lib/gnutls_session.c
+++ b/lib/gnutls_session.c
@@ -31,8 +31,8 @@
   * @session_data: is a pointer to space to hold the session.
   * @session_data_size: is the session_data's size, or it will be set by the function.
   *
-  * Returns all session parameters - in order to support resuming.
-  * The client should call this - and keep the returned session - if he wants to
+  * Returns all session parameters, in order to support resuming.
+  * The client should call this, and keep the returned session, if he wants to
   * resume that current version later by calling gnutls_session_set_data()
   * This function must be called after a successful handshake.
   *
@@ -100,12 +100,16 @@ int gnutls_session_get_id( gnutls_session session, void* session_id, int *sessio
   * @session_data: is a pointer to space to hold the session.
   * @session_data_size: is the session's size
   *
-  * Sets all session parameters - in order to support resuming
-  * session must be the one returned by gnutls_session_get_data();
+  * Sets all session parameters, in order to resume a previously established
+  * session. The session data given must be the one returned by gnutls_session_get_data().
   * This function should be called before gnutls_handshake().
+  *
   * Keep in mind that session resuming is advisory. The server may
   * choose not to resume the session, thus a full handshake will be
   * performed.
+  *
+  * Returns a negative value on error.
+  *
   **/
 int gnutls_session_set_data( gnutls_session session, const opaque* session_data, 
 	int session_data_size)