From 23eb395e2148ba33a744f50ae5f774668d57f3c0 Mon Sep 17 00:00:00 2001 From: kn Date: Fri, 13 Jul 2018 09:06:58 +0000 Subject: [PATCH] Use "rtable" not "tableid" as argument name for rtable Make rtable(4) usage documentation consistent with other programs. This is to have `man -k ar~rtable' show the full list without having to look for other variations of the same argument type. OK bluhm --- sbin/ifconfig/ifconfig.8 | 10 +++++----- sbin/route/route.8 | 24 ++++++++++++------------ sbin/route/route.c | 4 ++-- usr.bin/netstat/netstat.1 | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 4379e2fb9c1..70116b632d1 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.310 2018/07/13 05:22:34 jmc Exp $ +.\" $OpenBSD: ifconfig.8,v 1.311 2018/07/13 09:06:58 kn 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 $ .\" @@ -1635,7 +1635,7 @@ for a complete list of the available protocols. .Op Oo Fl Oc Ns Cm keepalive Ar period count .Op Oo Fl Oc Ns Cm tunnel Ar src_address dest_address .Op Oo Fl Oc Ns Cm tunneldf -.Op Oo Fl Oc Ns Cm tunneldomain Ar tableid +.Op Oo Fl Oc Ns Cm tunneldomain Ar rtable .Op Cm tunnelttl Ar ttl .Op Oo Fl Oc Ns Cm vnetflowid .Op Oo Fl Oc Ns Cm vnetid Ar network-id @@ -1683,13 +1683,13 @@ Remove the source and destination tunnel addresses. Do not allow fragmentation of encapsulated packets. .It Cm -tunneldf Allow fragmentation of encapsulated packets. -.It Cm tunneldomain Ar tableid +.It Cm tunneldomain Ar rtable Use routing table -.Ar tableid +.Ar rtable instead of the default table. The tunnel does not need to terminate in the same routing domain as the interface itself. -.Ar tableid +.Ar rtable can be set to any valid routing table ID; the corresponding routing domain is derived from this table. .It Cm -tunneldomain diff --git a/sbin/route/route.8 b/sbin/route/route.8 index bc011881b14..bd9a8f355af 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: route.8,v 1.86 2018/07/09 14:11:00 jca Exp $ +.\" $OpenBSD: route.8,v 1.87 2018/07/13 09:06:58 kn Exp $ .\" $NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" -.Dd $Mdocdate: July 9 2018 $ +.Dd $Mdocdate: July 13 2018 $ .Dt ROUTE 8 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm route .Op Fl dnqtv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Ar command .Oo .Op Ar modifiers @@ -75,7 +75,7 @@ may require correct operation of the network; thus it may be expedient to forgo this, especially when attempting to repair networking operations.) .It Fl q Suppress all output. -.It Fl T Ar tableid +.It Fl T Ar rtable Select an alternate routing table to modify or query. The default is to use the current routing table. .It Fl t @@ -92,18 +92,18 @@ utility provides the following simple commands: .Bl -tag -width Fl .It Xo .Nm route -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm exec .Op Ar command ... .Xc Execute a command forcing the process and its children to use the routing table and appropriate routing domain as specified with the -.Fl T Ar tableid +.Fl T Ar rtable option. .It Xo .Nm route .Op Fl nqv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm flush .Op Ar modifiers .Xc @@ -121,7 +121,7 @@ modifiers. .It Xo .Nm route .Op Fl nv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm get .Op Ar modifiers .Ar address @@ -151,7 +151,7 @@ are shown. .It Xo .Nm route .Op Fl nv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm show .Op Ar family .Op Fl gateway @@ -185,7 +185,7 @@ have the syntax: .It Xo .Nm route .Op Fl dnqtv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm add .Op Ar modifiers .Ar destination gateway @@ -193,7 +193,7 @@ have the syntax: .It Xo .Nm route .Op Fl dnqtv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm change .Op Ar modifiers .Ar destination gateway @@ -201,7 +201,7 @@ have the syntax: .It Xo .Nm route .Op Fl dnqtv -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Cm del Ns Op Cm ete .Op Ar modifiers .Ar destination gateway diff --git a/sbin/route/route.c b/sbin/route/route.c index f98bdeae0a2..61de74380a9 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.219 2018/07/12 16:08:02 florian Exp $ */ +/* $OpenBSD: route.c,v 1.220 2018/07/13 09:06:58 kn Exp $ */ /* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */ /* @@ -130,7 +130,7 @@ usage(char *cp) if (cp) warnx("botched keyword: %s", cp); fprintf(stderr, - "usage: %s [-dnqtv] [-T tableid] command [[modifiers] args]\n", + "usage: %s [-dnqtv] [-T rtable] command [[modifiers] args]\n", __progname); fprintf(stderr, "commands: add, change, delete, exec, flush, get, monitor, show\n"); diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index d4f282d7968..c352eced60b 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: netstat.1,v 1.82 2018/04/26 12:11:51 guenther Exp $ +.\" $OpenBSD: netstat.1,v 1.83 2018/07/13 09:06:58 kn Exp $ .\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 @@ -30,7 +30,7 @@ .\" .\" from: @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: April 26 2018 $ +.Dd $Mdocdate: July 13 2018 $ .Dt NETSTAT 1 .Os .Sh NAME @@ -50,7 +50,7 @@ .Op Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system -.Op Fl T Ar tableid +.Op Fl T Ar rtable .Ek .Nm netstat .Op Fl bdhn @@ -272,7 +272,7 @@ option, also print routing labels. .It Fl s Show per-protocol statistics. If this option is repeated, counters with a value of zero are suppressed. -.It Fl T Ar tableid +.It Fl T Ar rtable Select an alternate routing table to query. The default is to use the current routing table. .It Fl t -- 2.20.1