summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2010-09-19 20:55:25 +0000
committerjmc <jmc@openbsd.org>2010-09-19 20:55:25 +0000
commite593fc9437650a541f1ba4adcb73392b4d43f9c6 (patch)
treef9c08b806fde1f55881894bee2dba39b465fb728
parentput HISTORY in the right place; (diff)
downloadwireguard-openbsd-e593fc9437650a541f1ba4adcb73392b4d43f9c6.tar.xz
wireguard-openbsd-e593fc9437650a541f1ba4adcb73392b4d43f9c6.zip
more wacky macro fixing;
-rw-r--r--bin/date/date.17
-rw-r--r--bin/pax/pax.112
-rw-r--r--bin/rcp/rcp.15
-rw-r--r--sbin/init/init.86
-rw-r--r--sbin/ipsecctl/ipsec.conf.56
5 files changed, 18 insertions, 18 deletions
diff --git a/bin/date/date.1 b/bin/date/date.1
index 7c5a6c67590..e6b96016caf 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: date.1,v 1.53 2010/09/03 09:53:20 jmc Exp $
+.\" $OpenBSD: date.1,v 1.54 2010/09/19 20:55:25 jmc Exp $
.\" $NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
.\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 19 2010 $
.Dt DATE 1
.Os
.Sh NAME
@@ -53,7 +53,8 @@
.Ar mm Oc
.Ar dd Oc
.Ar HH Oc
-.Ar MM Op Ar \&.SS Oc
+.Ar MM Op Ar \&.SS
+.Oc
.Sm on
.Sh DESCRIPTION
When invoked without arguments, the
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 4ace525fd74..c5eca2c57e6 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pax.1,v 1.60 2010/09/03 09:53:20 jmc Exp $
+.\" $OpenBSD: pax.1,v 1.61 2010/09/19 20:55:25 jmc Exp $
.\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
@@ -34,7 +34,7 @@
.\"
.\" @(#)pax.1 8.4 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 19 2010 $
.Dt PAX 1
.Os
.Sh NAME
@@ -669,9 +669,9 @@ time falling within the specified time range.
The range has the format:
.Sm off
.Bd -filled -offset indent
-.Oo Ar from_date Oc Oo ,
-.Ar to_date Oc Oo /
-.Oo Cm c Oc Op Cm m Oc
+.Op Ar from_date
+.Op \&, Ar to_date
+.Op / Oo Cm c Oc Op Cm m
.Ed
.Sm on
.Pp
@@ -702,7 +702,7 @@ is in the
or
.Em copy
mode, the optional trailing field
-.Oo Cm c Oc Op Cm m
+.Oo Cm c Oc Ns Op Cm m
can be used to determine which file time (inode change, file modification or
both) are used in the comparison.
If neither is specified, the default is to use file modification time only.
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 2caad8762f7..75d52b9518e 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcp.1,v 1.18 2009/03/01 13:47:02 sobrado Exp $
+.\" $OpenBSD: rcp.1,v 1.19 2010/09/19 20:55:25 jmc Exp $
.\" $NetBSD: rcp.1,v 1.6 1995/07/25 19:37:25 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)rcp.1 8.1 (Berkeley) 5/31/93
.\"
-.Dd $Mdocdate: March 1 2009 $
+.Dd $Mdocdate: September 19 2010 $
.Dt RCP 1
.Os
.Sh NAME
@@ -60,7 +60,6 @@ characters,
or a
.Ql /
before any
-.Br
.Ql \&:
characters).
.Pp
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index a9297bd35aa..25ad38ec2b1 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: init.8,v 1.41 2010/03/14 00:17:03 jmc Exp $
+.\" $OpenBSD: init.8,v 1.42 2010/09/19 20:59:20 jmc Exp $
.\" $NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)init.8 8.6 (Berkeley) 5/26/95
.\"
-.Dd $Mdocdate: March 14 2010 $
+.Dd $Mdocdate: September 19 2010 $
.Dt INIT 8
.Os
.Sh NAME
@@ -233,7 +233,7 @@ automatically.
If, at bootstrap time, the
.Nm
process cannot be located, the system will panic with the message
-.Dq panic: "init died (signal %d, exit %d) .
+.Dq panic: "init died (signal %d, exit %d)" .
.Sh RESOURCES
When
.Nm
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index d639b0161a1..f00a29fdfe6 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.conf.5,v 1.126 2010/06/07 08:32:58 jmc Exp $
+.\" $OpenBSD: ipsec.conf.5,v 1.127 2010/09/19 20:59:20 jmc Exp $
.\"
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 7 2010 $
+.Dd $Mdocdate: September 19 2010 $
.Dt IPSEC.CONF 5
.Os
.Sh NAME
@@ -161,7 +161,7 @@ In this scenario,
is used to set up flows and SAs automatically using
.Xr isakmpd 8
with the ISAKMP/Oakley a.k.a. IKEv1 protocol.
-To configure automatic keying using the IKEv2 protocol, see
+To configure automatic keying using the IKEv2 protocol, see
.Xr iked.conf 5
instead.
Some examples of setting up automatic keying: