From patchwork Thu Jan 14 17:10:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 567605 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A5479140556 for ; Fri, 15 Jan 2016 04:11:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754901AbcANRLE (ORCPT ); Thu, 14 Jan 2016 12:11:04 -0500 Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:42626 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754344AbcANRLD (ORCPT ); Thu, 14 Jan 2016 12:11:03 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.7]) by proxy.6wind.com (Postfix) with ESMTPS id DC4902478C; Thu, 14 Jan 2016 18:10:16 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1aJlQ4-0002ou-RN; Thu, 14 Jan 2016 18:10:44 +0100 From: Nicolas Dichtel To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, Thomas Faivre , Nicolas Dichtel Subject: [PATCH iproute2 1/2] vxlan: fix help and man text Date: Thu, 14 Jan 2016 18:10:19 +0100 Message-Id: <1452791420-10771-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.4.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thomas Faivre Options 'group' and 'remote' cannot take 'any' as value but 'local' can. Signed-off-by: Thomas Faivre Signed-off-by: Nicolas Dichtel --- ip/iplink_vxlan.c | 2 +- man/man8/ip-link.8.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 " ] [ "