From: Pavel Šimerda <psime...@redhat.com>
* Use unabbreviated `address` and `maddress`
* Keep only `-n` and `-netns` for network namespace
---
ip/ip.c | 4 ++--
man/man8/ip.8 | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ip/ip.c b/ip/ip.c
index 0cf743f..e75447e 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -48,8 +48,8 @@ static void usage(void)
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
-"where OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable
|\n"
-" tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm
|\n"
+"where OBJECT := { link | address | addrlabel | route | rule | neighbor |
ntable |\n"
+" tunnel | tuntap | maddress | mroute | mrule | monitor |
xfrm |\n"
" netns | l2tp | fou | tcp_metrics | token | netconf }\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec |\n"
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index 045414d..9da086d 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -19,8 +19,8 @@ ip \- show / manipulate routing, devices, policy routing and
tunnels
.ti -8
.IR OBJECT " := { "
-.BR link " | " addr " | " addrlabel " | " route " | " rule " | " neigh " | "\
- ntable " | " tunnel " | " tuntap " | " maddr " | " mroute " | " mrule " | "\
+.BR link " | " address " | " addrlabel " | " route " | " rule " | " neigh " |
"\
+ ntable " | " tunnel " | " tuntap " | " maddress " | " mroute " | " mrule " |
"\
monitor " | " xfrm " | " netns " | " l2tp " | " tcp_metrics " }"
.sp
@@ -67,7 +67,7 @@ Output more detailed information.
.TP
.BR "\-l" , " \-loops " <COUNT>
-Specify maximum number of loops the 'ip addr flush' logic
+Specify maximum number of loops the 'ip address flush' logic
will attempt before giving up. The default is 10.
Zero (0) means loop until all addresses are removed.
@@ -143,7 +143,7 @@ use the system's name resolver to print DNS names instead of
host addresses.
.TP
-.BR "\-n" , " \-net" , " \-netns " <NETNS>
+.BR "\-n" , " \-netns " <NETNS>
switches
.B ip
to the specified network namespace
--
2.4.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
