From 47f4ddc61f02c1c459df0b0b7fbb0259d2bc284b Mon Sep 17 00:00:00 2001
From: niklas <niklas@openbsd.org>
Date: Fri, 7 Apr 2000 22:22:27 +0000
Subject: [PATCH] apps/certpatch/certpatch.8: Merge with EOM 1.5 isakmpd.8:
 Merge with EOM 1.20 isakmpd.conf.5: Merge with EOM 1.40 isakmpd.policy.5:
 Merge with EOM 1.13

author: niklas
Changes from OpenBSD
---
 sbin/isakmpd/apps/certpatch/certpatch.8 | 4 ++--
 sbin/isakmpd/isakmpd.8                  | 4 ++--
 sbin/isakmpd/isakmpd.conf.5             | 4 ++--
 sbin/isakmpd/isakmpd.policy.5           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sbin/isakmpd/apps/certpatch/certpatch.8 b/sbin/isakmpd/apps/certpatch/certpatch.8
index 286d9e27428..5c36552b4e8 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.8
+++ b/sbin/isakmpd/apps/certpatch/certpatch.8
@@ -1,5 +1,5 @@
-.\" $OpenBSD: certpatch.8,v 1.4 2000/03/23 21:10:20 aaron Exp $
-.\" $EOM: certpatch.8,v 1.4 2000/01/31 22:33:50 niklas Exp $
+.\" $OpenBSD: certpatch.8,v 1.5 2000/04/07 22:22:27 niklas Exp $
+.\" $EOM: certpatch.8,v 1.5 2000/04/07 22:17:11 niklas Exp $
 .\"
 .\" Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
 .\" Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 7e360862de9..1e04f5bbe59 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.8,v 1.17 2000/03/18 22:55:59 aaron Exp $
-.\" $EOM: isakmpd.8,v 1.19 2000/01/31 22:33:46 niklas Exp $
+.\" $OpenBSD: isakmpd.8,v 1.18 2000/04/07 22:23:14 niklas Exp $
+.\" $EOM: isakmpd.8,v 1.20 2000/04/07 22:17:11 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
 .\" Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 78f526da60f..73ecc4d0ffa 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,5 +1,5 @@
-.\" $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 $
+.\" $OpenBSD: isakmpd.conf.5,v 1.35 2000/04/07 22:23:14 niklas Exp $
+.\" $EOM: isakmpd.conf.5,v 1.40 2000/04/07 22:17:11 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
 .\"
diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index f733a7648b8..e5f60a57c96 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.6 2000/04/07 22:06:00 niklas Exp $
-.\" $EOM: isakmpd.policy.5,v 1.12 2000/03/13 20:59:31 angelos Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.7 2000/04/07 22:23:14 niklas Exp $
+.\" $EOM: isakmpd.policy.5,v 1.13 2000/04/07 22:17:11 niklas Exp $
 .\"
 .\" Copyright (c) 1999, Angelos D. Keromytis.  All rights reserved.
 .\"
-- 
2.20.1