Module Name: src
Committed By: wiz
Date: Tue Jan 8 10:25:26 UTC 2019
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
New sentence, new line. Punctuation fixes. Remove macros without effect.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.sbin/npf/npfctl/npf.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.80 src/usr.sbin/npf/npfctl/npf.conf.5:1.81
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.80 Tue Jan 8 01:19:16 2019
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Tue Jan 8 10:25:26 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: npf.conf.5,v 1.80 2019/01/08 01:19:16 gutteridge Exp $
+.\" $NetBSD: npf.conf.5,v 1.81 2019/01/08 10:25:26 wiz Exp $
.\"
.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -89,7 +89,7 @@ The following is an example of table def
.Dl table <black> type hash dynamic
.Pp
Currently, tables support three data storage types:
-.Cm hash,
+.Cm hash ,
.Cm tree ,
or
.Cm cdb .
@@ -133,11 +133,14 @@ Three functions exist, to extract addres
list type and IP address type:
.Bl -tag -width "Fn ifaddrs interface" -offset indent
.It Fn inet4 interface
-Static list. IPv4 addresses.
+Static list.
+IPv4 addresses.
.It Fn inet6 interface
-Static list. IPv6 addresses.
+Static list.
+IPv6 addresses.
.It Fn ifaddrs interface
-Dynamic list. Both IPv4 and IPv6.
+Dynamic list.
+Both IPv4 and IPv6.
The
.Cm family
keyword of a filtering rule can be used in combination to explicitly select
@@ -164,7 +167,7 @@ on wm0, and
.Li $var2
is the dynamic list of all the IPv4 and IPv6 addresses configured on wm0.
The first three rules are equivalent, because with the
-.Li Ic block Ar "..." Cm on Li < Ns Ar interface Ns Li >
+.Ic block Ar "..." Cm on Li < Ns Ar interface Ns Li >
syntax, NPF expects a direct reference to an interface, and therefore does
not consider the extraction functions.
The fourth and fifth rules are equivalent, for the same reason.
@@ -220,7 +223,7 @@ The
keyword can be used to match the packets against specific TCP flags,
according to the following syntax:
.Pp
-.Dl Ic proto Cm tcp flags Ar match Ns Li [/ Ns Ar mask Ns Li ]
+.Dl Ic proto Cm tcp flags Ar match Ns Li [/ Ns Ar mask Ns ]
.Pp
Where
.Ar match
