summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2013-01-18 21:48:44 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2013-01-18 21:48:44 +0000
commitd18cd8155a8d019336c239580876b3c47becf300 (patch)
tree9395f1bbe9c4f8417e08bea2ccc89f2999e8329c
parent40385c6ce5e1b198124dc4a0bcab53f8900bb77e (diff)
command-line (adj.) -> command line (n.);
-rw-r--r--bin/cat/cat.16
-rw-r--r--bin/cp/cp.16
-rw-r--r--share/man/man5/hostname.if.56
-rw-r--r--usr.bin/lex/flex.16
-rw-r--r--usr.bin/ssh/ssh-keygen.116
-rw-r--r--usr.sbin/adduser/adduser.86
6 files changed, 23 insertions, 23 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index f3db08909de..700c9757157 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cat.1,v 1.31 2011/03/05 18:48:26 schwarze Exp $
+.\" $OpenBSD: cat.1,v 1.32 2013/01/18 21:48:43 jmc Exp $
.\" $NetBSD: cat.1,v 1.12 1995/09/27 05:38:55 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
.\"
-.Dd $Mdocdate: March 5 2011 $
+.Dd $Mdocdate: January 18 2013 $
.Dt CAT 1
.Os
.Sh NAME
@@ -136,7 +136,7 @@ read and output contents of the standard input again, then finally output
the contents of
.Ar file3 .
Note that if the standard input referred to a file, the second dash
-on the command-line would have no effect, since the entire contents of the file
+on the command line would have no effect, since the entire contents of the file
would have already been read and printed by
.Nm
when it encountered the first
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 951bc302e12..ffbb862c215 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cp.1,v 1.34 2011/06/15 23:47:37 tedu Exp $
+.\" $OpenBSD: cp.1,v 1.35 2013/01/18 21:48:43 jmc Exp $
.\" $NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: June 15 2011 $
+.Dd $Mdocdate: January 18 2013 $
.Dt CP 1
.Os
.Sh NAME
@@ -86,7 +86,7 @@ options.
.It Fl H
If the
.Fl R
-option is also specified, symbolic links on the command-line are followed.
+option is also specified, symbolic links on the command line are followed.
(Symbolic links encountered in the tree traversal are not followed.)
.It Fl i
Write a prompt to the standard error output before copying a file
diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5
index 517ca2dccc9..161769ad4fd 100644
--- a/share/man/man5/hostname.if.5
+++ b/share/man/man5/hostname.if.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostname.if.5,v 1.59 2012/12/27 08:26:43 jmc Exp $
+.\" $OpenBSD: hostname.if.5,v 1.60 2013/01/18 21:48:43 jmc Exp $
.\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)hosts.5 8.2 (Berkeley) 12/11/93
.\"
-.Dd $Mdocdate: December 27 2012 $
+.Dd $Mdocdate: January 18 2013 $
.Dt HOSTNAME.IF 5
.Os
.Sh NAME
@@ -202,7 +202,7 @@ the interface, such as 64.
.It Li #
Comments are allowed.
Anything following a comment character is treated as a comment.
-.It Li \&! Ns Ar command-line
+.It Li \&! Ns Ar command
Arbitrary shell commands can be executed using this directive, as
long as they are available in the single-user environment (for
instance,
diff --git a/usr.bin/lex/flex.1 b/usr.bin/lex/flex.1
index 73344651834..a025cf55532 100644
--- a/usr.bin/lex/flex.1
+++ b/usr.bin/lex/flex.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: flex.1,v 1.32 2012/04/08 17:37:35 jmc Exp $
+.\" $OpenBSD: flex.1,v 1.33 2013/01/18 21:48:43 jmc Exp $
.\"
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
.\" PURPOSE.
.\"
-.Dd $Mdocdate: April 8 2012 $
+.Dd $Mdocdate: January 18 2013 $
.Dt FLEX 1
.Os
.Sh NAME
@@ -2870,7 +2870,7 @@ below for details.
also provides a mechanism for controlling options within the
scanner specification itself, rather than from the
.Nm
-command-line.
+command line.
This is done by including
.Dq %option
directives in the first section of the scanner specification.
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index ca0ab3537c8..9d7a25cf466 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.113 2013/01/18 08:39:04 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.114 2013/01/18 21:48:43 jmc Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -346,7 +346,7 @@ In this mode,
.Nm
will generate a KRL file at the location specified via the
.Fl f
-flag that revokes every key or certificate presented on the command-line.
+flag that revokes every key or certificate presented on the command line.
Keys/certificates to be revoked may be specified by public key file or
using the format described in the
.Sx KEY REVOCATION LISTS
@@ -506,7 +506,7 @@ for protocol version 2.
Update a KRL.
When specified with
.Fl k ,
-keys listed via the command-line are added to the existing KRL rather than
+keys listed via the command line are added to the existing KRL rather than
a new KRL being created.
.It Fl V Ar validity_interval
Specify a validity interval when signing a certificate.
@@ -698,7 +698,7 @@ revoked by serial number.
KRLs may be generated using the
.Fl k
flag.
-This option reads one or more files from the command-line and generates a new
+This option reads one or more files from the command line and generates a new
KRL.
The files may either contain a KRL specification (see below) or public keys,
listed one per line.
@@ -721,14 +721,14 @@ If two serial numbers are specified separated by a hyphen, then the range
of serial numbers including and between each is revoked.
The CA key must have been specified on the
.Nm
-command-line using the
+command line using the
.Fl s
option.
.It Cm id : Ar key_id
Revokes a certificate with the specified key ID string.
The CA key must have been specified on the
.Nm
-command-line using the
+command line using the
.Fl s
option.
.It Cm key : Ar public_key
@@ -742,7 +742,7 @@ KRLs may be updated using the
.Fl u
flag in addition to
.Fl k .
-When this option is specified, keys listed via the command-line are merged into
+When this option is specified, keys listed via the command line are merged into
the KRL, adding to those already there.
.Pp
It is also possible, given a KRL, to test whether it revokes a particular key
@@ -750,7 +750,7 @@ It is also possible, given a KRL, to test whether it revokes a particular key
The
.Fl Q
flag will query an existing KRL, testing each key specified on the commandline.
-If any key listed on the command-line has been revoked (or an error encountered)
+If any key listed on the command line has been revoked (or an error encountered)
then
.Nm
will exit with a non-zero exit status.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index e148ca7c085..e38f98c9864 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: adduser.8,v 1.41 2011/05/11 07:05:35 lum Exp $
+.\" $OpenBSD: adduser.8,v 1.42 2013/01/18 21:48:43 jmc Exp $
.\"
.\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" SUCH DAMAGE.
.\"
.\" $From: adduser.8,v 1.12 1996/08/28 17:54:13 adam Exp $
-.Dd $Mdocdate: May 11 2011 $
+.Dd $Mdocdate: January 18 2013 $
.Dt ADDUSER 8
.Os
.Sh NAME
@@ -83,7 +83,7 @@ The options are as follows:
.Op Ar fullname
.Op Ar password
.Xc
-Enter batch mode in which multiple users are specified on the command-line
+Enter batch mode in which multiple users are specified on the command line
in a compact format.
By default the password is assumed to already be properly encrypted.
.It Fl check_only