diff mbox

[iproute2,1/2] vxlan: fix help and man text

Message ID 1452791420-10771-1-git-send-email-nicolas.dichtel@6wind.com
State Accepted, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Nicolas Dichtel Jan. 14, 2016, 5:10 p.m. UTC 
From: Thomas Faivre <thomas.faivre@6wind.com>

Options 'group' and 'remote' cannot take 'any' as value but 'local' can.

Signed-off-by: Thomas Faivre <thomas.faivre@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
 ip/iplink_vxlan.c     | 2 +-
 man/man8/ip-link.8.in | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Stephen Hemminger Jan. 18, 2016, 7:44 p.m. UTC | #1 
On Thu, 14 Jan 2016 18:10:19 +0100
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:

> From: Thomas Faivre <thomas.faivre@6wind.com>
> 
> Options 'group' and 'remote' cannot take 'any' as value but 'local' can.
> 
> Signed-off-by: Thomas Faivre <thomas.faivre@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> ---

Applied thanks.
stephen hemminger Jan. 18, 2016, 7:45 p.m. UTC | #2 
On Thu, 14 Jan 2016 17:10:20 +0000
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:

> From: Thomas Faivre <thomas.faivre@6wind.com>
> 
> grff wrapper returns warnings when parsing the ip-link.8.in file.
> 
> How to reproduce:
> $ man --warnings ip-link > /dev/null
> `R' is a string (producing the registered sign), not a macro.
> [...]
> 
> Signed-off-by: Thomas Faivre <thomas.faivre@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Applied thanks.
diff mbox

Patch

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index aa4d5198d78d..ede8482439d5 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -23,7 +23,7 @@ 
 
 static void print_explain(FILE *f)
 {
-	fprintf(f, "Usage: ... vxlan id VNI [ { group | remote } ADDR ] [ local ADDR ]\n");
+	fprintf(f, "Usage: ... vxlan id VNI [ { group | remote } IP_ADDRESS ] [ local ADDR ]\n");
 	fprintf(f, "                 [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
 	fprintf(f, "                 [ dstport PORT ] [ srcport MIN MAX ]\n");
 	fprintf(f, "                 [ [no]learning ] [ [no]proxy ] [ [no]rsc ]\n");
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index ac6f4813a329..a3d90f796a67 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -391,7 +391,8 @@  the following additional arguments are supported:
 .RB " ] [ { " group " | " remote " } "
 .I IPADDR
 .R " ] [ "
-.BI local " IPADDR "
+.B local
+.RI "{ "IPADDR " | "any " } "
 .R " ] [ "
 .BI ttl " TTL "
 .R " ] [ "