Merge with EOM 1.14

author: angelos
*_ike_address -> *_negotiation_address (so it's not IKE specific)

diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index e5f60a5..6936eb7 100644 (file)
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,5 +1,5 @@
-.\" $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 $
+.\" $OpenBSD: isakmpd.policy.5,v 1.8 2000/04/07 22:49:54 niklas Exp $
+.\" $EOM: isakmpd.policy.5,v 1.14 2000/04/07 22:41:29 angelos Exp $
 .\"
 .\" Copyright (c) 1999, Angelos D. Keromytis.  All rights reserved.
 .\"
@@ -431,9 +431,9 @@ Set to
 .Va udp ,
 or nothing, depending on the transport protocol set in the IDci, IDcr,
 and Main Mode peer ID respectively.
-.It remote_ike_address
+.It remote_negotiation_address
 Set to the IPv4 address of the remote IKE daemon.
-.It local_ike_address
+.It local_negotiation_address
 Set to the IPv4 address of the local interface used by the local IKE
 daemon for this exchange.
 .It GMTTimeOfDay