summaryrefslogtreecommitdiff
path: root/sbin/pfctl/pfctl.8
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2005-01-05 18:30:15 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2005-01-05 18:30:15 +0000
commitbeb25bc0f1b2a9a540ae8e91dbb133bf934b5e20 (patch)
tree38aca19d9e039335e0f2d173ed2250b52896ad20 /sbin/pfctl/pfctl.8
parentbc1f1c8e6340cce542ab47bb67c9e130651fb9f3 (diff)
Document -m flag.
Diffstat (limited to 'sbin/pfctl/pfctl.8')
-rw-r--r--sbin/pfctl/pfctl.811
1 files changed, 9 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index e7a912e154c..6ba36c77043 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.116 2004/12/13 23:59:28 jmc Exp $
+.\" $OpenBSD: pfctl.8,v 1.117 2005/01/05 18:30:14 mcbride Exp $
.\"
.\" Copyright (c) 2001 Kjell Wooding. All rights reserved.
.\"
@@ -33,7 +33,7 @@
.Sh SYNOPSIS
.Nm pfctl
.Bk -words
-.Op Fl AdeghNnOoqRrvz
+.Op Fl AdeghmNnOoqRrvz
.Op Fl a Ar anchor
.Xo
.Oo Fl D
@@ -238,6 +238,13 @@ to
.Bd -literal -offset indent
# pfctl -k host1 -k host2
.Ed
+.It Fl m
+Merge in explicitly given options without reseting those
+which are omitted.
+Allows single options to be modified without disturbing the others:
+.Bd -literal -offset indent
+# echo "set loginterface fxp0" | pfctl -mf -
+.Ed
.It Fl N
Load only the NAT rules present in the rule file.
Other rules and options are ignored.