From abfafcdaf5689526ff4b5db5ee617cc3cc5b3a55 Mon Sep 17 00:00:00 2001
From: Duncan Roe <duncan_roe@optusnet.com.au>
Date: Mon, 19 Mar 2018 14:12:50 +1100
Subject: doc: nft.8 aim for consistent synopses throughout (again)

Fix a few more items as per commit f9cb9580b924f6320005f429f7d59e52a38aff82

Also insert a missing space I noticed along the way

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 doc/nft.xml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'doc')

diff --git a/doc/nft.xml b/doc/nft.xml
index 182d3473..fb57c2b6 100644
--- a/doc/nft.xml
+++ b/doc/nft.xml
@@ -481,9 +481,9 @@ filter input iif $int_ifs accept
 				<arg choice="opt"><replaceable>family</replaceable></arg>
 			</cmdsynopsis>
 			<cmdsynopsis>
-				<arg choice="req">export</arg>
+				<arg choice="plain">export</arg>
 				<arg choice="opt"><command>ruleset</command></arg>
-				<arg choice="req"><replaceable>format</replaceable></arg>
+				<arg choice="plain"><replaceable>format</replaceable></arg>
 			</cmdsynopsis>
 		</para>
 
@@ -569,9 +569,7 @@ filter input iif $int_ifs accept
 				<replaceable>table</replaceable>
 			</cmdsynopsis>
 			<cmdsynopsis>
-				<group choice="req">
-					<arg>delete</arg>
-				</group>
+				<literal>delete</literal>
 				<command>table</command>
 				<arg choice="opt"><replaceable>family</replaceable></arg>
 				<literal> handle </literal><replaceable>handle</replaceable>
@@ -716,9 +714,7 @@ add table inet mytable
 				<replaceable>chain</replaceable>
 			</cmdsynopsis>
 			<cmdsynopsis>
-				<group choice="req">
-					<arg>delete</arg>
-				</group>
+				<literal>delete</literal>
 				<command>chain</command>
 				<arg choice="opt"><replaceable>family</replaceable></arg>
 				<replaceable>table</replaceable>
@@ -994,7 +990,7 @@ table inet filter {
 				<programlisting>
         nft add rule filter input ip saddr @allowed_hosts tcp dport @allowed_ports accept
 				</programlisting>
-			The sets <literal>allowed_hosts</literal> and <literal>allowed_ports</literal>need to
+			The sets <literal>allowed_hosts</literal> and <literal>allowed_ports</literal> need to
 			be created first.  The next section describes nft set syntax in more detail.
 			</example>
 		</para>
@@ -1028,9 +1024,7 @@ table inet filter {
 				<replaceable>set</replaceable>
 			</cmdsynopsis>
 			<cmdsynopsis>
-				<group choice="req">
-					<arg>delete</arg>
-				</group>
+				<literal>delete</literal>
 				<command> set</command>
 				<arg choice="opt"><replaceable>family</replaceable></arg>
 				<replaceable>table</replaceable>
@@ -1405,9 +1399,7 @@ table inet filter {
 				<replaceable>object</replaceable>
 			</cmdsynopsis>
 			<cmdsynopsis>
-				<group choice="req">
-					<arg>delete</arg>
-				</group>
+				<literal>delete</literal>
 				<command> type</command>
 				<arg choice="opt"><replaceable>family</replaceable></arg>
 				<replaceable>table</replaceable>
-- 
cgit v1.2.3