2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ae5557001..c754470fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20121107
+ - (djm) OpenBSD CVS Sync
+   - eric@cvs.openbsd.org 2011/11/28 08:46:27
+     [moduli.5]
+     fix formula
+     ok djm@
+
 20121105
  - (dtucker) [uidswap.c openbsd-compat/Makefile.in
    openbsd-compat/bsd-setres_id.c openbsd-compat/bsd-setres_id.h
diff --git a/moduli.5 b/moduli.5
index 0e01b9414..aa7e06291 100644
--- a/moduli.5
+++ b/moduli.5
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: moduli.5,v 1.15 2010/10/14 20:41:28 jmc Exp $
+.\"     $OpenBSD: moduli.5,v 1.16 2011/11/28 08:46:27 eric Exp $
 .\"
 .\" Copyright (c) 2008 Damien Miller <djm@mindrot.org>
 .\"
@@ -13,7 +13,7 @@
 .\" 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: October 14 2010 $
+.Dd $Mdocdate: November 28 2011 $
 .Dt MODULI 5
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ Unknown, not tested.
 .It 2
 "Safe" prime; (p-1)/2 is also prime.
 .It 4
-Sophie Germain; (p+1)*2 is also prime.
+Sophie Germain; 2p+1 is also prime.
 .El
 .Pp
 Moduli candidates initially produced by