From patchwork Sat Dec 2 11:04:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duncan Roe X-Patchwork-Id: 843870 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yppFR1B9rz9sNd for ; Sat, 2 Dec 2017 22:04:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751628AbdLBLE5 (ORCPT ); Sat, 2 Dec 2017 06:04:57 -0500 Received: from mail104.syd.optusnet.com.au ([211.29.132.246]:55104 "EHLO mail104.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbdLBLE4 (ORCPT ); Sat, 2 Dec 2017 06:04:56 -0500 Received: from dimstar.local.net (c220-239-53-24.eburwd6.vic.optusnet.com.au [220.239.53.24]) by mail104.syd.optusnet.com.au (Postfix) with SMTP id 24BB242917F for ; Sat, 2 Dec 2017 22:04:43 +1100 (AEDT) Received: (qmail 11811 invoked by uid 501); 2 Dec 2017 11:04:43 -0000 From: Duncan Roe To: netfilter-devel@vger.kernel.org Subject: [PATCH] doc: nft.8 aim for consistent synopses throughout Date: Sat, 2 Dec 2017 22:04:43 +1100 Message-Id: <20171202110443.11770-1-duncan_roe@optusnet.com.au> X-Mailer: git-send-email 2.9.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=bc8baKHB c=1 sm=1 tr=0 a=hJbC1jk9qgvTrT4V7DDR1w==:117 a=hJbC1jk9qgvTrT4V7DDR1w==:17 a=ocR9PWop10UA:10 a=PO7r1zJSAAAA:8 a=zjacS4AodD_TvpdSMC8A:9 a=0SsIkJ08GyrO4Vnw:21 a=JN39ssOcA94FOYKd:21 a=Y65JEM6VhkeEqjt2:21 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Single items in braces have the braces removed as per wiki Scripting: "It is simply overkill to define a set that only stores one single element". Items that were in braces or square brackets are made consistent, e.g. {family} expands to single wor Ip, inet &c., but (type) in set spec expands to "type type_name ;". Signed-off-by: Duncan Roe --- doc/nft.xml | 147 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 73 insertions(+), 74 deletions(-) diff --git a/doc/nft.xml b/doc/nft.xml index a1bfecd..cbb3b80 100644 --- a/doc/nft.xml +++ b/doc/nft.xml @@ -552,7 +552,7 @@ filter input iif $int_ifs accept table family - table + table @@ -626,11 +626,11 @@ filter input iif $int_ifs accept chain - type - hook - device - priority ; - policy ; + type type + hook hook + device device + priority priority ; + policy policy ; @@ -642,16 +642,16 @@ filter input iif $int_ifs accept chain family - table - chain + table + chain - rename + rename chain family - table - chain - newname + table + chain + newname @@ -798,27 +798,27 @@ filter input iif $int_ifs accept rule family - table - chain + table + chain position position - statement + statement... - replace - rule + + replace rule family - table - chain - handle handle - statement + table + chain + handle handle + statement... - delete + delete rule family - table - chain - handle handle + table + chain + handle handle @@ -869,19 +869,19 @@ filter input iif $int_ifs accept Sets - add + add set family - table - set - { - type - flags - timeout - gc-interval - elements - size - policy + table + set + { type + type ; + flags flags ; + timeout timeout ; + gc-interval gc-interval ; + elements = { element[,...] } ; + size size ; + policy policy ; } @@ -892,8 +892,8 @@ filter input iif $int_ifs accept set family - table - set + table + set @@ -902,11 +902,10 @@ filter input iif $int_ifs accept element family - table - set + table + set { - elements - } + element[,...] } @@ -1022,17 +1021,17 @@ filter input iif $int_ifs accept Maps - add + add map family - table - map - { - type - flags - elements - size - policy + table + map + { type + type + flags flags ; + elements = { element[,...] } ; + size size ; + policy policy ; } @@ -1043,8 +1042,8 @@ filter input iif $int_ifs accept map family - table - map + table + map @@ -1053,10 +1052,10 @@ filter input iif $int_ifs accept element family - table - map + table + map { - elements + elements = { element[,...] } ; } @@ -1171,8 +1170,8 @@ filter input iif $int_ifs accept type family - table - object + table + object @@ -1219,13 +1218,15 @@ filter input iif $int_ifs accept ct - helper - type - type - protocol - protocol - l3proto - family + helper + helper + { type + type + protocol + protocol + ; + l3proto family ; + } @@ -1382,7 +1383,7 @@ table inet myhelpers { describe - expression + expression @@ -2736,7 +2737,7 @@ filter output oif eth0 saddr daddr - + mark iif oif @@ -4178,7 +4179,7 @@ ip6 filter input frag more-fragments 1 counter jump goto - chain + chain @@ -4451,9 +4452,7 @@ ip6 filter output log flags all reject - with - tcp - reset + with tcp reset @@ -4509,10 +4508,10 @@ ip6 filter output log flags all counter - packets + + packets number - - bytes + bytes number