[PATCH] iproute2: Remove "monitor" from "ip route help" output

[PATCH] iproute2: Remove "monitor" from "ip route help" output

[Andreas Henriksson]

$ ip route help 2>&1 | grep monitor
ip route { add | del | change | append | replace | monitor } ROUTE
$ ip route monitor
Command "monitor" is unknown, try "ip route help".

(I guess what was really intended is "ip monitor route", so just remove
the argument from the help output.)

Originally reported by martin f krafft at http://bugs.debian.org/537681

While at it, also drop all non-existant (route,link,netns) monitor
arguments from the ip(8) man page.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>

diff --git a/ip/iproute.c b/ip/iproute.c
index ca09029..21e1a4b 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -63,7 +63,7 @@ static void usage(void)
 	fprintf(stderr, "       ip route get ADDRESS [ from ADDRESS iif STRING ]\n");
 	fprintf(stderr, "                            [ oif STRING ]  [ tos TOS ]\n");
 	fprintf(stderr, "                            [ mark NUMBER ]\n");
-	fprintf(stderr, "       ip route { add | del | change | append | replace | monitor } ROUTE\n");
+	fprintf(stderr, "       ip route { add | del | change | append | replace } ROUTE\n");
 	fprintf(stderr, "SELECTOR := [ root PREFIX ] [ match PREFIX ] [ exact PREFIX ]\n");
 	fprintf(stderr, "            [ table TABLE_ID ] [ proto RTPROTO ]\n");
 	fprintf(stderr, "            [ type TYPE ] [ scope SCOPE ]\n");
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index 8d2ab87..26cb17f 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -14,7 +14,7 @@ ip \- show / manipulate routing, devices, policy routing and tunnels
 .ti -8
 .IR OBJECT " := { "
 .BR link " | " addr " | " addrlabel " | " route " | " rule " | " neigh " | "\
- tunnel " | " maddr " | "  mroute " | " monitor " }"
+ tunnel " | " maddr " | "  mroute " }"
 .sp
 
 .ti -8
@@ -165,7 +165,7 @@ tentative " | " deprecated " | " dadfailed " | " temporary " ]"
 .BR "ip addrlabel" " { " list " | " flush " }"
 
 .ti -8
-.BR "ip netns" " { " list " | " monitor " } "
+.BR "ip netns" " { " list " } "
 
 .ti -8
 .BR "ip netns" " { " add " | " delete " } "
@@ -198,7 +198,7 @@ tentative " | " deprecated " | " dadfailed " | " temporary " ]"
 
 .ti -8
 .BR "ip route" " { " add " | " del " | " change " | " append " | "\
-replace " | " monitor " } "
+replace " } "
 .I  ROUTE
 
 .ti -8
@@ -2547,7 +2547,6 @@ bind mounting all of the per network namespace configure files into
 their traditional location in /etc.
 
 .SS ip netns list - show all of the named network namespaces
-.SS ip netns monitor - report when network namespace names are created and destroyed
 .SS ip netns add NAME - create a new named network namespace
 .SS ip netns delete NAME - delete the name of a network namespace
 .SS ip netns exec NAME cmd ... - Run cmd in the named network namespace

Re: [PATCH] iproute2: Remove "monitor" from "ip route help" output

[Stephen Hemminger]

On Wed, 20 Jul 2011 17:08:14 +0200
Andreas Henriksson <andreas@fatal.se> wrote:

> $ ip route help 2>&1 | grep monitor
> ip route { add | del | change | append | replace | monitor } ROUTE
> $ ip route monitor
> Command "monitor" is unknown, try "ip route help".
> 
> (I guess what was really intended is "ip monitor route", so just remove
> the argument from the help output.)
> 
> Originally reported by martin f krafft at http://bugs.debian.org/537681
> 
> While at it, also drop all non-existant (route,link,netns) monitor
> arguments from the ip(8) man page.
> 
> Signed-off-by: Andreas Henriksson <andreas@fatal.se>

Applied