From: Pavel Šimerda <psimerda@redhat.com>
Date: Wed, 12 Aug 2015 20:04:06 +0000 (+0200)
Subject: ip: fix and extend documentation
X-Git-Tag: v4.2.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=142434dc512fa62e32af3a82fffdd9862d44cb9c;p=thirdparty%2Fiproute2.git

ip: fix and extend documentation

 * Use unabbreviated `address` and `maddress`
 * Keep only `-n` and `-netns` for network namespace
---

diff --git a/ip/ip.c b/ip/ip.c
index 0cf743f71..e75447e1b 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 045414dd5..9da086d3c 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