From 4aac73a429035a1a33b32fa880e6ebe50fa423c4 Mon Sep 17 00:00:00 2001
From: aaron <aaron@openbsd.org>
Date: Thu, 23 Mar 2000 21:39:53 +0000
Subject: [PATCH] More pedantic man page formatting insanity, lalala

---
 bin/stty/stty.1                       |   8 +-
 sbin/ifconfig/ifconfig.8              |   5 +-
 sbin/isakmpd/isakmpd.conf.5           |  24 +++---
 sbin/isakmpd/isakmpd.policy.5         | 103 ++++++++++++++++----------
 usr.bin/biff/biff.1                   |   5 +-
 usr.bin/calendar/calendar.1           |   6 +-
 usr.bin/elf2ecoff/elf2ecoff.1         |   6 +-
 usr.bin/file/magic.5                  |   5 +-
 usr.bin/indent/indent.1               |   5 +-
 usr.bin/last/last.1                   |  20 ++---
 usr.bin/leave/leave.1                 |   5 +-
 usr.bin/locate/locate/locate.1        |  15 ++--
 usr.bin/m4/m4.1                       |   5 +-
 usr.bin/rusers/rusers.1               |  12 +--
 usr.bin/rwall/rwall.1                 |   6 +-
 usr.bin/showmount/showmount.8         |   5 +-
 usr.bin/skey/skey.1                   |   8 +-
 usr.bin/skeyinit/skeyinit.1           |   9 ++-
 usr.bin/ssh/ssh.1                     |  32 ++++----
 usr.bin/systat/systat.1               |   5 +-
 usr.bin/talk/talk.1                   |   6 +-
 usr.bin/telnet/telnet.1               |   8 +-
 usr.bin/wc/wc.1                       |   5 +-
 usr.bin/who/who.1                     |   5 +-
 usr.bin/whois/whois.1                 |   5 +-
 usr.bin/xinstall/install.1            |   5 +-
 usr.bin/yacc/yacc.1                   |   5 +-
 usr.sbin/cron/crontab.1               |  12 +--
 usr.sbin/mopd/mopa.out/mopa.out.1     |   7 +-
 usr.sbin/rtadvd/rtadvd.conf.5         |   8 +-
 usr.sbin/sesd/getencstat/getencstat.8 |  13 ++--
 usr.sbin/sesd/setobjstat/setobjstat.8 |   8 +-
 usr.sbin/traceroute/traceroute.8      |  10 +--
 usr.sbin/ypserv/mknetid/netid.5       |  11 ++-
 usr.sbin/ypserv/ypserv/securenet.5    |   9 ++-
 usr.sbin/ypserv/ypserv/ypserv.acl.5   |  11 ++-
 36 files changed, 246 insertions(+), 171 deletions(-)

diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index b7f957f7b09..7f76a89081e 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.21 2000/03/17 18:15:15 aaron Exp $
+.\"	$OpenBSD: stty.1,v 1.22 2000/03/23 21:39:58 aaron Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -343,7 +343,8 @@ is set, echo control characters as
 .Ql ^X .
 Otherwise control characters echo as themselves.
 .It Cm echoprt Pq Fl echoprt
-For printing terminals. If set, echo erased characters backwards within
+For printing terminals.
+If set, echo erased characters backwards within
 .Ql \e
 and
 .Ql / .
@@ -524,7 +525,8 @@ performed by either the terminal hardware or by the remote side connected
 to a pty.
 .It Cm raw Pq Fl raw
 If set, change the modes of the terminal so that no input or output processing
-is performed. If unset, change the modes of the terminal to some reasonable
+is performed.
+If unset, change the modes of the terminal to some reasonable
 state that performs input and output processing.
 Note that since the terminal driver no longer has a single
 .Dv RAW
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 236db45c94c..66d7aeeefc8 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.39 2000/03/18 22:55:57 aaron Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.40 2000/03/23 21:39:56 aaron 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 $
 .\"
@@ -119,7 +119,8 @@ count out long strings of digits in network byte order.
 (LLAP) addresses are specified as nn.na (Network Number.Node Address).
 Node addresses are divided into 2 classes: User Node IDs and Server
 Node IDs. 1-127($01-$7F) are for User Node IDs while 128-254($80-$FE)
-are used for Server Node IDs. Node 0($00) is not allowed (unknown)
+are used for Server Node IDs.
+Node 0($00) is not allowed (unknown)
 while Node 255($FF) is reserved for the AppleTalk broadcast Hardware
 address (broadcast ID).
 .It Ar address_family
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index be0f6045ce7..a3248112678 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.32 2000/03/22 04:06:17 angelos Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.33 2000/03/23 21:39:56 aaron Exp $
 .\" $EOM: isakmpd.conf.5,v 1.38 2000/01/31 08:39:44 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -82,7 +82,8 @@ Generic global configuration parameters
 .It Em Policy-File
 The name of the file that contains
 .Xr KeyNote 4
-policies. The default is "/etc/isakmpd/isakmpd.policy".
+policies.
+The default is "/etc/isakmpd/isakmpd.policy".
 .It Em Retransmits
 How many times should a message be retransmitted before giving up.
 .It Em Check-interval
@@ -192,9 +193,11 @@ Authentication data for this specific peer.
 In the case of preshared key, this is the key value itself.
 .It Em ID
 If existent, the name of the section that describes the
-local client ID that we should present to our peer. If not present, it
+local client ID that we should present to our peer.
+If not present, it
 defaults to the address of the local interface we are sending packets
-over to the remote daemon. Look at <Phase1-ID> below.
+over to the remote daemon.
+Look at <Phase1-ID> below.
 .It Em Flags
 A comma-separated list of flags controlling the further
 handling of the ISAKMP SA.
@@ -277,9 +280,11 @@ and
 The algorithm to use for the keyed pseudo-random function (used for key
 derivation and authentication in Phase 1), or ANY.
 .It Em Life
-A list of lifetime descriptions, or ANY. In the former case, each
+A list of lifetime descriptions, or ANY.
+In the former case, each
 element is in itself a name of the section that defines the lifetime.
-Look at <Lifetime> below. If it is set to ANY, then any type of
+Look at <Lifetime> below.
+If it is set to ANY, then any type of
 proposed lifetime type and value will be accepted.
 .El
 .It Em <Lifetime>
@@ -288,10 +293,11 @@ proposed lifetime type and value will be accepted.
 .Li SECONDS
 or
 .Li BYTES
-depending on the type of the duration. Notice that this field may NOT
-be set to ANY.
+depending on the type of the duration.
+Notice that this field may NOT be set to ANY.
 .It Em LIFE_DURATION
-An offer/accept kind of value, see above. Can also be set to ANY.
+An offer/accept kind of value, see above.
+Can also be set to ANY.
 .El
 .It Em <IPSec-connection>
 .Bl -tag -width 12n
diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index 22c0e6fec0f..bfd4f087dd5 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.4 2000/02/11 10:22:08 niklas Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.5 2000/03/23 21:39:56 aaron Exp $
 .\" $EOM: isakmpd.policy.5,v 1.11 2000/02/10 16:25:01 angelos Exp $
 .\"
 .\" Copyright (c) 1999, Angelos D. Keromytis.  All rights reserved.
@@ -49,42 +49,50 @@ The
 .Xr isakmpd 1
 daemon (also known as IKE, for Internet Key Exchange) is used when two
 systems need to automatically setup a pair of Security Associations
-(SAs) for securely communicating using IPsec. IKE operates in two
-stages:
+(SAs) for securely communicating using IPsec.
+IKE operates in two stages:
 .Pp
 In the first stage (Main or Identity Protection Mode), the two IKE
 daemons establish a secure link between themselves, fully
 authenticating each other and establishing key material for
-encrypting/authenticating future communications between them. This
-step is typically only performed once for every pair of IKE daemons.
+encrypting/authenticating future communications between them.
+This step is typically only performed once for every pair of IKE daemons.
 .Pp
 In the second stage (also called Quick Mode), the two IKE daemon
 create the pair of SAs for the parties that wish to communicate using
-IPsec. These parties may be the hosts the IKE daemons run on, a host
+IPsec.
+These parties may be the hosts the IKE daemons run on, a host
 and a network behind a firewall, or two networks behind their
-respective firewalls. At this stage, the exact parameters of the SAs
+respective firewalls.
+At this stage, the exact parameters of the SAs
 (e.g., algorithms to use, encapsulation mode, lifetime) and the
 identities of the communicating parties (hosts, networks, etc.) are
-specified. The reason of existance of Quick Mode is to allow for fast
+specified.
+The reason of existance of Quick Mode is to allow for fast
 SA setup, once the more heavy-weight Main Mode has been completed.
 Generally, Quick Mode uses the key material derived from Main Mode to
-provide keys to the IPsec transforms to be used. Alternatively, a new
+provide keys to the IPsec transforms to be used.
+Alternatively, a new
 Diffie-Hellman computation may be performed (significantly slowing
 down the exchange, but at the same time providing Perfect Forward
-Secrecy (PFS)). Briefly, this means that even should an attacker
+Secrecy (PFS)).
+Briefly, this means that even should an attacker
 manage to break long-term keys used in other sessions (or,
 specifically, if an attacker breaks the Diffie-Hellman exchange
 performed during Main Mode), they will not be able to decrypt this
-traffic. Normally, no PFS is provided (the key material used by the
+traffic.
+Normally, no PFS is provided (the key material used by the
 IPsec SAs established as a result of this exchange will be derived
 from the key material of the Main Mode exchange), allowing for a
 faster Quick Mode exchange (no public key computations).
 .Pp
 IKE proposals are "suggestions" by the initiator of an exchange to the
 responder as to what protocols and attributes should be used on a
-class of packets. For example, a given exchange may ask for ESP with
+class of packets.
+For example, a given exchange may ask for ESP with
 3DES and MD5 and AH with SHA1 (applied successively on the same
-packet), or just ESP with Blowfish and RIPEMD-160. The responder
+packet), or just ESP with Blowfish and RIPEMD-160.
+The responder
 examines the proposals and determines which of them are acceptable,
 according to policy and any credentials.
 .Pp
@@ -95,7 +103,8 @@ and
 man pages.
 .Pp
 In the KeyNote policy model for IPsec, no distinction is currently
-made based on the ordering of AH and ESP in the packet. Should this
+made based on the ordering of AH and ESP in the packet.
+Should this
 change in the future, an appropriate attribute (see below) will be
 added.
 .Pp
@@ -106,7 +115,8 @@ file), credentials provided during the IKE exchanges (or obtained
 through other means), the SA attributes proposed during the exchange,
 and perhaps other (side-channel) information, whether a pair of SAs
 should be installed in the system (in fact, whether both the IPsec SAs
-and the flows should be installed). For each proposal suggested by or
+and the flows should be installed).
+For each proposal suggested by or
 to the remote IKE daemon, the KeyNote system is consulted as to
 whether the proposal is acceptable based on local policy (contained in
 .Nm isakmpd.policy ,
@@ -173,8 +183,9 @@ prefix is necessary).
 KeyNote credentials have the same format as policy assertions, with
 one difference: the Authorizer field always contains a public key, and
 the assertion is signed (and thus its integrity can be
-cryptographically verified). Credentials are used to build chains of
-delegation of authority. They can be exchanged during an IKE exchange,
+cryptographically verified).
+Credentials are used to build chains of delegation of authority.
+They can be exchanged during an IKE exchange,
 or can be retrieved through some out-of-band mechanism (no such
 mechanism is currently supported in this implementation however).
 .Pp
@@ -184,7 +195,8 @@ string "passphrase:", followed by the passphrase itself
 .Pp
 When X509-based authentication is performed in Main Mode, any X509
 certificates received from the remote IKE daemon are converted to very
-simple KeyNote credentials. The conversion is straightforward: the
+simple KeyNote credentials.
+The conversion is straightforward: the
 issuer of the X509 certificate becomes the Authorizer of the KeyNote
 credential, the subject becomes the only Licensees entry, while the
 Conditions field simply asserts that the credential is only valid for
@@ -193,7 +205,8 @@ Conditions field simply asserts that the credential is only valid for
 Similarly, any X509 CA certificates present in the directory pointed
 to by the appropriate
 .Xr isakmpd.conf 5
-entry, are converted to such pseudo-credentials. This allows one to
+entry, are converted to such pseudo-credentials.
+This allows one to
 write KeyNote policies that delegate specific authority to CAs (and
 the keys those CAs certify, recursively).
 .Pp
@@ -202,12 +215,14 @@ For more details on KeyNote assertion format, see
 .Pp
 Information about the proposals, the identity of the remote IKE
 daemon, the packet classes to be protected, etc. are encoded in what
-is called an action set. The action set is composed of name-value
-attribute, similar in some way to a shell environment variables. These
-values are initialized by
+is called an action set.
+The action set is composed of name-value
+attribute, similar in some way to a shell environment variables.
+These values are initialized by
 .Nm isakmpd
 before each query to the KeyNote system, and can be tested against in
-the Conditions field of assertions. See
+the Conditions field of assertions.
+See
 .Xr keynote 4
 and
 .Xr keynote 5
@@ -216,20 +231,23 @@ for more details on the format and semantics of the Conditions field.
 Note that assertions and credentials can make reference to
 non-existant attributes without catastrophic failures (access may be
 denied, depending on the overall structure, but will not be
-accidentally granted). One reason for credentials referencing
+accidentally granted).
+One reason for credentials referencing
 non-existant attributes is that they were defined within a specific
 implementation or network only.
 .Pp
 In the following attribute set, IPv4 addresses are encoded as ASCII
-strings in the usual dotted-quad format. However, all quads are
-three digits long. For example, the IPv4 address
+strings in the usual dotted-quad format.
+However, all quads are three digits long.
+For example, the IPv4 address
 .Va 10.128.1.12
 would be encoded as
 .Va 010.128.001.012 .
 Similarly, IPv6 addresses are encoded in the standard x:x:x:x:x:x:x:x
 format, where the 'x's are the hexadecimal values of the eight 16-bit
-pieces of the address. All 'x's are four digits long. For example, the
-address
+pieces of the address.
+All 'x's are four digits long.
+For example, the address
 .Va 1080:0:12:0:8:800:200C:417A
 would be encoded as
 .Va 1080:0000:0012:0000:0008:0800:200C:417A .
@@ -266,8 +284,8 @@ One of
 .Va sha ,
 or
 .Va des ,
-based on the hash algorithm specified in the AH proposal. This
-attribute describes the generic transform to be used in the AH
+based on the hash algorithm specified in the AH proposal.
+This attribute describes the generic transform to be used in the AH
 authentication.
 .It esp_enc_alg
 One of
@@ -311,12 +329,14 @@ or
 based on the authentication method specified in the ESP proposal.
 .It ah_life_seconds, esp_life_seconds, comp_life_seconds
 Set to the lifetime of the AH, ESP, and compression proposal, in
-seconds. If no lifetime was proposed for the corresponding protocol
+seconds.
+If no lifetime was proposed for the corresponding protocol
 (e.g., there was no proposal for AH), the corresponding attribute will
 be set to zero.
 .It ah_life_kbytes, esp_life_kbytes, comp_life_kbytes
 Set to the lifetime of the AH, ESP, and compression proposal, in
-kbytes of traffic. If no lifetime was proposed for the corresponding
+kbytes of traffic.
+If no lifetime was proposed for the corresponding
 protocol (e.g., there was no proposal for AH), the corresponding
 attribute will be set to zero.
 .It ah_encapsulation, esp_encapsulation, comp_encapsulation
@@ -340,7 +360,8 @@ respectively (for variable round algorithms).
 .It ah_group_desc, esp_group_desc, comp_group_desc
 The Diffie-Hellman group identifier from the AH, ESP, and compression
 proposal, used for PFS during Quick Mode (see the pfs attribute
-above). If more than one of these attributes are set to a value other
+above).
+If more than one of these attributes are set to a value other
 than zero, they should have the same value (in valid IKE proposals).
 .It remote_filter_type, local_filter_type, remote_id_type
 Set to
@@ -363,11 +384,13 @@ When the corresponding filter_type is
 .Va IPv4 address
 or
 .Va IPv6 address ,
-these contain the respective address. For
+these contain the respective address.
+For
 .Va IPv4 range
 or
 .Va IPv6 range ,
-they contain the upper end of the address range. For
+they contain the upper end of the address range.
+For
 .Va IPv4 subnet
 or
 .Va IPv6 subnet ,
@@ -377,11 +400,13 @@ When the corresponding filter_type is
 .Va IPv4 address
 or
 .Va IPv6 address ,
-these contain the respective address. For
+these contain the respective address.
+For
 .Va IPv4 range
 or
 .Va IPv6 range ,
-these contain the lower end of the address range. For
+these contain the lower end of the address range.
+For
 .Va IPv4 subnet
 or
 .Va IPv6 subnet ,
@@ -390,8 +415,8 @@ these contain the lowest address in the specified subnet.
 When the corresponding filter_type specifies an address (or range, or
 subnet), theseares set to the upper and lower part of the address
 space separated by a dash ('-') character (if the type specifies a
-single address, both parts are set to the same address). For FQDN and
-User FQDN types, these are set to the respective string.
+single address, both parts are set to the same address).
+For FQDN and User FQDN types, these are set to the respective string.
 .It remote_filter_port, local_filter_port, remote_id_port
 Set to the transport protocol port.
 .It remote_filter_proto, local_filter_proto, remote_id_proto
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 01aaae73300..c9e3e005f76 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: biff.1,v 1.9 2000/03/04 21:12:00 aaron Exp $
+.\"	$OpenBSD: biff.1,v 1.10 2000/03/23 21:39:53 aaron Exp $
 .\"	$NetBSD: biff.1,v 1.3 1995/03/26 02:34:21 glass Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -87,4 +87,5 @@ The
 command appeared in
 .Bx 4.0 .
 .Qq Biff
-was Heidi Stettner's dog. He died in August 1993, at 15.
+was Heidi Stettner's dog.
+He died in August 1993, at 15.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index ac075ee0a09..2ecad206b7b 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.12 2000/03/04 21:12:01 aaron Exp $
+.\"	$OpenBSD: calendar.1,v 1.13 2000/03/23 21:39:53 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -85,8 +85,8 @@ instead of using the current date.
 .Pp
 To handle calendars in your national code table you can specify
 .Dq LANG=<locale_name>
-in the calendar file as early as possible. To handle national Easter
-names in the calendars,
+in the calendar file as early as possible.
+To handle national Easter names in the calendars,
 .Dq Easter=<national_name>
 (for Catholic Easter) or
 .Dq Paskha=<national_name>
diff --git a/usr.bin/elf2ecoff/elf2ecoff.1 b/usr.bin/elf2ecoff/elf2ecoff.1
index ab111a8198c..4b1c04c7037 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.1
+++ b/usr.bin/elf2ecoff/elf2ecoff.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: elf2ecoff.1,v 1.6 1999/07/04 11:53:53 aaron Exp $
+.\"	$OpenBSD: elf2ecoff.1,v 1.7 2000/03/23 21:39:53 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Per Fogelstrom
 .\"
@@ -48,8 +48,8 @@ to ecoff format, into file
 .Ar ecoffexec ,
 suitable for bootstrapping certain
 .Nm MIPS
-systems. Systems requiring this
-conversion are the
+systems.
+Systems requiring this conversion are the
 .Nm arc
 and
 .Nm pmax .
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index c46dff0b828..bfdba15d214 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: magic.5,v 1.4 2000/03/06 02:38:19 aaron Exp $
+.\" $OpenBSD: magic.5,v 1.5 2000/03/23 21:39:53 aaron Exp $
 .\"
 .\" @(#)$FreeBSD: src/usr.bin/file/magic.5,v 1.11 2000/03/01 12:19:39 sheldonh Exp $
 .\"
@@ -14,7 +14,8 @@
 This manual page documents the format of the magic file as
 used by the
 .Xr file 1
-command, version 3.22. The
+command, version 3.22.
+The
 .Nm file
 command identifies the type of a file using,
 among other tests,
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 2896b8bb77a..5daf89b673b 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: indent.1,v 1.8 2000/03/08 03:11:27 aaron Exp $
+.\"	$OpenBSD: indent.1,v 1.9 2000/03/23 21:39:53 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" Copyright (c) 1985 Sun Microsystems, Inc.
@@ -391,7 +391,8 @@ turns it off.
 When in verbose mode,
 .Nm
 reports when it splits one line of input into two or more lines of output,
-and gives some size statistics at completion. The default is
+and gives some size statistics at completion.
+The default is
 .Fl \&nv .
 .El
 .Pp
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 905c3396f04..ce09187148c 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: last.1,v 1.13 2000/03/08 03:11:30 aaron Exp $
+.\"	$OpenBSD: last.1,v 1.14 2000/03/23 21:39:53 aaron Exp $
 .\"	$NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -51,7 +51,7 @@
 .Op Ar user ...
 .Sh DESCRIPTION
 The
-.Nm last
+.Nm
 utility will either (1) list the sessions of specified
 .Ar users ,
 .Ar ttys ,
@@ -66,7 +66,7 @@ hostname, the start and stop times for the session, and the duration
 of the session.
 If the session is still continuing or was cut short by
 a crash or shutdown,
-.Nm last
+.Nm
 will so indicate.
 .Pp
 The options are as follows:
@@ -74,7 +74,7 @@ The options are as follows:
 .It Fl c
 Calculates the total time displayed and prints it after the output.
 .It Fl f Ar file
-.Nm last
+.Nm
 reads the file
 .Ar file
 instead of the default,
@@ -161,9 +161,9 @@ arguments is printed, e.g.,
 .Ic last root -t console
 would list all of
 .Li root Ns 's
-sessions as well as all sessions on the console terminal. If no
-users, hostnames, or terminals are specified,
-.Nm last
+sessions as well as all sessions on the console terminal.
+If no users, hostnames, or terminals are specified,
+.Nm
 prints a record of
 all logins and logouts.
 .Pp
@@ -174,11 +174,11 @@ logs in at reboots of the system; thus
 will give an indication of mean time between reboot.
 .Pp
 If
-.Nm last
+.Nm
 is interrupted, it indicates to what date the search has
 progressed.
 If interrupted with a quit signal
-.Nm last
+.Nm
 indicates how
 far the search has progressed and then continues.
 .Sh FILES
@@ -192,6 +192,6 @@ login data base
 .Xr ac 8
 .Sh HISTORY
 The
-.Nm last
+.Nm
 command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 64b53305d53..d07721e07f5 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: leave.1,v 1.6 2000/03/08 03:11:31 aaron Exp $
+.\"	$OpenBSD: leave.1,v 1.7 2000/03/23 21:39:54 aaron Exp $
 .\"	$NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -82,7 +82,8 @@ from the current time.
 If no argument is given,
 .Nm leave
 prompts with "When do you
-have to leave?". A reply of newline causes
+have to leave?".
+A reply of newline causes
 .Nm leave
 to exit,
 otherwise the reply is assumed to be a time.
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index b7e2436b0f2..a5fc813724a 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.12 2000/03/08 03:11:31 aaron Exp $
+.\"	$OpenBSD: locate.1,v 1.13 2000/03/23 21:39:54 aaron Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.12 2000/03/08 03:11:31 aaron Exp $
+.\"	$Id: locate.1,v 1.13 2000/03/23 21:39:54 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -111,8 +111,8 @@ option adds the specified database to the list
 of databases to be searched.
 .Pp
 .Ar database
-may be a colon-separated list of databases. A single colon is a reference
-to the default database.
+may be a colon-separated list of databases.
+A single colon is a reference to the default database.
 .Pp
 $ locate -d $HOME/lib/mydb: foo
 .Pp
@@ -171,7 +171,9 @@ Use
 .Xr mmap 2
 instead of the
 .Xr stdio 3
-library. This is the default behavior. Usually faster in most cases.
+library.
+This is the default behavior.
+Usually faster in most cases.
 .It Fl s
 Use the
 .Xr stdio 3
@@ -238,7 +240,8 @@ appear in the database.
 .Pp
 The
 .Nm
-database is not byte order independent. It is not possible
+database is not byte order independent.
+It is not possible
 to share the databases between machines with different byte order.
 The current
 .Nm
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index fe1b710fe0f..8db08f37898 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.13 2000/03/23 21:10:17 aaron Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.14 2000/03/23 21:39:54 aaron Exp $
 .\"
 .\"
 .Dd January 26, 1993
@@ -239,7 +239,8 @@ stack for later retrieval by
 .It Ic regexp
 Finds a regular expression in a string.
 If no further arguments are given,
-it returns the first match position or \-1 if no match. If a third argument
+it returns the first match position or \-1 if no match.
+If a third argument
 is provided, it returns the replacement string, with sub-patterns replaced.
 .It Ic shift
 Returns all but the first argument, the remaining arguments are
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index c46d2a2f90e..26ed1e82d76 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rusers.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
+.\"	$OpenBSD: rusers.1,v 1.7 2000/03/23 21:39:54 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -48,10 +48,11 @@ The
 .Nm
 command produces output similar to
 .Xr who 1 ,
-but for the list of hosts or all machines on the local
-network. For each host responding to the rusers query,
+but for the list of hosts or all machines on the local network.
+For each host responding to the rusers query,
 the hostname with the names of the users currently logged
-on is printed on each line. The
+on is printed on each line.
+The
 .Nm
 command will wait for
 one minute to catch late responders.
@@ -61,7 +62,8 @@ The options are as follows:
 .It Fl a
 Print all machines responding even if no one is currently logged in.
 .It Fl l
-Print a long format listing. This includes the user name, host name,
+Print a long format listing.
+This includes the user name, host name,
 tty that the user is logged in to, the date and time the user
 logged in, the amount of time since the user typed on the keyboard,
 and the remote host they logged in from (if applicable).
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 142edb332c5..0a581013539 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rwall.1,v 1.4 2000/03/10 20:17:51 aaron Exp $
+.\"	$OpenBSD: rwall.1,v 1.5 2000/03/23 21:39:54 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -46,8 +46,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command sends a message to the users logged into the specified host. The
-message to be sent can be typed in and terminated with EOF or it can
+command sends a message to the users logged into the specified host.
+The message to be sent can be typed in and terminated with EOF or it can
 be in a
 .Ar file .
 .Sh DIAGNOSTICS
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index df42b2039c6..a1429fddf2f 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: showmount.8,v 1.8 2000/03/10 20:17:52 aaron Exp $
+.\"	$OpenBSD: showmount.8,v 1.9 2000/03/23 21:39:54 aaron Exp $
 .\"	$NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -56,7 +56,8 @@ server on
 By default it prints the names of all hosts that have
 .Tn NFS
 file systems mounted
-on the host. See
+on the host.
+See
 .%T "NFS: Network File System Protocol Specification" ,
 RFC 1094,
 Appendix A,
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index 27b55917a5c..e725db297d8 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skey.1,v 1.19 2000/03/10 20:17:52 aaron Exp $
+.\" $OpenBSD: skey.1,v 1.20 2000/03/23 21:39:54 aaron Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
 .Dd October 28, 1993
@@ -20,8 +20,10 @@
 .Sh DESCRIPTION
 .Nm S/key
 is a procedure for using one-time passwords to authenticate access to
-computer systems. It uses 64 bits of information transformed by the
-MD4, MD5, SHA1, or RIPEMD-160 algorithms. The user supplies the 64 bits
+computer systems.
+It uses 64 bits of information transformed by the
+MD4, MD5, SHA1, or RIPEMD-160 algorithms.
+The user supplies the 64 bits
 in the form of 6 English words that are generated by a secure computer.
 This implementation of
 .Nm s/key
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 971d9df2b09..0c5f50d0986 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: skeyinit.1,v 1.16 2000/03/23 21:10:19 aaron Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.17 2000/03/23 21:39:55 aaron Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
@@ -22,7 +22,8 @@
 .Nm
 initializes the system so you can use S/Key one-time passwords to login.
 The program will ask you to enter a secret pass phrase;
-enter a phrase of several words in response. After the S/Key database
+enter a phrase of several words in response.
+After the S/Key database
 has been updated you can login using either your regular password
 or using S/Key one-time passwords.
 .Pp
@@ -91,8 +92,8 @@ Selects SHA (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
 .It Fl rmd160
 Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
 .It Ar user
-The username to be changed/added. By default the current user is
-operated on.
+The username to be changed/added.
+By default the current user is operated on.
 .Sh ERRORS
 .Bl -tag -width "skey disabled"
 .It skey disabled
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 1d3f13d05fd..5800fb1ed90 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: ssh.1,v 1.41 2000/03/23 21:11:38 aaron Exp $
+.\" $Id: ssh.1,v 1.42 2000/03/23 21:39:55 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH 1
@@ -287,8 +287,8 @@ host key is not known or has changed.
 .Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl a
-Disables forwarding of the authentication agent connection. This may
-also be specified on a per-host basis in the configuration file.
+Disables forwarding of the authentication agent connection.
+This may also be specified on a per-host basis in the configuration file.
 .It Fl c Ar blowfish|3des
 Selects the cipher to use for encrypting the session. 
 .Ar 3des
@@ -342,8 +342,8 @@ It is possible to have multiple
 options (and multiple identities specified in
 configuration files).
 .It Fl k
-Disables forwarding of Kerberos tickets and AFS tokens. This may
-also be specified on a per-host basis in the configuration file.
+Disables forwarding of Kerberos tickets and AFS tokens.
+This may also be specified on a per-host basis in the configuration file.
 .It Fl l Ar login_name
 Specifies the user to log in as on the remote machine.
 This also may be specified on a per-host basis in the configuration file.
@@ -514,8 +514,8 @@ The host is the
 argument given on the command line (i.e., the name is not converted to
 a canonicalized host name before matching).
 .It Cm AFSTokenPassing
-Specifies whether to pass AFS tokens to remote host. The argument to 
-this keyword must be
+Specifies whether to pass AFS tokens to remote host.
+The argument to this keyword must be
 .Dq yes
 or
 .Dq no .
@@ -534,7 +534,8 @@ If this flag is set to
 .Dq yes ,
 ssh will additionally check the host ip address in the
 .Pa known_hosts
-file. This allows ssh to detect if a host key changed due to DNS spoofing.
+file.
+This allows ssh to detect if a host key changed due to DNS spoofing.
 If the option is set to
 .Dq no ,
 the check will not be executed.
@@ -657,15 +658,15 @@ To disable keepalives, the value should be set to
 .Dq no
 in both the server and the client configuration files.
 .It Cm KerberosAuthentication
-Specifies whether Kerberos authentication will be used. The argument to 
-this keyword must be
+Specifies whether Kerberos authentication will be used.
+The argument to this keyword must be
 .Dq yes
 or
 .Dq no .
 .It Cm KerberosTgtPassing
-Specifies whether a Kerberos TGT will be forwarded to the server. This
-will only work if the Kerberos server is actually an AFS kaserver. The
-argument to this keyword must be
+Specifies whether a Kerberos TGT will be forwarded to the server.
+This will only work if the Kerberos server is actually an AFS kaserver.
+The argument to this keyword must be
 .Dq yes
 or
 .Dq no .
@@ -684,8 +685,9 @@ The possible values are:
 QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG.
 The default is INFO.
 .It Cm NumberOfPasswordPrompts
-Specifies the number of password prompts before giving up. The
-argument to this keyword must be an integer. Default is 3.
+Specifies the number of password prompts before giving up.
+The argument to this keyword must be an integer.
+Default is 3.
 .It Cm PasswordAuthentication
 Specifies whether to use password authentication.
 The argument to this keyword must be
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index e1b085f02f4..d3bf7dc0b37 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systat.1,v 1.17 2000/03/23 21:10:19 aaron Exp $
+.\"	$OpenBSD: systat.1,v 1.18 2000/03/23 21:39:55 aaron Exp $
 .\"	$NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -333,7 +333,8 @@ by device basis.
 Only devices that have interrupted at least once since boot time are shown.
 .Pp
 Below the SWAPPING display and slightly to the left of the Interrupts
-display is a list of virtual memory statistics. The abbreviations are:
+display is a list of virtual memory statistics.
+The abbreviations are:
 .Bl -tag -compact -width XXXXXX -offset indent
 .It cow
 copy-on-write faults
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 2e1b17aed8c..ae0fa342add 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talk.1,v 1.10 2000/03/11 21:40:04 aaron Exp $
+.\"	$OpenBSD: talk.1,v 1.11 2000/03/23 21:39:55 aaron Exp $
 .\"	$NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -79,8 +79,8 @@ talk: connection requested by your_name@your_machine.
 talk: respond with: talk your_name@your_machine
 .Ed
 .Pp
-to the user you wish to talk to. At this point, the recipient
-of the message should reply by typing
+to the user you wish to talk to.
+At this point, the recipient of the message should reply by typing
 .Pp
 .Dl talk \ your_name@your_machine
 .Pp
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 5119e67faf6..6bbdc3a7c13 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.22 2000/03/11 21:40:04 aaron Exp $
+.\"	$OpenBSD: telnet.1,v 1.23 2000/03/23 21:39:55 aaron Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -311,7 +311,8 @@ When in command mode, the normal terminal editing conventions are available.
 Note that the escape character will return to the command mode of the initial
 invocation of
 .Nm
-that has the controlling terminal. Use the
+that has the controlling terminal.
+Use the
 .Cm send escape
 command to switch to command mode in subsequent
 .Nm
@@ -1147,7 +1148,8 @@ commands.
 .It Ic skey Ar sequence challenge
 The
 .Ic skey
-command computes a response to the S/Key challenge. See
+command computes a response to the S/Key challenge.
+See
 .Xr skey 1
 for more information on the S/Key system.
 .It Ic slc Ar state
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 3c872537c71..6695cbd21d1 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.9 2000/03/14 14:58:25 aaron Exp $
+.\"	$OpenBSD: wc.1,v 1.10 2000/03/23 21:39:55 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -98,7 +98,8 @@ A pathname of an input file.
 .El
 .Pp
 If no file names are specified, the standard input is used
-and a file name is not output. The resulting output is one
+and a file name is not output.
+The resulting output is one
 line of the requested count(s) with the cumulative sum
 of all files read in via standard input.
 .Pp
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 6d54e16d7cd..c400c0286be 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: who.1,v 1.10 2000/03/14 14:58:26 aaron Exp $
+.\"	$OpenBSD: who.1,v 1.11 2000/03/23 21:39:56 aaron Exp $
 .\"	$NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -64,7 +64,8 @@ way of saying
 .Ar am i .
 .It Fl q
 (Quick.) List only the names and the number of users currently
-logged on. When this option is used, all other options are ignored.
+logged on.
+When this option is used, all other options are ignored.
 .It Fl T
 Print a character after the user name indicating the state of the
 terminal line:
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 187e3534caa..9a07e4a82b5 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.13 2000/03/14 14:58:26 aaron Exp $
+.\"	$OpenBSD: whois.1,v 1.14 2000/03/23 21:39:56 aaron Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -89,7 +89,8 @@ domains.
 .It Fl m
 Use the Route Arbiter Database
 .Pq Tn RADB
-database. It contains route policy specifications for a large
+database.
+It contains route policy specifications for a large
 number of operators' networks.
 .It Fl p
 Use the Asia/Pacific Network Information Center
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 109c06ed7f7..bfc15fd627a 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: install.1,v 1.11 2000/03/14 14:58:27 aaron Exp $
+.\"	$OpenBSD: install.1,v 1.12 2000/03/23 21:39:56 aaron Exp $
 .\"	$NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -91,7 +91,8 @@ The options are as follows:
 .It Fl b
 Backup any existing files before overwriting them by renaming
 them to
-.Ar file.old . See
+.Ar file.old .
+See
 .Fl B
 for specifying a different backup suffix.
 .It Fl B Ar suffix
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 262ebb7114e..e05f5c50fd8 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.10 2000/03/14 14:58:27 aaron Exp $
+.\"	$OpenBSD: yacc.1,v 1.11 2000/03/23 21:39:56 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -100,7 +100,8 @@ will not insert the #line directives.
 The
 .Fl o
 option specifies an explicit name for the parser's output file name instead
-of the default. The names of the other output files are constructed from
+of the default.
+The names of the other output files are constructed from
 .Pa output_file
 as described under the
 .Fl d
diff --git a/usr.sbin/cron/crontab.1 b/usr.sbin/cron/crontab.1
index b0d06cb6efe..a838ac7e426 100644
--- a/usr.sbin/cron/crontab.1
+++ b/usr.sbin/cron/crontab.1
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.1,v 1.6 2000/03/19 17:57:03 aaron Exp $
+.\" $Id: crontab.1,v 1.7 2000/03/23 21:39:57 aaron Exp $
 .\"
 .Dd June 8, 1999
 .Dt CRONTAB 1
@@ -39,7 +39,8 @@
 is the program used to install, deinstall, or list the tables
 used to drive the
 .Xr cron 8
-daemon in Vixie Cron. Each user can have their own
+daemon in Vixie Cron.
+Each user can have their own
 .Xr crontab 5 ,
 and though these are files in
 .Pa /var/cron/tabs ,
@@ -72,7 +73,8 @@ option is given,
 specifies the name of the user whose
 .Xr crontab 5
 is to be
-tweaked. If this option is not given,
+tweaked.
+If this option is not given,
 .Nm
 examines
 .Dq your
@@ -109,8 +111,8 @@ the
 .Ev VISUAL
 or
 .Ev EDITOR
-environment variables. After you exit
-from the editor, the modified
+environment variables.
+After you exit from the editor, the modified
 .Xr crontab 5
 will be installed automatically.
 .Sh FILES
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index e3e716d070d..6827b74a2c7 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.7 2000/03/23 21:39:57 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,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.
 .\"
-.\" @(#) $OpenBSD: mopa.out.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.7 2000/03/23 21:39:57 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
@@ -45,7 +45,8 @@ is used to convert an a.out file to a MOP-image.
 .Pp
 This program will check if
 .Xr a.out 5
-machine-id is recognized. If not it will try to swap the
+machine-id is recognized.
+If not it will try to swap the
 .Xr a.out 5
 header, and try again.
 .Sh BUGS
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 3869f1b7f18..c2aa8dbe5ac 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.conf.5,v 1.4 2000/03/14 21:31:38 aaron Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.5 2000/03/23 21:39:57 aaron Exp $
 .\" 
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -68,7 +68,8 @@ There are two items to control interval of sending router advertisements.
 (num) The maximum time allowed between sending unsolicited
 multicast router advertisements
 .Pq unit: seconds .
-The default value is 600. Its value must be no less than 4 seconds
+The default value is 600.
+Its value must be no less than 4 seconds
 and no greater than 1800 seconds.
 .It Cm \&mininterval
 (num) The minimum time allowed between sending unsolicited multicast
@@ -178,7 +179,8 @@ which will be attached to router advertisement header.
 .It Cm \&mtu
 (num or str) MTU (maximum transmission unit) field.
 If 0 is specified, it means that the option will not be included.
-The default value is 0. If the special string
+The default value is 0.
+If the special string
 .Dq auto
 is specified for this item, MTU option will be included and its value
 will be set to the interface MTU automatically.
diff --git a/usr.sbin/sesd/getencstat/getencstat.8 b/usr.sbin/sesd/getencstat/getencstat.8
index 82d993e9e58..6259bfd9cf3 100644
--- a/usr.sbin/sesd/getencstat/getencstat.8
+++ b/usr.sbin/sesd/getencstat/getencstat.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: $
-.\"	$OpenBSD: getencstat.8,v 1.1 2000/02/21 08:45:14 mjacob Exp $
+.\"	$OpenBSD: getencstat.8,v 1.2 2000/03/23 21:39:57 aaron Exp $
 .\"	$FreeBSD: $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
@@ -46,21 +46,24 @@
 .Sh DESCRIPTION
 .Nm
 gets summary and detailed SCSI Environmental Services (or SAF-TE) device
-enclosure status. The overall status is printed out. If the overall status
+enclosure status.
+The overall status is printed out.
+If the overall status
 is considered okay, nothing else is printed out (unless the the
 .Fl v
 option is used).
 .Pp
 A SCSI Environmental Services device enclosure may be either in the state
 of being \fBOK\fR, or in one or more of the states of \fBINFORMATIONAL\fR,
-\fBNON-CRITICAL\fR, \fBCRITICAL\fB or \fBUNRECOVERABLE\fR states. These
-overall states reflect a summary of the states of each object within
+\fBNON-CRITICAL\fR, \fBCRITICAL\fB or \fBUNRECOVERABLE\fR states.
+These overall states reflect a summary of the states of each object within
 such a device (such as power supplies or disk drives).
 .Pp
 With the
 .Fl v
 option, the status of all objects within the device is printed, whether
-\fBOK\fR or not. Along with the status of each object is the object identifier.
+\fBOK\fR or not.
+Along with the status of each object is the object identifier.
 .Pp
 The user may then use
 .Xr setencstat 8
diff --git a/usr.sbin/sesd/setobjstat/setobjstat.8 b/usr.sbin/sesd/setobjstat/setobjstat.8
index 00397113f47..3979b39f378 100644
--- a/usr.sbin/sesd/setobjstat/setobjstat.8
+++ b/usr.sbin/sesd/setobjstat/setobjstat.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: $
-.\"	$OpenBSD: setobjstat.8,v 1.1 2000/02/21 08:45:15 mjacob Exp $
+.\"	$OpenBSD: setobjstat.8,v 1.2 2000/03/23 21:39:57 aaron Exp $
 .\"	$FreeBSD: $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
@@ -50,9 +50,9 @@ argument may be determined by running
 .Xr getencstat 8 .
 .Pp
 The status fields are partially common (first byte only, which must
-have a value of 0x80 contained in it), but otherwise quite device
-specific. A complete discussion of the possible values is impractical
-here. Please refer to the ANSI SCSI specification (available on
+have a value of 0x80 contained in it), but otherwise quite device specific.
+A complete discussion of the possible values is impractical here.
+Please refer to the ANSI SCSI specification (available on
 the FTP site ftp.t10.org).
 .Pp
 Note that devices may simply and silently ignore the setting of these values.
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index d1d733c1a75..708213bbf6e 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute.8,v 1.17 2000/03/19 17:57:16 aaron Exp $
+.\"	$OpenBSD: traceroute.8,v 1.18 2000/03/23 21:39:57 aaron Exp $
 .\"	$NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -111,7 +111,8 @@ Change the protocol being used from
 .Tn UDP
 to a numeric protocol or a name as specified in
 .Pa /etc/protocols .
-This will not work reliably for most protocols. If set to 1 (ICMP), then
+This will not work reliably for most protocols.
+If set to 1 (ICMP), then
 ICMP Echo Request messages will be used (same as
 .Xr ping 8
 ).
@@ -140,9 +141,8 @@ If something is
 listening on a port in the default range, this option can be used
 to pick an unused port range.
 .It Fl c
-Do not increment the destination port number in successive UDP
-packets. Rather, all UDP packets will have the same destination port,
-as set via the
+Do not increment the destination port number in successive UDP packets.
+Rather, all UDP packets will have the same destination port, as set via the
 .Fl p
 flag (or 33434 if none is specified).
 .It Fl q Ar nqueries
diff --git a/usr.sbin/ypserv/mknetid/netid.5 b/usr.sbin/ypserv/mknetid/netid.5
index 147e2391377..d80593e70dc 100644
--- a/usr.sbin/ypserv/mknetid/netid.5
+++ b/usr.sbin/ypserv/mknetid/netid.5
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: netid.5,v 1.6 1999/06/05 22:18:25 aaron Exp $
+.\"	$OpenBSD: netid.5,v 1.7 2000/03/23 21:39:57 aaron Exp $
+.\"
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -39,12 +40,14 @@ network credential file
 .Sh DESCRIPTION
 Files in
 .Xr netid 5
-format are rare. One lives in the
+format are rare.
+One lives in the
 .Nm YP
 map
 .Dq netid.byname .
-The format is rather simple. Each row consists of two
-items, a key and a value. When created by
+The format is rather simple.
+Each row consists of two items: a key and a value.
+When created by
 .Xr mknetid 8
 there are three types of records.
 .Pp
diff --git a/usr.sbin/ypserv/ypserv/securenet.5 b/usr.sbin/ypserv/ypserv/securenet.5
index 2edf9416c26..080d24b7f56 100644
--- a/usr.sbin/ypserv/ypserv/securenet.5
+++ b/usr.sbin/ypserv/ypserv/securenet.5
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: securenet.5,v 1.6 1999/06/05 22:18:32 aaron Exp $
+.\"	$OpenBSD: securenet.5,v 1.7 2000/03/23 21:39:58 aaron Exp $
+.\"
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -43,8 +44,10 @@ file controls which hosts can connect to the
 .Nm YP
 server.
 .Pp
-The format is rather simple. Each row consists of two items. The first item
-is the network mask. The second item is the network.
+The format is rather simple.
+Each row consists of two items.
+The first item is the network mask.
+The second item is the network.
 .Sh EXAMPLES
 A configuration file might look like the following:
 .Bd -literal
diff --git a/usr.sbin/ypserv/ypserv/ypserv.acl.5 b/usr.sbin/ypserv/ypserv/ypserv.acl.5
index 00654efd858..9f28f75467c 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.acl.5
+++ b/usr.sbin/ypserv/ypserv/ypserv.acl.5
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: ypserv.acl.5,v 1.10 1999/07/09 13:35:53 aaron Exp $
+.\"	$OpenBSD: ypserv.acl.5,v 1.11 2000/03/23 21:39:58 aaron Exp $
+.\"
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -59,8 +60,9 @@ hosts.
 .Pp
 The
 .Nm YP
-server reads the configuration file and builds a list in memory. This list
-is processed from the beginning for every incomming request. As soon a
+server reads the configuration file and builds a list in memory.
+This list is processed from the beginning for every incomming request.
+As soon a
 match is found in the list the search terminates and it returns success
 or failure depending on which of
 .Nm allow
@@ -77,7 +79,8 @@ Don't forget to allow localhost access if you want the machine running
 .Nm ypserv
 to be able to access it too.
 .Pp
-There is no default name for this file. Start
+There is no default name for this file.
+Start
 .Nm ypserv
 with a
 .Fl a Ar filename
-- 
2.20.1