13 files changed, 106 insertions, 80 deletions
diff --git a/lib/libc/net/link_addr.3 b/lib/libc/net/link_addr.3
index 7be9920cd58..d0283fa1ce2 100644
--- a/lib/libc/net/link_addr.3
+++ b/lib/libc/net/link_addr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link_addr.3,v 1.3 1999/05/10 17:56:29 aaron Exp $
+.\"	$OpenBSD: link_addr.3,v 1.4 1999/05/15 02:17:59 aaron Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -91,8 +91,8 @@ low order bytes through high order bytes.
 .\" .Pp
 Thus
 .Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
+represents an Ethernet address
+to be transmitted on the first Lance Ethernet interface.
 .Sh RETURN VALUES
 .Fn link_ntoa
 always returns a null terminated string.
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index a61be0d8460..68ec6213e4b 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.3,v 1.14 1999/02/04 01:08:31 deraadt Exp $
+.\"	$OpenBSD: rpc.3,v 1.15 1999/05/15 02:18:00 aaron Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .Dd February 16, 1988
@@ -266,7 +266,7 @@ waits for more replies; otherwise it returns with appropriate
 status.
 .IP
 Warning: broadcast sockets are limited in size to the
-maximum transfer unit of the data link. For ethernet,
+maximum transfer unit of the data link. For Ethernet,
 this value is 1500 bytes.
 .Pp
 .Fn clnt_call
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 77dcc5fea69..b77ec4c2913 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.21 1999/03/10 21:25:28 pjanzen Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.22 1999/05/15 02:17:52 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 $
 .\"
@@ -316,7 +316,7 @@ Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect; however,
 they are in general used to select special modes of operation. An example
 of this is to enable SLIP compression, or to select the connector type
-for some ethernet cards.  Refer to the man page for the specific driver
+for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
 .ne 1i
 .It Fl link[0-2]
diff --git a/sbin/ipnat/ipnat.8 b/sbin/ipnat/ipnat.8
index 869800c0818..70a6209ac2b 100644
--- a/sbin/ipnat/ipnat.8
+++ b/sbin/ipnat/ipnat.8
@@ -9,8 +9,12 @@
 .Op Fl CFlnrsv
 .Op Fl f Ar filename
 .Sh DESCRIPTION
-.Nm ipnat
-provides control over the kernel's network address translation (NAT). The NAT remaps IP addresses from one range to another. In other words, when properly configured on a gateway, the NAT provides internet access to connected computers lacking officially assigned IP addresses. It is discussed in RFC 1631.
+.Nm
+provides control over the kernel's network address translation (NAT). The NAT
+remaps IP addresses from one range to another. In other words, when properly
+configured on a gateway, the NAT provides Internet access to connected
+computers lacking officially assigned IP addresses. It is discussed in RFC
+1631.
 .Pp
 Options are as follows:
 .Bl -tag -width Ds
@@ -27,15 +31,15 @@ Remove, rather than add, entries specified in the rule list.
 .It Fl s
 Display statistics.
 .It Fl v
-Verbosity, displays detailed information pertaining to rule processing. 
+Verbosity. Displays detailed information pertaining to rule processing. 
 .El
 .Pp
 Certain configuration requirements must be met before
-.Nm ipnat
+.Nm
 will work. These are listed in
 .Pa /usr/share/ipf/nat.2 .
 .Pp
-.Nm ipnat
+.Nm
 operates on a list of rules, specified by 
 .Ar filename .
 This file is typically 
@@ -43,17 +47,22 @@ This file is typically
 stdin is represented by "\-". Each rule is parsed, then sequentially added to
 the kernel's internal NAT list. Like 
 .Xr ipf 8 ,
-if an entry contradicts another previously added, the newer will take precedence. 
-.Pp
-Comments (beginning with a ``#'') and blank lines are ignored as
-.Nm ipnat
-parses the file. Entries may be separated by spaces or tabs. Each rule must begin with either
+if an entry contradicts another previously added, the newer will take
+precedence.
+.Pp
+Comments (beginning with a
+.Dq # )
+and blank lines are ignored as
+.Nm
+parses the file. Entries may be separated by spaces or tabs. Each rule must
+begin with either
 .Em map
 or
 .Em rdr .  
 .Pp
 .Em map 
-tells the NAT how a range of addresses should be translated. The entries use the following format:
+tells the NAT how a range of addresses should be translated. The entries use
+the following format:
 .Pp
 .Bd -unfilled -offset indent -compact
 map ifname internal/mask -> external/mask options
@@ -61,11 +70,17 @@ map ifname internal/mask -> external/mask options
 .Pp
 The
 .Em ifname 
-field is the interface to which packets are sent. A gateway with a PPP link would probably use ``ppp0'' or ``tun0'', while an ethernet connection would instead have the name of its device. 
+field is the interface to which packets are sent. A gateway with a PPP link
+would probably use
+.Dq ppp0
+or
+.Dq tun0 ,
+while an Ethernet connection would instead have the name of its device.
 .Pp
 The address range of the LAN goes in the
 .Em internal
-field. This is usually one of the three blocks of address space the Internet Assigned Numbers Authority has allocated for private networks (RFC 1597):
+field. This is usually one of the three blocks of address space the Internet
+Assigned Numbers Authority has allocated for private networks (RFC 1597):
 .Pp
 .Bd -unfilled -offset indent -compact
 10.0.0.0    - 10.255.255.255
@@ -78,7 +93,8 @@ The
 address is the offically assigned IP number of the gateway or network.
 .Pp
 .Em mask
-is the netmask of the address. This mask is 32 bits long, and is divided into four 8 bit numbers.
+is the netmask of the address. This mask is 32 bits long, and is divided into
+four 8-bit numbers.
 .Pp
 .Bd -unfilled -offset indent -compact
 11111111.0.0.0				Class A - 8 bits set.
@@ -92,21 +108,26 @@ Both
 .Em internal 
 and 
 .Em external
-may be an actual IP address, a hostname, or the name of an interface. If it is a network number, however, a problem may arise. For example:
+may be an actual IP address, a hostname, or the name of an interface. If it is
+a network number, however, a problem may arise. For example:
 .Pp
 .Bd -unfilled -offset indent -compact
 map ppp0 10.0.0.0/8 -> 209.1.2.0/24
 .Ed
 .Pp
-16,000,000 IP addresses are being squeezed into an address space of only 254. This is solved by the
+16,000,000 IP addresses are being squeezed into an address space of only 254.
+This is solved by the
 .Em portmap 
-option, which remaps ports instead of IP addresses. The protocol is specified by following the option with either
+option, which remaps ports instead of IP addresses. The protocol is specified
+by following the option with either
 .Em tcp , 
 .Em udp ,
 .Em tcp/udp ,
 or 
 .Em tcpudp
-(the last two have the same effect). The syntax to assign a range of ports is ``portnumber:portnumber''. This looks like:
+(the last two have the same effect). The syntax to assign a range of ports is
+.Dq portnumber:portnumber .
+This looks like:
 .Pp
 .Bd -unfilled -offset indent -compact 
 map ppp0 10.0.0.0/8 -> 209.1.2.0/24 portmap tcp/udp 1025:65000
@@ -116,7 +137,9 @@ map ppp0 10.0.0.0/8 -> 209.1.2.0/24
 That will cut the number down from ~16,000,000 addresses short to only 527,566.
 .Pp
 .Em rdr
-tells the NAT how to redirect incoming packets. It is useful if one wishes to redirect a connection through a proxy, or to another box on the private network. The format of this directive is:
+tells the NAT how to redirect incoming packets. It is useful if one wishes to
+redirect a connection through a proxy, or to another box on the private
+network. The format of this directive is:
 .Pp
 rdr ifname external/mask port service -> internal port service protocol
 .Pp
@@ -126,7 +149,8 @@ This setup is best described by an example of an actual entry:
 rdr xl0 0.0.0.0/0 port 25 -> 204.213.176.10 port smtp 
 .Ed
 .Pp
-This redirects all smtp packets received on xl0 to 204.213.176.10, port 25. A netmask is not needed on the
+This redirects all smtp packets received on xl0 to 204.213.176.10, port 25. A
+netmask is not needed on the
 .Em internal
 address; it is always 32. The 
 .Em external
@@ -149,15 +173,15 @@ or
 .Bl -tag -width /usr/share/ipf/nat.1 -compact
 .It Pa /dev/ipnat
 .It Pa /usr/share/ipf/nat.1
-Example rules.
+example rules
 .It Pa /usr/share/ipf/nat.2
-System requirements for use of the NAT.
+system requirements for use of the NAT
 .It Pa /etc/ipnat.rules
-Actual rule list.
+actual rule list
 .Sh SEE ALSO
+.Xr ipf 4 ,
 .Xr ipnat 4 ,
 .Xr ipnat 5 ,
-.Xr ipf 8 ,
-.Xr ipf 4
-.br
+.Xr ipf 8
+.Pp
 http://coombs.anu.edu.au/ipfilter/
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 178b7a4d59c..1c1477ce341 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: routed.8,v 1.21 1999/03/16 02:46:51 deraadt Exp $
+.\"	$OpenBSD: routed.8,v 1.22 1999/05/15 02:17:52 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -272,7 +272,7 @@ loop than to solve problems.
 Causes host or point-to-point routes to not be advertised,
 provided there is a network route going the same direction.
 That is a limited kind of aggregation.
-This option is useful on gateways to ethernets that have other gateway
+This option is useful on gateways to Ethernets that have other gateway
 machines connected with point-to-point links such as SLIP.
 .It Fl m
 Causes the machine to advertise a host or point-to-point route to
diff --git a/usr.sbin/dhcp/server/dhcpd.conf.5 b/usr.sbin/dhcp/server/dhcpd.conf.5
index 63060d70dad..be9abe50232 100644
--- a/usr.sbin/dhcp/server/dhcpd.conf.5
+++ b/usr.sbin/dhcp/server/dhcpd.conf.5
@@ -85,9 +85,9 @@ even if no addresses will be dynamically allocated on that subnet.
 Some installations have physical networks on which more than one IP
 subnet operates.   For example, if there is a site-wide requirement
 that 8-bit subnet masks be used, but a department with a single
-physical ethernet network expands to the point where it has more than
+physical Ethernet network expands to the point where it has more than
 254 nodes, it may be necessary to run two 8-bit subnets on the same
-ethernet until such time as a new physical network can be added.   In
+Ethernet until such time as a new physical network can be added.   In
 this case, the \fIsubnet\fR declarations for these two networks may be
 enclosed in a \fIshared-network\fR declaration.
 .PP
@@ -176,7 +176,7 @@ Figure 2
 As you can see in Figure 2, it's legal to specify host addresses in
 parameters as domain names rather than as numeric IP addresses.  If a
 given hostname resolves to more than one IP address (for example, if
-that host has two ethernet interfaces), both addresses are supplied to
+that host has two Ethernet interfaces), both addresses are supplied to
 the client.
 .PP
 In Figure 1, you can see that both the shared-network statement and
@@ -506,7 +506,7 @@ statement.
 .I hardware-type
 must be the name of a physical hardware interface type.   Currently,
 only the
-.B ethernet
+.B Ethernet
 type is recognized, although support for
 .B token-ring
 and
diff --git a/usr.sbin/ipsend/ipresend/ipresend.1 b/usr.sbin/ipsend/ipresend/ipresend.1
index 40f98256209..3282dd91ca4 100644
--- a/usr.sbin/ipsend/ipresend/ipresend.1
+++ b/usr.sbin/ipsend/ipresend/ipresend.1
@@ -68,7 +68,7 @@ The input file specified by \fB\-i\fP is a binary file produced using libpcap
 .B \-R
 When sending packets out, send them out "raw" (the way they came in).  The
 only real significance here is that it will expect the link layer (i.e.
-ethernet) headers to be prepended to the IP packet being output.
+Ethernet) headers to be prepended to the IP packet being output.
 .TP
 .B \-S
 The input file is to be in "snoop" format (see RFC 1761).  Packets are read
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index d3d0f4ef775..3f4849aa421 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.2 1996/09/21 18:04:55 maja Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.3 1999/05/15 02:17:57 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,13 +27,13 @@
 .\" (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.2 1996/09/21 18:04:55 maja Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.3 1999/05/15 02:17:57 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
 .Sh NAME
 .Nm mopa.out
-.Nd Create MOP image from a a.out file
+.Nd create MOP image from an a.out file
 .Sh SYNOPSIS
 .Nm mopa.out
 .Ar infile
@@ -50,11 +50,11 @@ header, and try again.
 .Sh BUGS
 This program just supports the VAX machine-id for now. 
 .Sh SEE ALSO
-.Xr a.out 5 ,
 .Xr mopchk 1 ,
-.Xr mopd 8 ,
 .Xr mopprobe 1 ,
 .Xr moptrace 1 
+.Xr a.out 5 ,
+.Xr mopd 8
 .Sh AUTHORS
-Lloyd Parkes.
+Lloyd Parkes
 
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index 065ede79a89..efec6d806fb 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.3 1996/09/27 18:49:31 maja Exp $
+.\"	$OpenBSD: mopchk.1,v 1.4 1999/05/15 02:17:58 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,20 +27,20 @@
 .\" (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: mopchk.1,v 1.3 1996/09/27 18:49:31 maja Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.4 1999/05/15 02:17:58 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
 .Sh NAME
 .Nm mopchk
-.Nd MOP Check Utility
+.Nd MOP check utility
 .Sh SYNOPSIS
 .Nm mopchk 
 .Op Fl a
 .Op Fl v
 .Op Ar filename
 .Sh DESCRIPTION
-.Nm Mopchk
+.Nm mopchk
 shows information about which devices are known, version of mopd suite or
 information about a MOP-image.
 .Pp
@@ -56,7 +56,7 @@ Show all the Ethernets attached to the system.
 Show version of mopprobe.
 .El
 .Sh BUGS
-In some implementation the same interface can occur more than once.
+In some implementations the same interface can occur more than once.
 .Sh SEE ALSO
 .Xr mopa.out 1 ,
 .Xr mopprobe 1 ,
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 0e29ca8cc39..244558d3cd0 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.3 1999/03/27 14:31:22 maja Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.4 1999/05/15 02:17: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: mopprobe.1,v 1.3 1999/03/27 14:31:22 maja Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.4 1999/05/15 02:17:57 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
@@ -47,11 +47,13 @@
 .Op Fl v
 .Ar interface
 .Sh DESCRIPTION
-.Nm Mopprobe
-prints the ethernet address and nodename of DECserver 100/200/250/300 on the
+.Nm mopprobe
+prints the Ethernet address and nodename of DECserver 100/200/250/300 on the
 Ethernet connected to
 .Ar interface
 or all known interfaces if 
+.Fl a
+is given.
 .Sq Fl a
 is given. If
 .Sq Fl o
@@ -63,7 +65,7 @@ all MOP/RC SID messages will be shown (e.g. machines running DECnet).
 .It Fl a
 Listen on all the Ethernets attached to the system.
 If 
-.Sq Fl a 
+.Fl a 
 is omitted, an interface must be specified.
 .It Fl 3
 Ignore MOP V3 messages (Ethernet II).
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index c783b70a0ab..6dcd97f9d9b 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.2 1996/09/21 19:12:38 maja Exp $
+.\"	$OpenBSD: moptrace.1,v 1.3 1999/05/15 02:17:59 aaron Exp $
 .\"
 .\" Copyright (c) 1993-95 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: moptrace.1,v 1.2 1996/09/21 19:12:38 maja Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.3 1999/05/15 02:17:59 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
@@ -45,18 +45,18 @@
 .Op Fl 3 | 4
 .Op Ar interface
 .Sh DESCRIPTION
-.Nm Moptrace
-prints the contence of MOP packages on the Ethernet connected to
+.Nm moptrace
+prints the contents of MOP packages on the Ethernet connected to
 .Ar interface
 or all known interfaces if 
-.Sq Fl a
+.Fl a
 is given.
 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
 If 
-.Sq Fl a 
+.Fl a 
 is omitted, an interface must be specified.
 .It Fl d
 Run in debug mode, with all the output to stderr.
@@ -68,8 +68,8 @@ Ignore MOP V4 messages (Ethernet 802.3).
 .Sh SEE ALSO
 .Xr mopa.out 1 ,
 .Xr mopchk 1 ,
-.Xr mopd 8 ,
-.Xr mopprobe 1
+.Xr mopprobe 1 ,
+.Xr mopd 8
 .Rs 
 DECnet Digital Network Architecture Phase IV, 
 .%R Maintenance Operations Functional Specification V3.0.0
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index 49a7fb23d49..da64a864c1a 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: named.8,v 1.6 1998/05/31 17:28:35 millert Exp $
+.\"	$OpenBSD: named.8,v 1.7 1999/05/15 02:17:55 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
@@ -131,7 +131,7 @@ flag is not specified, then the group id used will be the primary group of
 the user specified (initgroups() is called, so all of the user's groups will
 be available to the server).
 .br
-\fINote:\fP normally, \fInamed\fP will rescan the active ethernet
+\fINote:\fP normally, \fInamed\fP will rescan the active Ethernet
 interfaces when it receives SIGHUP.  Use of the
 .B \-u
 option makes this impossible since the default port that named listens
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index d59f581490b..b5a4b871d21 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.8,v 1.12 1999/05/01 09:01:46 deraadt Exp $ (LBL)
+.\" @(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.8,v 1.13 1999/05/15 02:17:54 aaron Exp $ (LBL)
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -324,16 +324,16 @@ which is equivalent to:
 If \fIhost\fR is a name with multiple IP addresses, each address will
 be checked for a match.
 .IP "\fBether dst \fIehost\fP
-True if the ethernet destination address is \fIehost\fP.  \fIEhost\fP
+True if the Ethernet destination address is \fIehost\fP.  \fIEhost\fP
 may be either a name from /etc/ethers or a number (see
 .IR ethers (3N)
 for numeric format).
 .IP "\fBether src \fIehost\fP
-True if the ethernet source address is \fIehost\fP.
+True if the Ethernet source address is \fIehost\fP.
 .IP "\fBether host \fIehost\fP
-True if either the ethernet source or destination address is \fIehost\fP.
+True if either the Ethernet source or destination address is \fIehost\fP.
 .IP "\fBgateway\fP \fIhost\fP
-True if the packet used \fIhost\fP as a gateway.  I.e., the ethernet
+True if the packet used \fIhost\fP as a gateway.  I.e., the Ethernet
 source or destination address was \fIhost\fP but neither the IP source
 nor the IP destination was \fIhost\fP.  \fIHost\fP must be a name and
 must be found in both /etc/hosts and /etc/ethers.  (An equivalent
@@ -403,14 +403,14 @@ of protocol type \fIprotocol\fP.
 Note that the identifiers \fItcp\fP, \fIudp\fP, and \fIicmp\fP are also
 keywords and must be escaped via backslash (\\), which is \\\\ in the C-shell.
 .IP "\fBether broadcast\fR"
-True if the packet is an ethernet broadcast packet.  The \fIether\fP
+True if the packet is an Ethernet broadcast packet.  The \fIether\fP
 keyword is optional.
 .IP "\fBip broadcast\fR"
 True if the packet is an IP broadcast packet.  It checks for both
 the all-zeroes and all-ones broadcast conventions, and looks up
 the local subnet mask.
 .IP "\fBether multicast\fR"
-True if the packet is an ethernet multicast packet.  The \fIether\fP
+True if the packet is an Ethernet multicast packet.  The \fIether\fP
 keyword is optional.
 This is shorthand for `\fBether[0] & 1 != 0\fP'.
 .IP "\fBip multicast\fR"
@@ -610,7 +610,7 @@ tcpdump 'gateway snup and ip[2:2] > 576'
 .LP
 To print IP broadcast or multicast packets that were
 .I not
-sent via ethernet broadcast or multicast:
+sent via Ethernet broadcast or multicast:
 .RS
 .nf
 .B
@@ -638,7 +638,7 @@ gives a brief description and examples of most of the formats.
 Link Level Headers
 .LP
 If the '-e' option is given, the link level header is printed out.
-On ethernets, the source and destination addresses, protocol,
+On Ethernets, the source and destination addresses, protocol,
 and packet length are printed.
 .LP
 On FDDI networks, the  '-e' option causes \fItcpdump\fP to print
@@ -697,8 +697,8 @@ arp reply csam is-at CSAM\fP
 .fi
 .RE
 The first line says that rtsg sent an arp packet asking
-for the ethernet address of internet host csam.  Csam
-replies with its ethernet address (in this example, ethernet addresses
+for the Ethernet address of internet host csam.  Csam
+replies with its Ethernet address (in this example, Ethernet addresses
 are in caps and internet addresses in lower case).
 .LP
 This would look less redundant if we had done \fBtcpdump \-n\fP:
@@ -720,8 +720,8 @@ CSAM RTSG 0806  64: arp reply csam is-at CSAM\fP
 .sp .5
 .fi
 .RE
-For the first packet this says the ethernet source address is RTSG, the
-destination is the ethernet broadcast address, the type field
+For the first packet this says the Ethernet source address is RTSG, the
+destination is the Ethernet broadcast address, the type field
 contained hex 0806 (type ETHER_ARP) and the total length was 64 bytes.
 .HD
 TCP Packets
@@ -1154,7 +1154,7 @@ is the current clock time in the form
 and is as accurate as the kernel's clock.
 The timestamp reflects the time the kernel first saw the packet.  No attempt
 is made to account for the time lag between when the
-ethernet interface removed the packet from the wire and when the kernel
+Ethernet interface removed the packet from the wire and when the kernel
 serviced the `new packet' interrupt.
 .SH "SEE ALSO"
 .\" traffic(1C), nit(4P),