1 files changed, 61 insertions, 61 deletions
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 079c1043a51..3aeb70cdf15 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping6.8,v 1.36 2006/08/10 18:50:27 jmc Exp $
+.\"	$OpenBSD: ping6.8,v 1.37 2006/08/10 19:35:24 jmc Exp $
 .\"	$KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -76,11 +76,19 @@ The options are as follows:
 .\" Enables transport-mode IPsec authentication header
 .\" .Pq experimental .
 .It Fl a Ar addrtype
-Generate ICMPv6 Node Information Node Addresses query, rather than echo-request.
+Generate an ICMPv6 Node Information Node Addresses query,
+rather than an echo-request.
 .Ar addrtype
 must be a string constructed of the following characters:
 .Pp
 .Bl -tag -width Ds -compact
+.It Ic A
+Requests responder's anycast addresses.
+Without this character, the responder will return unicast addresses only.
+With this character, the responder will return anycast addresses only.
+Note that the specification does not specify how to get the responder's
+anycast addresses.
+This is an experimental option.
 .It Ic a
 Requests unicast addresses from all of the responder's interfaces.
 If the character is omitted,
@@ -90,20 +98,13 @@ responder's address are requests.
 Requests responder's IPv4-compatible and IPv4-mapped addresses.
 .It Ic g
 Requests responder's global-scope addresses.
-.It Ic s
-Requests responder's site-local addresses.
 .It Ic l
 Requests responder's link-local addresses.
-.It Ic A
-Requests responder's anycast addresses.
-Without this character, the responder will return unicast addresses only.
-With this character, the responder will return anycast addresses only.
-Note that the specification does not specify how to get responder's
-anycast addresses.
-This is an experimental option.
+.It Ic s
+Requests responder's site-local addresses.
 .El
 .It Fl b Ar bufsiz
-Set socket buffer size.
+Set the socket buffer size.
 .It Fl c Ar count
 Stop after sending
 .Pq and receiving
@@ -169,29 +170,29 @@ Only the super-user may use this option.
 .It Fl m
 Use minimal MTU size to avoid fragmentation.
 .It Fl N
-Probe node information multicast group
+Probe the node information multicast group
 .Pq Li ff02::2:xxxx:xxxx .
 .Ar host
-must be string hostname of the target
-.Pq must not be a numeric IPv6 address .
-Node information multicast group will be computed based on given
+must be the hostname of the target
+(i.e. it must not be a numeric IPv6 address).
+The node information multicast group is computed based on the given
 .Ar host ,
-and will be used as the final destination.
-Since node information multicast group is a link-local multicast group,
-outgoing interface needs to be specified by
+and is used as the final destination.
+Since the node information multicast group is a link-local multicast group,
+the outgoing interface needs to be specified using the
 .Fl I
 option.
 .It Fl n
 Numeric output only.
-No attempt will be made to lookup symbolic names from addresses in the reply.
+No attempt will be made to look up symbolic names from addresses in the reply.
 .It Fl p Ar pattern
-You may specify up to 16
+Up to 16
 .Dq pad
-bytes to fill out the packet you send.
+bytes may be specified to fill out the packet sent.
 This is useful for diagnosing data-dependent problems in a network.
 For example,
-.Dq Li \-p ff
-will cause the sent packet to be filled with all
+.Dq -p ff
+will cause the packet sent to be filled with all
 ones.
 .\" new ipsec
 .\".It Fl P Ar policy
@@ -227,49 +228,53 @@ data bytes when combined
 with the 8 bytes of
 ICMP
 header data.
-You may need to specify
+It may also be necessary to specify
 .Fl b
-as well to extend socket buffer size.
+to extend the socket buffer size.
+.Pp
+This option is ignored if any of the flags
+.Op Fl tWw
+are specified.
 .It Fl t
-Generate ICMPv6 Node Information supported query types query,
+Generate an ICMPv6 Node Information query,
 rather than echo-request.
 .Fl s
 has no effect if
-.Fl t
+this option
 is specified.
 .It Fl v
 Verbose output.
-ICMP
-packets other than
-.Dv ECHO_RESPONSE
+All ICMP packets
 that are received are listed.
 .It Fl W
-Same as
+The
+same as
 .Fl w ,
-but with old packet format based on 03 draft.
+but with the old packet format based on the 03 draft.
 This option is present for backward compatibility.
 .Fl s
 has no effect if
-.Fl w
+this option
 is specified.
 .It Fl w
-Generate ICMPv6 Node Information DNS Name query, rather than echo-request.
+Generate an ICMPv6 Node Information DNS Name query,
+rather than echo-request.
 .Fl s
 has no effect if
-.Fl w
+this option
 is specified.
 .It Ar hops
-IPv6 addresses for intermediate nodes,
-which will be put into type 0 routing header.
+IPv6 addresses of intermediate nodes,
+which will be put into a type 0 routing header.
 .It Ar host
-IPv6 address of the final destination node.
+The IPv6 address of the final destination node.
 .El
 .Pp
 When using
 .Nm
 for fault isolation, it should first be run on the local host, to verify
 that the local network interface is up and running.
-Then, hosts and gateways further and further away should be
+Then hosts and gateways further and further away can be
 .Dq pinged .
 Round-trip times and packet loss statistics are computed.
 If duplicate packets are received, they are not included in the packet
@@ -283,7 +288,7 @@ a brief summary is displayed, showing the number of packets sent and
 received, and the minimum, maximum, mean, and standard deviation of
 the round-trip times.
 .Pp
-This program is intended for use in network testing, measurement and
+This program is intended for use in network testing, measurement, and
 management.
 Because of the load it can impose on the network, it is unwise to use
 .Nm
@@ -350,44 +355,40 @@ almost all zeros.
 It is not
 necessarily enough to specify a data pattern of all zeros (for example)
 on the command line because the pattern that is of interest is
-at the data link level, and the relationship between what you type and
+at the data link level, and the relationship between what is typed and
 what the controllers transmit can be complicated.
 .Pp
-This means that if you have a data-dependent problem you will probably
-have to do a lot of testing to find it.
-If you are lucky, you may manage to find a file that either
-cannot
-be sent across your network or that takes much longer to transfer than
+This means that if there is a data-dependent problem,
+a lot of testing will probably have to be done to find it.
+It may be possible to find a file that either cannot
+be sent across the network or that takes much longer to transfer than
 other similar length files.
-You can then examine this file for repeated patterns that you can test
+This file can then be examined for repeated patterns that can be tested
 using the
 .Fl p
-option of
-.Nm ping6 .
+option.
 .Sh EXAMPLES
 Normally,
 .Nm
 works just like
 .Xr ping 8
-would work; the following will send ICMPv6 echo request to
-.Li dst.foo.com .
+would work; the following will send ICMPv6 echo request to dst.foo.com:
 .Bd -literal -offset indent
 $ ping6 -n dst.foo.com
 .Ed
 .Pp
-The following will probe hostnames for all nodes on the network link attached to
-.Li wi0
-interface.
+The following will probe hostnames for all nodes on the network link
+attached to the wi0 interface.
 The address
-.Li ff02::1
+.Dq ff02::1
 is named the link-local all-node multicast address, and the packet would
-reach every node on the network link.
+reach every node on the network link:
 .Bd -literal -offset indent
 $ ping6 -w ff02::1%wi0
 .Ed
 .Pp
 The following will probe addresses assigned to the destination node,
-.Li dst.foo.com .
+dst.foo.com:
 .Bd -literal -offset indent
 $ ping6 -a agl dst.foo.com
 .Ed
@@ -398,8 +399,7 @@ $ ping6 -a agl dst.foo.com
 .Xr ip6 4 ,
 .Xr ifconfig 8 ,
 .Xr ping 8 ,
-.Xr routed 8 ,
-.Xr traceroute 8 ,
+.Xr route6d 8 ,
 .Xr traceroute6 8
 .Rs
 .%A A. Conta
@@ -418,7 +418,7 @@ $ ping6 -a agl dst.foo.com
 .Sh HISTORY
 The
 .Xr ping 8
-command appeared in
+command first appeared in
 .Bx 4.3 .
 The
 .Nm