2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d65b45a8d..a2b9f598d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
    - jmc@cvs.openbsd.org 2008/06/26 06:59:39
      [moduli.5]
      tweak previous;
+   - sobrado@cvs.openbsd.org 2009/10/28 08:56:54
+     [moduli.5]
+     "Diffie-Hellman" is the usual spelling for the cryptographic protocol
+     first published by Whitfield Diffie and Martin Hellman in 1976.
+     ok jmc@
 
 20110805
  - OpenBSD CVS Sync
diff --git a/moduli.5 b/moduli.5
index a1321abdf..b1547bcdb 100644
--- a/moduli.5
+++ b/moduli.5
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: moduli.5,v 1.13 2008/06/26 06:59:39 jmc Exp $
+.\"     $OpenBSD: moduli.5,v 1.14 2009/10/28 08:56:54 sobrado Exp $
 .\"
 .\" Copyright (c) 2008 Damien Miller <djm@mindrot.org>
 .\"
@@ -13,12 +13,12 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: October 28 2009 $
 .Dt MODULI 5
 .Os
 .Sh NAME
 .Nm moduli
-.Nd Diffie Hellman moduli
+.Nd Diffie-Hellman moduli
 .Sh DESCRIPTION
 The
 .Pa /etc/moduli
@@ -39,7 +39,7 @@ A second
 pass, using
 .Ic ssh-keygen -T ,
 provides a high degree of assurance that the numbers are prime and are
-safe for use in Diffie Hellman operations by
+safe for use in Diffie-Hellman operations by
 .Xr sshd 8 .
 This
 .Nm
@@ -104,10 +104,10 @@ The recommended generator for use with this modulus (hexadecimal).
 The modulus itself in hexadecimal.
 .El
 .Pp
-When performing Diffie Hellman Group Exchange,
+When performing Diffie-Hellman Group Exchange,
 .Xr sshd 8
 first estimates the size of the modulus required to produce enough
-Diffie Hellman output to sufficiently key the selected symmetric cipher.
+Diffie-Hellman output to sufficiently key the selected symmetric cipher.
 .Xr sshd 8
 then randomly selects a modulus from
 .Fa /etc/moduli