Merge with EOM 1.39

author: angelos
Add text on CAs and policies.

diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index a324811..78f526d 100644 (file)
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.33 2000/03/23 21:39:56 aaron Exp $
-.\" $EOM: isakmpd.conf.5,v 1.38 2000/01/31 08:39:44 niklas Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.34 2000/04/07 22:06:57 niklas Exp $
+.\" $EOM: isakmpd.conf.5,v 1.39 2000/03/22 05:52:11 angelos Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
 .\"