summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libexec/identd/identd.816
-rw-r--r--libexec/login_chpass/login_chpass.86
-rw-r--r--libexec/login_token/login_token.86
-rw-r--r--sbin/ifconfig/ifconfig.86
-rw-r--r--sbin/ipsecadm/ipsecadm.842
-rw-r--r--sbin/lmccontrol/lmccontrol.86
-rw-r--r--share/man/man8/intro.84
-rw-r--r--usr.bin/locate/locate/locate.updatedb.86
-rw-r--r--usr.sbin/inetd/inetd.811
-rw-r--r--usr.sbin/iostat/iostat.87
10 files changed, 57 insertions, 53 deletions
diff --git a/libexec/identd/identd.8 b/libexec/identd/identd.8
index c14c1c742a5..635149de584 100644
--- a/libexec/identd/identd.8
+++ b/libexec/identd/identd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: identd.8,v 1.19 2002/09/13 01:31:39 djm Exp $
+.\" $OpenBSD: identd.8,v 1.20 2003/02/03 17:46:56 jmc Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -42,6 +42,7 @@
.Nd TCP/IP IDENT protocol server
.Sh SYNOPSIS
.Nm identd
+.Bk -words
.Op Fl i | w | b
.Op Fl t Ar seconds
.Op Fl u Ar uid
@@ -50,6 +51,7 @@
.Op Fl a Ar address
.Op Fl c Ar charset
.Op Fl noelvmNUdh
+.Ek
.Sh DESCRIPTION
.Nm
is a server which implements the
@@ -100,7 +102,7 @@ operation due to the initial overhead of parsing the kernel nlist.
This version does not use kmem or nlist parsing, so this reasoning
is no longer valid.
.It Fl b
-Specify operation as a stand alone daemon.
+Specify operation as a stand-alone daemon.
.It Fl h
Hide the actual information about the user by providing an opaque
token instead.
@@ -121,21 +123,21 @@ Specify a user ID number or user name which the
server should
switch to after binding itself to the
.Tn TCP/IP
-port if running as a stand alone daemon.
+port if running as a stand-alone daemon.
.It Fl g Ar gid
Specify a group ID number or group name which the
.Nm
server should
switch to after binding itself to the
.Tn TCP/IP
-port if running as a stand alone daemon
+port if running as a stand-alone daemon.
.It Fl p Ar port
Specify an alternative port number or service name
-on which to listen when running as a stand alone daemon
+on which to listen when running as a stand-alone daemon.
Default is "auth" (113).
.It Fl a Ar address
Specify a local IP address in dotted quad format
-to bind the listen socket to if running as a standalone daemon.
+to bind the listen socket to if running as a stand-alone daemon.
By default the daemon listens on all local IP addresses.
.It Fl l
Use
@@ -210,7 +212,7 @@ this version uses
.Xr sysctl 3
to obtain information from the kernel instead of parsing kmem.
This version does not require privilege beyond what is needed to bind
-the listen port if running as a standalone daemon.
+the listen port if running as a stand-alone daemon.
.Sh BUGS
Since
.Nm identd
diff --git a/libexec/login_chpass/login_chpass.8 b/libexec/login_chpass/login_chpass.8
index 1801481679b..cc85a2af4d2 100644
--- a/libexec/login_chpass/login_chpass.8
+++ b/libexec/login_chpass/login_chpass.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_chpass.8,v 1.3 2002/03/13 22:35:12 marc Exp $
+.\" $OpenBSD: login_chpass.8,v 1.4 2003/02/03 17:46:57 jmc Exp $
.\"
.\" Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
.\"
@@ -50,10 +50,10 @@ utility is typically called from
.Xr login 1 .
It is functionally the same as calling the program:
.Dq passwd Ar user .
-This will change the users kerberos password, if configured,
+This will change the user's kerberos password, if configured,
or use the
.Xr login_lchpass 8
-utility to change the users local password.
+utility to change the user's local password.
.Pp
Only the
.Li login
diff --git a/libexec/login_token/login_token.8 b/libexec/login_token/login_token.8
index 1f073caf3d9..f1f5fa7d7be 100644
--- a/libexec/login_token/login_token.8
+++ b/libexec/login_token/login_token.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_token.8,v 1.7 2002/07/16 12:38:40 jufi Exp $
+.\" $OpenBSD: login_token.8,v 1.8 2003/02/03 17:46:57 jmc Exp $
.\"
.\" Copyright (c) 1995 Migration Associates Corporation. All rights reserved.
.\"
@@ -45,7 +45,7 @@
.Sh DESCRIPTION
The
.Nm login_token
-program implements a X9.9 token card challenge response authentication
+program implements an X9.9 token card challenge response authentication
mechanism (see
.Xr login.conf 5 ) .
It must be invoked by one of the names:
@@ -70,7 +70,7 @@ This option and its value are ignored.
.Nm login_token
will look up
.Ar user
-in the the appropriate database file, depending on what name it was called as:
+in the appropriate database file, depending on what name it was called as:
.Pa /etc/activ.db ,
.Pa /etc/crypto.db ,
or
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index c08dd320423..5691701ef11 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.61 2002/12/12 13:41:25 mpech Exp $
+.\" $OpenBSD: ifconfig.8,v 1.62 2003/02/03 17:46:56 jmc Exp $
.\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
.\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
.\"
@@ -456,7 +456,7 @@ Set the receiver sleep duration (in milliseconds) for 802.11 power saving mode.
(inet and inet6 only)
Effect is similar to
.Cm netmask ,
-but you can specify by prefix length by digits.
+but you can specify prefix length by digits.
.It Cm range
Under AppleTalk, set the interface to respond to a
.Em netrange
@@ -525,7 +525,7 @@ causes
to print information on all interfaces.
The protocol family may be specified as well.
Additionally, if
-.Fl am ,
+.Fl am
is used, interface media information is printed.
.Pp
If
diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8
index cf2ee54ed22..99fdd55496b 100644
--- a/sbin/ipsecadm/ipsecadm.8
+++ b/sbin/ipsecadm/ipsecadm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsecadm.8,v 1.54 2003/01/15 16:02:09 markus Exp $
+.\" $OpenBSD: ipsecadm.8,v 1.55 2003/02/03 17:46:57 jmc Exp $
.\"
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
@@ -70,7 +70,7 @@ provided by IPsec.
The possible commands are:
.Bl -tag -width new_esp
.It new esp
-Setup a Security Association (SA) which uses the new esp transforms.
+Set up a Security Association (SA) which uses the new esp transforms.
A SA consists of the destination address,
a Security Parameter Index (SPI) and a security protocol.
Encryption and authentication algorithms can be applied.
@@ -94,7 +94,7 @@ modifiers are:
and
.Fl keyfile .
.It old esp
-Setup a SA which uses the old esp transforms.
+Set up an SA which uses the old esp transforms.
Only encryption algorithms can be applied.
Allowed modifiers are:
.Fl dst ,
@@ -112,7 +112,7 @@ Allowed modifiers are:
and
.Fl keyfile .
.It new ah
-Setup a SA which uses the new ah transforms.
+Set up an SA which uses the new ah transforms.
Authentication will be done with HMAC using the specified hash algorithm.
Allowed modifiers are:
.Fl dst ,
@@ -129,7 +129,7 @@ Allowed modifiers are:
and
.Fl keyfile .
.It old ah
-Setup a SA which uses the old ah transforms.
+Set up an SA which uses the old ah transforms.
Simple keyed hashes will be used for authentication.
Allowed modifiers are:
.Fl dst ,
@@ -162,7 +162,7 @@ Allowed modifiers are:
and
.Fl proto2 .
.It ip4
-Setup an SA which uses the IP-in-IP encapsulation protocol.
+Set up an SA which uses the IP-in-IP encapsulation protocol.
This mode
offers no security services by itself, but can be used to route other
(experimental or otherwise) protocols over an IP network.
@@ -290,7 +290,7 @@ and
Default action is to flush all types of security associations
from the kernel.
.It ipcomp
-Setup an IP Compression Association (IPCA) which will use the IPcomp
+Set up an IP Compression Association (IPCA) which will use the IPcomp
transforms.
Just like an SA, an IPCA consists of the destination
address, a Compression Parameter Index (CPI) and a protocol (which is
@@ -305,7 +305,7 @@ and
.Fl forcetunnel .
To create an IPsec SA using compression, an IPCA and an SA must first
be created.
-After this a IPCA/SA bundle must be created using the
+After this an IPCA/SA bundle must be created using the
.Nm group
keyword.
The IPCA must be applied first.
@@ -393,7 +393,7 @@ See
CAST encryption is available only in new esp.
.It Nm skipjack
SKIPJACK encryption is available only in new esp.
-This algorithm designed by the NSA and is faster than 3DES.
+This algorithm was designed by the NSA and is faster than 3DES.
However, since it was designed by the NSA
it is a poor choice.
.El
@@ -430,7 +430,7 @@ The
should be given in hexadecimal digits.
The
.Nm key
-should be chosen in random (ideally, using some true-random source like
+should be chosen at random (ideally, using some true-random source like
coin flipping).
It is very important that the key is not guessable.
One practical way of generating 160-bit (20-byte) keys is as follows:
@@ -453,7 +453,7 @@ The
should be given in hexadecimal digits.
The
.Nm key
-should be chosen in random (ideally, using some true-random source like
+should be chosen at random (ideally, using some true-random source like
coin flipping).
It is very important that the key is not guessable.
One practical way of generating 160-bit (20-byte) keys is as follows:
@@ -603,7 +603,7 @@ For
.Nm flow ,
specify that packets matching this flow must use IPsec.
If such SAs are not present, simply drop the packets.
-Such a policy may be used to demand peers to establish SAs before they
+Such a policy may be used to demand peers establish SAs before they
can communicate with us, without going through the burden of
initiating the SA ourselves (thus allowing for some denial of service
attacks).
@@ -638,7 +638,7 @@ For
only flush SAs of type ip4.
.El
.Sh EXAMPLES
-Setup a SA which uses new esp with 3des encryption and HMAC-SHA1
+Set up an SA which uses new esp with 3des encryption and HMAC-SHA1
authentication:
.Bd -literal
# ipsecadm new esp -enc 3des -auth sha1 -spi 100a -dst 169.20.12.2 \\
@@ -647,19 +647,19 @@ authentication:
-authkey 1234123412341234123412341234123412341234
.Ed
.Pp
-Setup a SA for authentication with old ah only:
+Set up an SA for authentication with old ah only:
.Bd -literal
# ipsecadm old ah -auth md5 -spi 10f2 -dst 169.20.12.2 -src 169.20.12.3 \\
-key 12341234deadbeef
.Ed
.Pp
-Setup a flow requiring use of AH:
+Set up a flow requiring use of AH:
.Bd -literal
# ipsecadm flow -dst 169.20.12.2 -proto ah \\
- -addr 10.1.1.0 255.255.255.0 10.0.0.0 255.0.0.0 -out -require
+ -addr 10.1.1.0/24 10.0.0.0/24 -out -require
.Ed
.Pp
-Setup an inbound SA:
+Set up an inbound SA:
.Bd -literal
# ipsecadm new esp -enc blf -auth md5 -spi 1002 -dst 169.20.12.3 \\
-src 169.20.12.2 \\
@@ -667,16 +667,16 @@ Setup an inbound SA:
-authkey 12349876432167890192837465098273
.Ed
.Pp
-Setup an ingress flow on for the inbound SA:
+Set up an ingress flow for the inbound SA:
.Bd -literal
-# ipsecadm flow -addr 10.0.0.0 255.0.0.0 10.1.1.0 255.255.255.0 \\
+# ipsecadm flow -addr 10.0.0.0/8 10.1.1.0/24 \\
-dst 169.20.12.2 -proto esp -in -require
.Ed
.Pp
-Setup a bypass flow:
+Set up a bypass flow:
.Bd -literal
# ipsecadm flow -bypass -out \\
- -addr 10.1.1.0 255.255.255.0 10.1.1.0 255.255.255.0
+ -addr 10.1.1.0/24 10.1.1.0/24
.Ed
.Pp
Delete all esp SAs and their flows and routing information:
diff --git a/sbin/lmccontrol/lmccontrol.8 b/sbin/lmccontrol/lmccontrol.8
index 81a9ad32da5..949aedc3279 100644
--- a/sbin/lmccontrol/lmccontrol.8
+++ b/sbin/lmccontrol/lmccontrol.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lmccontrol.8,v 1.13 2002/11/14 02:57:27 deraadt Exp $
+.\" $OpenBSD: lmccontrol.8,v 1.14 2003/02/03 17:46:57 jmc Exp $
.\"
.\" Copyright (c) 1997-1999 LAN Media Corporation (LMC)
.\" All rights reserved. www.lanmedia.com
@@ -83,10 +83,10 @@ settings from the driver and prints them out.
The options are as follows:
.Bl -tag -width Ds
.It Ar interface
-The interface name of the Lan Media card (default is lmc0)
+The interface name of the Lan Media card (default is lmc0).
.It Fl l Ar speed
To manually specify line speed, in bits per second (for devices without
-built-in CSU/DSU)
+built-in CSU/DSU).
.It Fl c
Sets the interface to use an external clock source.
This is only valid for SSI/HSSI cards.
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index aab79abb657..f00ff171901 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.8,v 1.4 2001/08/22 12:15:46 heko Exp $
+.\" $OpenBSD: intro.8,v 1.5 2003/02/03 17:46:56 jmc Exp $
.\" $NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -43,7 +43,7 @@
.Sh DESCRIPTION
The manual pages in section 8 contain information related to
system operation and maintenance.
-It describes commands used to create new file systems,
+They describe commands used to create new file systems,
.Ql Xr newfs ,
verify the integrity of the file systems,
.Ql Xr fsck ,
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 182696bf2a0..7c50216bdb6 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: locate.updatedb.8,v 1.13 2000/11/10 05:10:32 aaron Exp $
+.\" $OpenBSD: locate.updatedb.8,v 1.14 2003/02/03 17:46:57 jmc Exp $
.\"
.\" Copyright (c) 1996
.\" Mike Pritchard <mpp@FreeBSD.org>. All rights reserved.
@@ -38,11 +38,13 @@
.Nd update locate database
.Sh SYNOPSIS
.Nm locate.updatedb
+.Bk -words
.Op Fl -tmpdir=dir
.Op Fl -fcodes=dbfile
.Op Fl -searchpaths='dir1 dir2...'
.Op Fl -prunepaths='dir1 dir2...'
.Op Fl -filesystems='type1 type2...'
+.Ek
.Sh DESCRIPTION
.Nm
updates the database used by
@@ -67,7 +69,7 @@ is given, the database will be sent to standard output.
.It Fl -searchpaths
Sets the list of directories to be put in the database.
.It Fl -prunepaths
-Sets the list of parent directories that should not be go in
+Sets the list of parent directories that should not go in
the database.
.It Fl -filesystems
A list of filesystem types to be traversed by
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index e30656b65ac..36f42ea3d0f 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)inetd.8 6.7 (Berkeley) 3/16/91
-.\" $Id: inetd.8,v 1.21 2003/01/18 23:40:58 deraadt Exp $
+.\" $Id: inetd.8,v 1.22 2003/02/03 17:46:56 jmc Exp $
.\"
.Dd March 16, 1991
.Dt INETD 8
@@ -83,7 +83,6 @@ Comments are denoted by a
.Dq #
at the beginning
of a line.
-There must be an entry for each field.
The fields of the configuration file are as follows:
.Pp
.Bd -unfilled -offset indent -compact
@@ -145,7 +144,7 @@ interpreted in the traditional manner, with all services listened for
on all local addresses.
.Pp
The
-.Em service-name
+.Em service name
entry is the name of a valid service in
the file
.Pa /etc/services .
@@ -168,7 +167,7 @@ A range is bounded by the low version to the high version -
.Dq rusers/1-3 .
.Pp
The
-.Em socket-type
+.Em socket type
should be one of
.Dq stream ,
.Dq dgram ,
@@ -284,7 +283,7 @@ is specified and user is not root, the supplementary groups associated with
that user will still be set.
.Pp
The
-.Em server-program
+.Em server program
entry should contain the pathname of the program which is to be
executed by
.Nm inetd
@@ -343,7 +342,7 @@ for
and
.Dq tcp6 .
.Pp
-Under various combination of IPv4/v6 daemon settings,
+Under various combinations of IPv4/v6 daemon settings,
.Nm
will behave as follows:
.Bl -bullet -compact
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 3f5888e7066..77428dddea3 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iostat.8,v 1.18 2002/11/09 02:55:45 fgsch Exp $
+.\" $OpenBSD: iostat.8,v 1.19 2003/02/03 17:46:56 jmc Exp $
.\" $NetBSD: iostat.8,v 1.10 1996/10/25 18:21:57 scottr Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -152,14 +152,15 @@ line.
.It KB/t
Kilobytes transferred per disk transfer
.It t/s
-transfers per second
+Transfers per second
.It MB/s
Megabytes transferred per second
.Pp
.El
The alternate display format, (selected with
.Fl D ) ,
-presents the following values.
+presents the following values:
+.Pp
.Bl -tag -width indent -compact
.It KB
Kilobytes transferred