summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2007-02-19 14:17:56 +0000
committerjmc <jmc@openbsd.org>2007-02-19 14:17:56 +0000
commit258f075b0978298e64b986da8a89fad4ded566a1 (patch)
treef95312cf5641c652c493fe99081eba50fedca5cc
parentstick atascsi onto ahci, which in turn attaches a scsibus. while this (diff)
downloadwireguard-openbsd-258f075b0978298e64b986da8a89fad4ded566a1.tar.xz
wireguard-openbsd-258f075b0978298e64b986da8a89fad4ded566a1.zip
tweak;
-rw-r--r--sbin/ipsecctl/ipsec.conf.54
-rw-r--r--sbin/isakmpd/isakmpd.conf.54
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index af65eeaeaa0..9630d4b0579 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.conf.5,v 1.111 2007/02/19 10:00:13 hshoexer Exp $
+.\" $OpenBSD: ipsec.conf.5,v 1.112 2007/02/19 14:20:46 jmc Exp $
.\"
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
.\"
@@ -562,7 +562,7 @@ to form its 168-bit key.
This is because the most significant bit of each byte is used for parity.
.Pp
Note that using NULL with ESP will only provide authentication.
-This is useful in setups where AH can not be used, eg. when NAT is involved.
+This is useful in setups where AH can not be used, e.g. when NAT is involved.
.Pp
The following group types are permitted with the
.Ic group
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 46f8e19a080..28b83eb6924 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.120 2007/02/19 10:00:13 hshoexer Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.121 2007/02/19 14:17:56 jmc Exp $
.\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
.\"
.\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -141,7 +141,7 @@ where:
.It Ns { Ns Ar proto Ns }
is either ESP or AH
.It Ns { Ns Ar cipher Ns }
-is either DES, 3DES, CAST, BLF, AES, AESCTR or NULL
+is either DES, 3DES, CAST, BLF, AES, AESCTR, or NULL
.It Ns { Ns Ar hash Ns }
is either MD5, SHA, RIPEMD, or SHA2-{256,384,512}
.It Ns { Ns Ar group Ns }