From patchwork Wed Jun 22 13:45:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 639210 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 3rZR112V91z9s9x for ; Wed, 22 Jun 2016 23:54:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=B4wcbb3X; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752213AbcFVNyl (ORCPT ); Wed, 22 Jun 2016 09:54:41 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:32964 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752155AbcFVNyk (ORCPT ); Wed, 22 Jun 2016 09:54:40 -0400 Received: by mail-pa0-f52.google.com with SMTP id b13so17264868pat.0 for ; Wed, 22 Jun 2016 06:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VwzCcGifjswOs9t+ch2/YTeINrYh25DuSOTlmY9QSYI=; b=B4wcbb3XRZBn+OdTS3pPHZ6GAVKfj8DMinbKZjN6DpyBCWQB5oOePx5y+i+ZMpiq0A TrPHHPoSBjqzpxcpLVluEPgH9Ae/VHqU1/qZA5qLhiHoho6NCWpAll1+C0v+JjQrlDvn YmJhgunGxzepPBrVDFHJVhmyTbWFcYqFMImks= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VwzCcGifjswOs9t+ch2/YTeINrYh25DuSOTlmY9QSYI=; b=LA+U8XaU4wQexTBc01oq7iR++zhbiG0YK3FV2ZtsVt0DHAwoabqOtpWvMYi6MmbsMK rUr2l7aTJzb3creWzlyHbf9/GgNDYhBt5UhSmQUbkRuFjHX85Z+ohxuVH7AnSJ4zE4OE 0VkovphqK94QjuzsAwlw0Wk5UYO0Xfsp4ApdDYkTb6L2bntKcwg2BCutJztkfG/hkY0m mOhrXmlIWEmP0ZtdfUMjFcRaAsN610TE4EmWWu+LIb2+av7V3HaVsKYyhgdH9eWZOidC 6M4HfvrMjQAeU8TyUW/4BdH3j7mu+KWRKR0bz9GHxuiDP0ckMu3TFNo8AONqq+20fT9d HXxA== X-Gm-Message-State: ALyK8tKr+dGsfMEAJoNHa4RAyVr8Ps+bDlOZk/lNIsInS3gzPLiktC960vhjwnlafZarZitt X-Received: by 10.67.13.164 with SMTP id ez4mr34703695pad.32.1466603164575; Wed, 22 Jun 2016 06:46:04 -0700 (PDT) Received: from hydra-01.cumulusnetworks.com ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id o12sm93575pfg.10.2016.06.22.06.46.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jun 2016 06:46:03 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: stephen@networkplumber.org, netdev@vger.kernel.org Cc: anuradhak@cumulusnetworks.com, nikolay@cumulusnetworks.com, julien@cumulusnetworks.com Subject: [PATCH iproute2 net-next v4 5/5] bridge: update man page Date: Wed, 22 Jun 2016 06:45:55 -0700 Message-Id: <1466603155-53768-6-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466603155-53768-1-git-send-email-roopa@cumulusnetworks.com> References: <1466603155-53768-1-git-send-email-roopa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu Signed-off-by: Roopa Prabhu --- man/man8/bridge.8 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index 08e8a5b..abaee63 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -20,8 +20,9 @@ bridge \- show / manipulate bridge addresses and devices .IR OPTIONS " := { " \fB\-V\fR[\fIersion\fR] | \fB\-s\fR[\fItatistics\fR] | -\fB\-n\fR[\fIetns\fR] name } -\fB\-b\fR[\fIatch\fR] filename } +\fB\-n\fR[\fIetns\fR] name | +\fB\-b\fR[\fIatch\fR] filename | +\fB\-j\fR[\fIson\fR] } .ti -8 .BR "bridge link set" @@ -153,6 +154,10 @@ Don't terminate bridge command on errors in batch mode. If there were any errors during execution of the commands, the application return code will be non zero. +.TP +.BR "\-json" +Display results in JSON format. Currently available for vlan and fdb. + .SH BRIDGE - COMMAND SYNTAX .SS