summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/ubsec.46
-rw-r--r--usr.bin/calendar/calendars/calendar.openbsd6
-rw-r--r--usr.sbin/dhcpd/dhcpd.conf.56
3 files changed, 9 insertions, 9 deletions
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 4b8fbe618cb..272d2acaac5 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ubsec.4,v 1.36 2015/12/10 21:00:51 naddy Exp $
+.\" $OpenBSD: ubsec.4,v 1.37 2018/03/01 20:48:11 jmc Exp $
.\"
.\" Copyright (c) 2000 Jason L. Wright (jason@thought.net)
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 10 2015 $
+.Dd $Mdocdate: March 1 2018 $
.Dt UBSEC 4
.Os
.Sh NAME
@@ -62,7 +62,7 @@ Faster version of the BCM5822 that also supports AES.
.It Broadcom BCM5825
Faster PCI Express or PCI-X version of the chip.
.It Broadcom BCM5860
-IPSec/SSL Security Processor that is faster and has more features.
+IPsec/SSL Security Processor that is faster and has more features.
.It Broadcom BCM5861
Faster version of the BCM5860.
.It Broadcom BCM5862
diff --git a/usr.bin/calendar/calendars/calendar.openbsd b/usr.bin/calendar/calendars/calendar.openbsd
index 208b23bcca8..22f40097a6a 100644
--- a/usr.bin/calendar/calendars/calendar.openbsd
+++ b/usr.bin/calendar/calendars/calendar.openbsd
@@ -1,7 +1,7 @@
/*
* OpenBSD-related dates to celebrate
*
- * $OpenBSD: calendar.openbsd,v 1.38 2016/09/03 13:37:45 guenther Exp $
+ * $OpenBSD: calendar.openbsd,v 1.39 2018/03/01 20:48:11 jmc Exp $
*/
#ifndef _calendar_openbsd_
@@ -53,7 +53,7 @@ May 29 t2k13: General hackathon, Toronto, Canada, 43 developers, 2013
May 30 c2k9: General hackathon, Edmonton, Alberta, 46 developers, 2009
May 31 Initial cut at OpenNTP, 2004
Jun 01 OpenBSD 2.1 released, first time on CD (double set), 1997
-Jun 04 c99: First hackathon (IPSec), Calgary, Alberta, 10 developers, 1999
+Jun 04 c99: First hackathon (IPsec), Calgary, Alberta, 10 developers, 1999
Jun 04 c2k2: General hackathon, Calgary, Alberta, 42 developers, 2002
Jun 06 c2k8: General hackathon, Edmonton, Alberta, 55 developers, 2008
Jun 14 r2k6: First network hackathon, Hamburg, Germany, 6 developers, 2006
@@ -79,7 +79,7 @@ Aug 12 OpenBSD/sparc is switched to wscons, 2002
Aug 16 IPX network stack added to OpenBSD, from FreeBSD, 1996
Aug 17 c2k1-2: Sparc64 hackathon, Washington D.C., 12 developers, 2001
Aug 17 OpenBSD/sparc64 port is added, from NetBSD, 2001
-Aug 28 k2k6: IPSec hackathon, Schloss Kransberg, Germany, 14 developers, 2006
+Aug 28 k2k6: IPsec hackathon, Schloss Kransberg, Germany, 14 developers, 2006
Sep 01 Support for the sparc (32bit) architecture removed, 2016
Sep 03 Support for the zaurus architecture removed, 2016
Sep 16 s2k11: General hackathon, Ljubljana, Slovenia, 25 developers, 2011
diff --git a/usr.sbin/dhcpd/dhcpd.conf.5 b/usr.sbin/dhcpd/dhcpd.conf.5
index c2f7d2483da..a5ac3af413e 100644
--- a/usr.sbin/dhcpd/dhcpd.conf.5
+++ b/usr.sbin/dhcpd/dhcpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dhcpd.conf.5,v 1.22 2017/06/28 14:07:11 jmc Exp $
+.\" $OpenBSD: dhcpd.conf.5,v 1.23 2018/03/01 20:48:11 jmc Exp $
.\"
.\" Copyright (c) 1995, 1996, 1997, 1998, 1998, 1999
.\" The Internet Software Consortium. All rights reserved.
@@ -36,7 +36,7 @@
.\" see ``http://www.isc.org/isc''. To learn more about Vixie
.\" Enterprises, see ``http://www.vix.com''.
.\"
-.Dd $Mdocdate: June 28 2017 $
+.Dd $Mdocdate: March 1 2018 $
.Dt DHCPD.CONF 5
.Os
.Sh NAME
@@ -566,7 +566,7 @@ Currently, the
and
.Cm fddi
physical interface types are recognized,
-although support for DHCP-over-IPSec virtual interface type
+although support for DHCP-over-IPsec virtual interface type
.Cm ipsec-tunnel
is provided.
The