Describe the format used by -s once, and refer to it when documenting -f.

Discussed with jmc@

2 files changed, 30 insertions, 41 deletions

diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index d9530e0c16b..9caab0d7cd5 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: arp.8,v 1.38 2016/03/23 10:26:33 jmc Exp $
+.\"	$OpenBSD: arp.8,v 1.39 2016/04/05 18:18:42 jca Exp $
 .\"	$NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)arp.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: March 23 2016 $
+.Dd $Mdocdate: April 5 2016 $
 .Dt ARP 8
 .Os
 .Sh NAME
@@ -125,17 +125,26 @@ options).
 Process entries from
 .Ar file
 to be set in the ARP tables.
-Any entries in the file that already exist for a given host
-will not be overwritten unless
+See the
+.Fl s
+option for a description of the file format and the effect of the
 .Fl F
-is given.
-Entries in the file should be of the form:
-.Bd -filled -offset indent
-.Ar hostname ether_addr
+option.
+.It Fl n
+Show network addresses as numbers (normally
+.Nm
+attempts to display addresses symbolically).
+.It Xo
+.Fl s Ar hostname ether_addr
 .Op Cm temp | permanent
 .Op Cm pub
-.Ed
-.Pp
+.Xc
+Create an ARP entry for the host called
+.Ar hostname
+with the Ethernet address
+.Ar ether_addr .
+The Ethernet address is given as six hexadecimal bytes separated by
+colons.
 The entry will be static (will not time out) unless the word
 .Cm temp
 is given in the command.
@@ -152,27 +161,6 @@ responding to requests for
 even though the host address is not its own.
 This behavior has traditionally been called
 .Em proxy ARP .
-.It Fl n
-Show network addresses as numbers (normally
-.Nm
-attempts to display addresses symbolically).
-.It Xo
-.Fl s Ar hostname ether_addr
-.Op Cm temp | permanent
-.Op Cm pub
-.Xc
-Create an ARP entry for the host called
-.Ar hostname
-with the Ethernet address
-.Ar ether_addr .
-The Ethernet address is given as six hexadecimal bytes separated by
-colons.
-.Pp
-The
-.Cm permanent , pub ,
-or
-.Cm temp
-modifiers may be specified with meanings as given above.
 .Pp
 If the entry already exists for the given host, it will not
 be replaced unless
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 33f51d5f7ec..56ae05ccb5b 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ndp.8,v 1.39 2016/04/05 18:14:55 jca Exp $
+.\"	$OpenBSD: ndp.8,v 1.40 2016/04/05 18:18:42 jca Exp $
 .\"	$KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -115,14 +115,12 @@ Erase all the NDP entries.
 .It Fl d Ar hostname
 Delete the specified NDP entry.
 .It Fl f Ar filename
-Parse the file specified by
-.Ar filename .
-Entries in the file should be of the form:
-.Bd -ragged -offset indent -compact
-.Ar nodename ether_addr
-.Op Ar temp
-.Op Ar proxy
-.Ed
+Parse entries from
+.Ar file
+to be inserted in the neighbor cache.
+See the
+.Fl s
+option for a description of the file format.
 .It Fl H
 Harmonize consistency between the routing table and the default router
 list; install the top entry of the list into the kernel routing table.
@@ -169,7 +167,10 @@ Show the default router list.
 .Op Cm temp
 .Op Cm proxy
 .Xc
-Register an NDP entry for a node.
+Register an NDP entry for the node called nodename with the Ether
+address ether_addr.
+The Ethernet address is given as six hexadecimal bytes separated by
+colons.
 The entry will be permanent unless the word
 .Cm temp
 is given in the command.