Doc fixes.

Suggested by Peter Hendrickson <pdh@wiredyne.com>.

35 files changed, 108 insertions, 110 deletions

diff --git a/doc/examples/ex-serv-anon.c b/doc/examples/ex-serv-anon.c
index 155cbe480f..722d1fc07a 100644
--- a/doc/examples/ex-serv-anon.c
+++ b/doc/examples/ex-serv-anon.c
@@ -50,7 +50,7 @@ static int
 generate_dh_params (void)
 {
 
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/doc/examples/ex-serv-export.c b/doc/examples/ex-serv-export.c
index 236ab0da66..d3d33a6e1d 100644
--- a/doc/examples/ex-serv-export.c
+++ b/doc/examples/ex-serv-export.c
@@ -91,7 +91,7 @@ static int
 generate_dh_params (void)
 {
   gnutls_datum_t dparams = { srp_dh_group2048, sizeof (srp_dh_group2048) };
-  /* Here instead of generating Diffie Hellman parameters (for use with DHE
+  /* Here instead of generating Diffie-Hellman parameters (for use with DHE
    * kx algorithms) we import them.
    */
   gnutls_dh_params_init (&dh_params);
diff --git a/doc/examples/ex-serv-pgp.c b/doc/examples/ex-serv-pgp.c
index 1e0124f0be..e9070565f9 100644
--- a/doc/examples/ex-serv-pgp.c
+++ b/doc/examples/ex-serv-pgp.c
@@ -38,7 +38,7 @@ static int
 generate_dh_params (void)
 {
 
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/doc/examples/ex-serv-psk.c b/doc/examples/ex-serv-psk.c
index 0082414512..6e5d77a837 100644
--- a/doc/examples/ex-serv-psk.c
+++ b/doc/examples/ex-serv-psk.c
@@ -62,7 +62,7 @@ static int
 generate_dh_params (void)
 {
 
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. When short bit length is used, it might
    * be wise to regenerate parameters.
    *
diff --git a/doc/examples/ex-serv1.c b/doc/examples/ex-serv1.c
index 06a76fbaed..0a47cc140a 100644
--- a/doc/examples/ex-serv1.c
+++ b/doc/examples/ex-serv1.c
@@ -64,7 +64,7 @@ static int
 generate_dh_params (void)
 {
 
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. When short bit length is used, it might
    * be wise to regenerate parameters.
    *
diff --git a/doc/examples/ex-session-info.c b/doc/examples/ex-session-info.c
index 146d81a092..f247629503 100644
--- a/doc/examples/ex-session-info.c
+++ b/doc/examples/ex-session-info.c
@@ -66,7 +66,7 @@ print_info (gnutls_session_t session)
 
     case GNUTLS_CRD_CERTIFICATE:	/* certificate authentication */
 
-      /* Check if we have been using ephemeral Diffie Hellman.
+      /* Check if we have been using ephemeral Diffie-Hellman.
        */
       if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS)
 	{
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 383265d318..d697b2023d 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -435,7 +435,7 @@ finished using @acronym{GnuTLS}.
 The credentials structure is used by some authentication methods, such
 as certificate authentication (@pxref{Certificate Authentication}).  A
 credentials structure may contain certificates, private keys,
-temporary parameters for diffie hellman or RSA key exchange, and other
+temporary parameters for Diffie-Hellman or RSA key exchange, and other
 stuff that may be shared between several TLS sessions.
 
 This structure should be initialized using the appropriate
@@ -1013,7 +1013,7 @@ In TLS, since a lot of algorithms are involved, it is not easy to set a consiste
 For this reason this section will present some correspondance between key sizes of symmetric algorithms
 and public key algorithms based on the most conservative values of @xcite{SELKEY}. 
 Those can be used to generate certificates with appropriate key sizes as well
-as parameters for Diffie Hellman and SRP authentication.
+as parameters for Diffie-Hellman and SRP authentication.
 
 @multitable @columnfractions .15 .20 .20 .20
 
@@ -1365,15 +1365,15 @@ In the EXPORT algorithm, the server signs temporary RSA parameters of
 512 bits --- which are considered weak --- and sends them to the client.
 
 @item DHE_RSA:
-The RSA algorithm is used to sign Ephemeral Diffie Hellman parameters
+The RSA algorithm is used to sign Ephemeral Diffie-Hellman parameters
 which are sent to the peer. The key in the certificate must allow the
 key to be used for signing. Note that key exchange algorithms which
-use Ephemeral Diffie Hellman parameters, offer perfect forward
+use Ephemeral Diffie-Hellman parameters, offer perfect forward
 secrecy. That means that even if the private key used for signing is
 compromised, it cannot be used to reveal past session data.
 
 @item DHE_DSS:
-The DSS algorithm is used to sign Ephemeral Diffie Hellman parameters
+The DSS algorithm is used to sign Ephemeral Diffie-Hellman parameters
 which are sent to the peer. The certificate must contain DSA
 parameters to use this key exchange algorithm. DSS stands for Digital
 Signature Standard.
@@ -1393,7 +1393,7 @@ do not use anonymous authentication.  Available key exchange methods
 are shown below.
 
 Note that the key exchange methods for anonymous authentication
-require Diffie Hellman parameters to be generated by the server and associated with
+require Diffie-Hellman parameters to be generated by the server and associated with
 an anonymous credentials structure.
 
 Supported anonymous key exchange algorithms:
@@ -1401,7 +1401,7 @@ Supported anonymous key exchange algorithms:
 @table @code
 
 @item ANON_DH:
-This algorithm exchanges Diffie Hellman parameters.
+This algorithm exchanges Diffie-Hellman parameters.
 
 @end table
 
@@ -1509,7 +1509,7 @@ The implementation in @acronym{GnuTLS} is based on paper
 Authentication using the @acronym{PSK} protocol.
 
 @item DHE-PSK:
-Authentication using the @acronym{PSK} protocol and Diffie Hellman key exchange.
+Authentication using the @acronym{PSK} protocol and Diffie-Hellman key exchange.
 This method offers perfect forward secrecy.
 
 @end table
@@ -2747,7 +2747,7 @@ Usage: certtool [options]
                               The last certificate in the chain must
                               be a self signed one.
      --verify-crl             Verify a CRL.
-     --generate-dh-params     Generate PKCS #3 encoded Diffie Hellman
+     --generate-dh-params     Generate PKCS #3 encoded Diffie-Hellman
                               parameters.
      --get-dh-params          Get the included PKCS #3 encoded Diffie
                               Hellman parameters.
@@ -2800,7 +2800,7 @@ How to use certtool interactively:
 
 @itemize
 @item
-To generate parameters for Diffie Hellman key exchange, use the command:
+To generate parameters for Diffie-Hellman key exchange, use the command:
 @example
 $ certtool --generate-dh-params --outfile dh.pem
 @end example
@@ -3189,9 +3189,9 @@ Checking whether the server supports session resumption... yes
 Checking for export-grade ciphersuite support... no
 Checking RSA-export ciphersuite info... N/A
 Checking for anonymous authentication support... no
-Checking anonymous Diffie Hellman group info... N/A
-Checking for ephemeral Diffie Hellman support... no
-Checking ephemeral Diffie Hellman group info... N/A
+Checking anonymous Diffie-Hellman group info... N/A
+Checking for ephemeral Diffie-Hellman support... no
+Checking ephemeral Diffie-Hellman group info... N/A
 Checking for AES cipher support (TLS extension)... yes
 Checking for 3DES cipher support... yes
 Checking for ARCFOUR 128 cipher support... yes
@@ -3216,7 +3216,7 @@ GNU TLS test server
 Usage: gnutls-serv [options]
 
      -d, --debug integer      Enable debugging
-     -g, --generate           Generate Diffie Hellman Parameters.
+     -g, --generate           Generate Diffie-Hellman Parameters.
      -p, --port integer       The port to connect to.
      -q, --quiet              Suppress some messages.
      --nodb                   Does not use the resume database.
@@ -3467,7 +3467,7 @@ disable DHE-PSK.
 
 @smallexample
 $ ./gnutls-serv --pskpasswd psks.txt  --pskhint psk_identity_hint --priority NORMAL:-DHE-PSK
-Set static Diffie Hellman parameters, consider --dhparams.
+Set static Diffie-Hellman parameters, consider --dhparams.
 Echo Server ready. Listening to port '5556'.
 @end smallexample
 
diff --git a/doc/manpages/certtool.1 b/doc/manpages/certtool.1
index 0ccc2a35b1..f581a274ee 100644
--- a/doc/manpages/certtool.1
+++ b/doc/manpages/certtool.1
@@ -38,7 +38,7 @@ Generate a signed certificate.
 .IP "\-e, \-\-verify\-chain"
 Verify a PEM encoded certificate chain.  The last certificate in the chain must be a self signed one.
 .IP "\-\-generate\-dh\-params"
-Generate PKCS #3 encoded Diffie Hellman parameters.
+Generate PKCS #3 encoded Diffie-Hellman parameters.
 .IP "\-\-load\-ca\-certificate FILE"
 Certificate authority's certificate file to use.
 .IP "\-\-load\-ca\-privkey FILE"
diff --git a/doc/manpages/gnutls-serv.1 b/doc/manpages/gnutls-serv.1
index 02502e5620..5766838e55 100644
--- a/doc/manpages/gnutls-serv.1
+++ b/doc/manpages/gnutls-serv.1
@@ -91,7 +91,7 @@ algorithms don't need a prefix.
 "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL"
 
 .IP "\-g, \-\-generate"
-Generate Diffie Hellman Parameters.
+Generate Diffie-Hellman Parameters.
 .IP "\-\-kx \fIkx1 kx2...\fR"
 Key exchange methods to enable (use \fBgnutls\-cli \-\-list\fR to show
 the supported key exchange methods).
diff --git a/lib/auth_anon.c b/lib/auth_anon.c
index 04d829ed96..cf4bd4fb1d 100644
--- a/lib/auth_anon.c
+++ b/lib/auth_anon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,7 +22,7 @@
  *
  */
 
-/* This file contains the Anonymous Diffie Hellman key exchange part of
+/* This file contains the Anonymous Diffie-Hellman key exchange part of
  * the anonymous authentication. The functions here are used in the
  * handshake.
  */
diff --git a/lib/auth_dh_common.c b/lib/auth_dh_common.c
index 3c951dcd65..0e4b3ce442 100644
--- a/lib/auth_dh_common.c
+++ b/lib/auth_dh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,9 +22,9 @@
  *
  */
 
-/* This file contains common stuff in Ephemeral Diffie Hellman (DHE) and
- * Anonymous DH key exchange(DHA). These are used in the handshake procedure 
- * of the certificate and anoymous authentication.
+/* This file contains common stuff in Ephemeral Diffie-Hellman (DHE)
+ * and Anonymous DH key exchange(DHA). These are used in the handshake
+ * procedure of the certificate and anoymous authentication.
  */
 
 #include "gnutls_int.h"
diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index 7e19ae2034..ec595eeb99 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,9 +22,9 @@
  *
  */
 
-/* This file contains everything for the Ephemeral Diffie Hellman (DHE)
- * key exchange. This is used in the handshake procedure of the certificate
- * authentication.
+/* This file contains everything for the Ephemeral Diffie-Hellman
+ * (DHE) key exchange.  This is used in the handshake procedure of the
+ * certificate authentication.
  */
 
 #include "gnutls_int.h"
diff --git a/lib/auth_dhe_psk.c b/lib/auth_dhe_psk.c
index 040f6ccc07..386d5fb9b6 100644
--- a/lib/auth_dhe_psk.c
+++ b/lib/auth_dhe_psk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,9 +22,8 @@
  *
  */
 
-/* This file contains the PSK Diffie Hellman key exchange part of
- * the PSK authentication. The functions here are used in the
- * handshake.
+/* This file contains the PSK Diffie-Hellman key exchange part of the
+ * PSK authentication.  The functions here are used in the handshake.
  */
 
 #include <gnutls_int.h>
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c
index 575ce5b629..9b88a6a9b0 100644
--- a/lib/gnutls_anon_cred.c
+++ b/lib/gnutls_anon_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -106,11 +106,11 @@ gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t *
 /**
   * gnutls_anon_set_server_dh_params - set the DH parameters for a server to use
   * @res: is a gnutls_anon_server_credentials_t structure
-  * @dh_params: is a structure that holds diffie hellman parameters.
+  * @dh_params: is a structure that holds Diffie-Hellman parameters.
   *
-  * This function will set the diffie hellman parameters for an
+  * This function will set the Diffie-Hellman parameters for an
   * anonymous server to use.  These parameters will be used in
-  * Anonymous Diffie Hellman cipher suites.
+  * Anonymous Diffie-Hellman cipher suites.
   **/
 void
 gnutls_anon_set_server_dh_params (gnutls_anon_server_credentials_t res,
@@ -125,7 +125,7 @@ gnutls_anon_set_server_dh_params (gnutls_anon_server_credentials_t res,
   * @func: is the function to be called
   *
   * This function will set a callback in order for the server to get
-  * the diffie hellman parameters for anonymous authentication.  The
+  * the Diffie-Hellman parameters for anonymous authentication.  The
   * callback should return zero on success.
   **/
 void
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 0c1960cf3a..50d8fceb97 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -67,7 +67,7 @@ static const gnutls_error_entry error_algorithms[] = {
   ERROR_ENTRY (N_("A record packet with illegal version was received."),
 	       GNUTLS_E_UNSUPPORTED_VERSION_PACKET, 1),
   ERROR_ENTRY (N_
-	       ("The Diffie Hellman prime sent by the server is not acceptable (not long enough)."),
+	       ("The Diffie-Hellman prime sent by the server is not acceptable (not long enough)."),
 	       GNUTLS_E_DH_PRIME_UNACCEPTABLE, 1),
   ERROR_ENTRY (N_("A TLS packet with unexpected length was received."),
 	       GNUTLS_E_UNEXPECTED_PACKET_LENGTH, 1),
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index aeeea68f37..f91a4b6a84 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -2767,7 +2767,7 @@ check_server_params (gnutls_session_t session,
 
   cred_type = _gnutls_map_kx_get_cred (kx, 1);
 
-  /* Read the Diffie Hellman parameters, if any.
+  /* Read the Diffie-Hellman parameters, if any.
    */
   if (cred_type == GNUTLS_CRD_CERTIFICATE)
     {
diff --git a/lib/gnutls_psk.c b/lib/gnutls_psk.c
index f0a49dda72..6f80062778 100644
--- a/lib/gnutls_psk.c
+++ b/lib/gnutls_psk.c
@@ -424,11 +424,11 @@ size_t res = data->size + data->size + 1;
 /**
   * gnutls_psk_set_server_dh_params - set the DH parameters for a server to use
   * @res: is a gnutls_psk_server_credentials_t structure
-  * @dh_params: is a structure that holds diffie hellman parameters.
+  * @dh_params: is a structure that holds Diffie-Hellman parameters.
   *
-  * This function will set the diffie hellman parameters for an
-  * anonymous server to use. These parameters will be used in Diffie
-  * Hellman with PSK cipher suites.
+  * This function will set the Diffie-Hellman parameters for an
+  * anonymous server to use. These parameters will be used in
+  * Diffie-Hellman exchange with PSK cipher suites.
   **/
 void
 gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
@@ -443,7 +443,7 @@ gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
  * @func: is the function to be called
  *
  * This function will set a callback in order for the server to get
- * the diffie hellman parameters for PSK authentication. The callback
+ * the Diffie-Hellman parameters for PSK authentication.  The callback
  * should return zero on success.
  **/
 void
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 2b36235858..67ff3569d6 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1105,8 +1105,8 @@ begin:
   * @data: contains the data to send
   * @sizeofdata: is the length of the data
   *
-  * This function has the similar semantics with send(). The only
-  * difference is that is accepts a GNUTLS session, and uses different
+  * This function has the similar semantics with send().  The only
+  * difference is that it accepts a GnuTLS session, and uses different
   * error codes.
   *
   * Note that if the send buffer is full, send() will block this
@@ -1141,15 +1141,15 @@ gnutls_record_send (gnutls_session_t session, const void *data,
   * @data: the buffer that the data will be read into
   * @sizeofdata: the number of requested bytes
   *
-  * This function has the similar semantics with recv(). The only
-  * difference is that is accepts a GNUTLS session, and uses different
+  * This function has the similar semantics with recv().  The only
+  * difference is that it accepts a GnuTLS session, and uses different
   * error codes.
   *
   * In the special case that a server requests a renegotiation, the
   * client may receive an error code of %GNUTLS_E_REHANDSHAKE.  This
-  * message may be simply ignored, replied with an alert containing
-  * NO_RENEGOTIATION, or replied with a new handshake, depending on
-  * the client's will.
+  * message may be simply ignored, replied with an alert
+  * %GNUTLS_A_NO_RENEGOTIATION, or replied with a new handshake,
+  * depending on the client's will.
   *
   * If %EINTR is returned by the internal push function (the default
   * is recv()) then %GNUTLS_E_INTERRUPTED will be returned.  If
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index c5d45af4ec..bd30a7e698 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -43,7 +43,7 @@
  * @session: is a #gnutls_session_t structure.
  * @bits: is the number of bits
  *
- * This function sets the number of bits, for use in an Diffie Hellman
+ * This function sets the number of bits, for use in an Diffie-Hellman
  * key exchange.  This is used both in DH ephemeral and DH anonymous
  * cipher suites.  This will set the minimum size of the prime that
  * will be used for the handshake.
@@ -69,9 +69,9 @@ gnutls_dh_set_prime_bits (gnutls_session_t session, unsigned int bits)
  * @raw_prime: will hold the prime.
  *
  * This function will return the group parameters used in the last
- * Diffie Hellman authentication with the peer.  These are the prime
+ * Diffie-Hellman authentication with the peer.  These are the prime
  * and the generator used.  This function should be used for both
- * anonymous and ephemeral diffie Hellman.  The output parameters must
+ * anonymous and ephemeral Diffie-Hellman.  The output parameters must
  * be freed with gnutls_free().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise
@@ -136,9 +136,9 @@ gnutls_dh_get_group (gnutls_session_t session,
  * @raw_key: will hold the public key.
  *
  * This function will return the peer's public key used in the last
- * Diffie Hellman authentication.  This function should be used for
- * both anonymous and ephemeral diffie Hellman.  The output
- * parameters must be freed with gnutls_free().
+ * Diffie-Hellman authentication.  This function should be used for
+ * both anonymous and ephemeral Diffie-Hellman.  The output parameters
+ * must be freed with gnutls_free().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise
  *   an error code is returned.
@@ -242,9 +242,9 @@ gnutls_rsa_export_get_pubkey (gnutls_session_t session,
  * gnutls_dh_get_secret_bits - return the bits used in DH authentication
  * @session: is a gnutls session
  *
- * This function will return the bits used in the last Diffie Hellman
+ * This function will return the bits used in the last Diffie-Hellman
  * authentication with the peer.  Should be used for both anonymous
- * and ephemeral diffie Hellman.
+ * and ephemeral Diffie-Hellman.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise
  *   an error code is returned.
@@ -294,8 +294,8 @@ gnutls_dh_get_secret_bits (gnutls_session_t session)
  * @session: is a gnutls session
  *
  * This function will return the bits of the prime used in the last
- * Diffie Hellman authentication with the peer.  Should be used for
- * both anonymous and ephemeral diffie Hellman.
+ * Diffie-Hellman authentication with the peer.  Should be used for
+ * both anonymous and ephemeral Diffie-Hellman.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise
  *   an error code is returned.
@@ -373,11 +373,10 @@ gnutls_rsa_export_get_modulus_bits (gnutls_session_t session)
  * @session: is a gnutls session
  *
  * Get the Diffie-Hellman public key bit size.  Can be used for both
- * anonymous and ephemeral diffie Hellman.
+ * anonymous and ephemeral Diffie-Hellman.
  *
- * Returns: the public key bit size used in the last Diffie Hellman
- * authentication with the peer, or a negative value in case of
- * error.
+ * Returns: the public key bit size used in the last Diffie-Hellman
+ * authentication with the peer, or a negative value in case of error.
  **/
 int
 gnutls_dh_get_peers_public_bits (gnutls_session_t session)
@@ -577,11 +576,11 @@ gnutls_fingerprint (gnutls_digest_algorithm_t algo,
 /**
  * gnutls_certificate_set_dh_params - set the DH parameters for a server to use
  * @res: is a gnutls_certificate_credentials_t structure
- * @dh_params: is a structure that holds diffie hellman parameters.
+ * @dh_params: is a structure that holds Diffie-Hellman parameters.
  *
- * This function will set the diffie hellman parameters for a
+ * This function will set the Diffie-Hellman parameters for a
  * certificate server to use. These parameters will be used in
- * Ephemeral Diffie Hellman cipher suites.  Note that only a pointer
+ * Ephemeral Diffie-Hellman cipher suites.  Note that only a pointer
  * to the parameters are stored in the certificate handle, so if you
  * deallocate the parameters before the certificate is deallocated,
  * you must change the parameters stored in the certificate first.
@@ -600,7 +599,7 @@ gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t res,
  * @func: is the function to be called
  *
  * This function will set a callback in order for the server to get
- * the diffie hellman or RSA parameters for certificate
+ * the Diffie-Hellman or RSA parameters for certificate
  * authentication.  The callback should return zero on success.
  *
  **/
@@ -671,7 +670,7 @@ gnutls_certificate_set_rsa_export_params (gnutls_certificate_credentials_t
  * @func: is the function to be called
  *
  * This function will set a callback in order for the server to get
- * the diffie hellman or RSA parameters for psk authentication.  The
+ * the Diffie-Hellman or RSA parameters for psk authentication.  The
  * callback should return zero on success.
  **/
 void
@@ -687,7 +686,7 @@ gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res,
  * @func: is the function to be called
  *
  * This function will set a callback in order for the server to get
- * the diffie hellman or RSA parameters for anonymous authentication.
+ * the Diffie-Hellman or RSA parameters for anonymous authentication.
  * The callback should return zero on success.
  **/
 void
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index bc4ada9208..af27b8dee2 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -834,7 +834,7 @@ extern "C" {
   void gnutls_global_set_log_function (gnutls_log_func log_func);
   void gnutls_global_set_log_level (int level);
 
-/* Diffie Hellman parameter handling.
+/* Diffie-Hellman parameter handling.
  */
   int gnutls_dh_params_init (gnutls_dh_params_t * dh_params);
   void gnutls_dh_params_deinit (gnutls_dh_params_t dh_params);
diff --git a/libextra/gnutls_ia.c b/libextra/gnutls_ia.c
index 4e2c633aca..46d02ef1c7 100644
--- a/libextra/gnutls_ia.c
+++ b/libextra/gnutls_ia.c
@@ -376,8 +376,8 @@ gnutls_ia_verify_endphase (gnutls_session_t session, const char *checksum)
  * @sizeofdata: is the length of the data
  *
  * Send TLS/IA application payload data.  This function has the
- * similar semantics with send(). The only difference is that is
- * accepts a GNUTLS session, and uses different error codes.
+ * similar semantics with send().  The only difference is that it
+ * accepts a GnuTLS session, and uses different error codes.
  *
  * The TLS/IA protocol is synchronous, so you cannot send more than
  * one packet at a time.  The client always send the first packet.
@@ -415,7 +415,7 @@ gnutls_ia_send (gnutls_session_t session, const char *data, size_t sizeofdata)
  * @sizeofdata: the number of requested bytes, must be >= 12.
  *
  * Receive TLS/IA data.  This function has the similar semantics with
- * recv(). The only difference is that is accepts a GNUTLS session,
+ * recv().  The only difference is that it accepts a GnuTLS session,
  * and uses different error codes.
  *
  * If the server attempt to finish an application phase, this function
diff --git a/src/certtool.gaa b/src/certtool.gaa
index 786b063ccf..965dfd3ff7 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -33,8 +33,8 @@ option (e, verify-chain) { $action=ACTION_VERIFY_CHAIN; } "Verify a PEM encoded
 
 option (verify-crl) { $action=ACTION_VERIFY_CRL; } "Verify a CRL."
 
-option (generate-dh-params) { $action=ACTION_GENERATE_DH; } "Generate PKCS #3 encoded Diffie Hellman parameters."
-option (get-dh-params) { $action=ACTION_GET_DH; } "Get the included PKCS #3 encoded Diffie Hellman parameters."
+option (generate-dh-params) { $action=ACTION_GENERATE_DH; } "Generate PKCS #3 encoded Diffie-Hellman parameters."
+option (get-dh-params) { $action=ACTION_GET_DH; } "Get the included PKCS #3 encoded Diffie-Hellman parameters."
 
 #char *privkey;
 option (load-privkey) STR "FILE" { $privkey = $1 } "Private key file to use."
diff --git a/src/prime.c b/src/prime.c
index 9b07f95b9c..e05e2c2ab4 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004,2005,2007,2008 Free Software Foundation
+ * Copyright (C) 2004,2005,2007,2008,2009 Free Software Foundation
  * Copyright (C) 2001,2002,2003 Nikos Mavrogiannopoulos
  *
  * This file is part of GNUTLS.
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
+ *
  * GNUTLS is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *                               
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
-/* Generates Diffie Hellman parameters (a prime and a generator
+/* Generates Diffie-Hellman parameters (a prime and a generator
  * of the group). Exports them in PKCS #3 format. Used by certtool.
  */
 
diff --git a/src/serv.c b/src/serv.c
index 2ac75825b2..9760439068 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -171,13 +171,13 @@ generate_dh_primes (void)
       exit (1);
     }
 
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a week or once a month. Depends on the
    * security requirements.
    */
   printf
-    ("Generating Diffie Hellman parameters [%d]. Please wait...\n",
+    ("Generating Diffie-Hellman parameters [%d]. Please wait...\n",
      prime_bits);
   fflush (stdout);
 
@@ -229,7 +229,7 @@ read_dh_params (void)
       exit (1);
     }
 
-  printf ("Read Diffie Hellman parameters.\n");
+  printf ("Read Diffie-Hellman parameters.\n");
   fflush (stdout);
 
 }
@@ -262,7 +262,7 @@ static_dh_params (void)
       exit (1);
     }
 
-  printf ("Set static Diffie Hellman parameters, consider --dhparams.\n");
+  printf ("Set static Diffie-Hellman parameters, consider --dhparams.\n");
 
   return 0;
 }
@@ -870,7 +870,7 @@ main (int argc, char **argv)
   gnutls_global_set_log_level (debug);
 
   /* Note that servers must generate parameters for
-   * Diffie Hellman. See gnutls_dh_params_generate(), and
+   * Diffie-Hellman. See gnutls_dh_params_generate(), and
    * gnutls_dh_params_set().
    */
   if (generate != 0)
diff --git a/src/serv.gaa b/src/serv.gaa
index 63a85f39af..4fe9870c68 100644
--- a/src/serv.gaa
+++ b/src/serv.gaa
@@ -13,7 +13,7 @@ helpnode "GNU TLS test server\nUsage: gnutls-serv [options]\n\n"
 option (d, debug) INT "integer" { $debug = $1 } "Enable debugging" 
 
 #int generate;
-option (g, generate) { $generate = 1 } "Generate Diffie Hellman Parameters."
+option (g, generate) { $generate = 1 } "Generate Diffie-Hellman Parameters."
 
 #int port;
 option (p, port) INT "integer" { $port = $1 } "The port to connect to."
diff --git a/src/tls_test.c b/src/tls_test.c
index 9417c39cc6..c88c33eb7c 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -116,12 +116,12 @@ static const TLS_TEST tls_tests[] = {
 #ifdef ENABLE_ANON
   {"for anonymous authentication support", test_anonymous, "yes", "no",
    "dunno"},
-  {"anonymous Diffie Hellman group info", test_dhe_group, "", "N/A",
+  {"anonymous Diffie-Hellman group info", test_dhe_group, "", "N/A",
    "N/A"},
 #endif
-  {"for ephemeral Diffie Hellman support", test_dhe, "yes", "no",
+  {"for ephemeral Diffie-Hellman support", test_dhe, "yes", "no",
    "dunno"},
-  {"ephemeral Diffie Hellman group info", test_dhe_group, "", "N/A",
+  {"ephemeral Diffie-Hellman group info", test_dhe_group, "", "N/A",
    "N/A"},
   {"for AES cipher support (TLS extension)", test_aes, "yes", "no",
    "dunno"},
diff --git a/tests/anonself.c b/tests/anonself.c
index 5e45ca7279..b454aa4861 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -179,7 +179,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index cec51f795b..406668d40d 100644
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -168,7 +168,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 5ef15caa71..2b07ae31f7 100644
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -240,7 +240,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/oprfi.c b/tests/oprfi.c
index 68aba675d3..46089cefcb 100644
--- a/tests/oprfi.c
+++ b/tests/oprfi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -239,7 +239,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/resume.c b/tests/resume.c
index bf538279d6..e68a9bbecd 100644
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -221,7 +221,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/tlsia.c b/tests/tlsia.c
index 150eb30453..fff10a8595 100644
--- a/tests/tlsia.c
+++ b/tests/tlsia.c
@@ -263,7 +263,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/x509dn.c b/tests/x509dn.c
index d3f58f1620..8568de1a7c 100644
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -306,7 +306,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/x509self.c b/tests/x509self.c
index 4ff3f10320..14979a1ec0 100644
--- a/tests/x509self.c
+++ b/tests/x509self.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -270,7 +270,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.
diff --git a/tests/x509signself.c b/tests/x509signself.c
index 7e42879d54..b39439d58d 100644
--- a/tests/x509signself.c
+++ b/tests/x509signself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -272,7 +272,7 @@ static int
 generate_dh_params (void)
 {
   const gnutls_datum_t p3 = { (char*) pkcs3, strlen (pkcs3) };
-  /* Generate Diffie Hellman parameters - for use with DHE
+  /* Generate Diffie-Hellman parameters - for use with DHE
    * kx algorithms. These should be discarded and regenerated
    * once a day, once a week or once a month. Depending on the
    * security requirements.