48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From c2d82484a75c99e079754e75ccc510e91290bb72 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Fri, 14 Sep 2018 11:00:14 +0200
|
|
Subject: [PATCH] nft.8: Update meta pkt_type value description
|
|
|
|
Commit 8a7f6de536408 ("meta: fix pkttype name and add 'other' symbol")
|
|
deprecated pkt_type value 'unicast' (for it being misleading) and
|
|
introduced 'host' and 'other' but it did not update documentation
|
|
accordingly. Fix this by replacing 'unicast' with 'host' in
|
|
documentation and adding 'other'.
|
|
|
|
While being at it, make sure these literal values are recognized as
|
|
such: Put them in all lower-case (as required by the parser) and in bold
|
|
font (to stand out a bit more).
|
|
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
(cherry picked from commit d75e9184bb51a1311ac950b13384f329836d597e)
|
|
|
|
Conflicts:
|
|
doc/primary-expression.txt
|
|
-> Patch manually applied to doc/nft.xml, patches converting man page
|
|
source to asciidoc are missing entirely.
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
doc/nft.xml | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/doc/nft.xml b/doc/nft.xml
|
|
index 3a5571b0da57a..0df42810c5e68 100644
|
|
--- a/doc/nft.xml
|
|
+++ b/doc/nft.xml
|
|
@@ -2991,8 +2991,8 @@ filter output icmpv6 type { echo-request, echo-reply }
|
|
<row>
|
|
<entry>pkt_type</entry>
|
|
<entry>
|
|
- Packet type: Unicast (addressed to local host),
|
|
- Broadcast (to all), Multicast (to group).
|
|
+ Packet type: <literal>host</literal> (addressed to local host),
|
|
+ <literal>broadcast</literal> (to all), <literal>multicast</literal> (to group), <literal>other</literal> (addressed to another host).
|
|
</entry>
|
|
</row>
|
|
</tbody>
|
|
--
|
|
2.21.0
|
|
|