From b8fc1f0e39d2ffc18c5db1b129b10f2bfe77e708 Mon Sep 17 00:00:00 2001 From: Duncan Roe Date: Mon, 6 Aug 2018 11:14:48 +1000 Subject: doc: Changes following detailed comparison with last XML version These were found by a combination of tkdiff and side-by-side man pages Most changes preserve or (occasionally) fix highlighting, casing or plurality. No major omissions were found. - data-types.txt: (Nothing special) - nft.txt: -- changed "`nft' stands for Netfilter" back to "`nf' stands for Netfilter" -- removed mysterious plus sign - payload-expression.txt: -- XML had MTU as 16-bit so changed back from 32. Is that correct? - primary-expression.txt: (Nothing special) - statements.txt: (Nothing special) This patch does not address any of the following observations: 1. Title has changed from nft to NFT 2. There is no attempt at justification. 3. There is no attempt at hyphenation. 4. Long lines of code now wrap instead of indenting nicely. See e.g. "tcp option" line under EXTENSION HEADER EXPRESSIONS 5. Tables have a lot of empty lines in them. 6. Occasionally there is severe wrapping, e.g. under CHAINS see add/create/delete/&c. which wrap at about cc40. Signed-off-by: Duncan Roe Signed-off-by: Pablo Neira Ayuso --- doc/statements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/statements.txt') diff --git a/doc/statements.txt b/doc/statements.txt index 8a54a6b3..b8b7a607 100644 --- a/doc/statements.txt +++ b/doc/statements.txt @@ -89,7 +89,7 @@ string: emerg, alert, crit, err, warn [default], notice, info, debug NFLOG group to send messages to| unsigned integer (16 bit) |snaplen| -Length of packet payload to include in netlink messages | +Length of packet payload to include in netlink message | unsigned integer (32 bit) |queue-threshold| Number of packets to queue inside the kernel before sending them to userspace | @@ -247,7 +247,7 @@ mark packet type | pkt_type |nftrace | -ruleset packet tracing on/off. Use monitor trace command to watch traces| +ruleset packet tracing on/off. Use *monitor trace* command to watch traces| 0, 1 |========================== @@ -320,7 +320,7 @@ expression key with address value. | ipv4_addr, ipv6_addr, e.g. abcd::1234, or you can use a mapping, e.g. meta mark map { 10 : 192.168.1.2, 20 : 192.168.1.3 } |port| Specifies that the source/destination address of the packet should be modified. | -port number (16 bits) +port number (16 bit) |=============================== .NAT statement flags @@ -475,7 +475,7 @@ destination. |Expression | Description | Type |address | Specifies that the copy of the packet should be sent to a new gateway.| -ipv4_addr, ipv6_addr, e.g. abcd::1234, or you can use a mapping. e.g. ip saddr map { 192.168.1.2 : 10.1.1.1 } +ipv4_addr, ipv6_addr, e.g. abcd::1234, or you can use a mapping, e.g. ip saddr map { 192.168.1.2 : 10.1.1.1 } |device | Specifies that the copy should be transmitted via device. | string -- cgit v1.2.3