From e5291e6de92b8e9882e16f2ec959ff7ac2358995 Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Thu, 1 May 2014 18:46:01 +0000
Subject: [PATCH] change some argument names in order to give some consistency
 between traceroute and traceroute6; i also fudged the formatting to allow
 SYNOPSIS to display a bit nicer, and for usage() to look like SYNOPSIS;

ok florian
---
 usr.sbin/traceroute/traceroute.8 | 16 ++++++++--------
 usr.sbin/traceroute/traceroute.c | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index 01147cde653..23cf9e05b59 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute.8,v 1.59 2014/04/29 17:35:29 jmc Exp $
+.\"	$OpenBSD: traceroute.8,v 1.60 2014/05/01 18:46:01 jmc Exp $
 .\"	$NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)traceroute.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: April 29 2014 $
+.Dd $Mdocdate: May 1 2014 $
 .Dt TRACEROUTE 8
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm traceroute6
 .Nd print the route packets take to network host
 .Sh SYNOPSIS
-.Nm traceroute
+.Nm traceroute\ \&
 .Op Fl AcDdIlnSvx
 .Op Fl f Ar first_ttl
 .Op Fl g Ar gateway_addr
@@ -54,14 +54,14 @@
 .Op Fl V Ar rtable
 .Op Fl w Ar waittime
 .Ar host
-.Op Ar packetsize
+.Op Ar datalen
 .Nm traceroute6
 .Op Fl AcDdIlnSv
-.Op Fl f Ar firsthop
-.Op Fl m Ar hoplimit
+.Op Fl f Ar first_hop
+.Op Fl m Ar max_hop
 .Op Fl p Ar port
-.Op Fl q Ar probes
-.Op Fl s Ar src
+.Op Fl q Ar nqueries
+.Op Fl s Ar src_addr
 .Op Fl V Ar rtable
 .Op Fl w Ar waittime
 .Ar host
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 4362cfc4ffb..c357169d4b4 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.c,v 1.127 2014/04/28 09:45:30 deraadt Exp $	*/
+/*	$OpenBSD: traceroute.c,v 1.128 2014/05/01 18:46:01 jmc Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -1799,17 +1799,17 @@ void
 usage(void)
 {
 	if (v6flag) {
-		fprintf(stderr, "usage: traceroute6 [-AcDdIlnSv] [-f firsthop] "
-		    "[-m hoplimit]\n"
-		    "\t[-p port] [-q probes] [-s src] [-V rtableid] [-w waittime]\n"
-		    "\thost [datalen]\n");
+		fprintf(stderr, "usage: traceroute6 [-AcDdIlnSv] [-f first_hop] "
+		    "[-m max_hop] [-p port]\n"
+		    "\t[-q nqueries] [-s src_addr] [-V rtable] [-w waittime] "
+		    "host\n\t[datalen]\n");
 	} else {
 		fprintf(stderr,
 		    "usage: %s [-AcDdIlnSvx] [-f first_ttl] [-g gateway_addr] "
 		    "[-m max_ttl]\n"
-		    "\t[-P proto] [-p port] [-q nqueries] [-s src_addr] "
-		    "[-t toskeyword]\n"
-		    "\t[-V rtable] [-w waittime] host [packetsize]\n",
+		    "\t[-P proto] [-p port] [-q nqueries] [-s src_addr]\n"
+		    "\t[-t toskeyword] "
+		    "[-V rtable] [-w waittime] host [datalen]\n",
 		    __progname);
 	}
 	exit(1);
-- 
2.20.1