Resolve conflicts

MFC after:	1 weeks

1 files changed, 6 insertions, 1 deletions

diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 44ef53a..2a35d16 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -9,6 +9,8 @@ ipmon \- monitors /dev/ipl for logged packets
 ] [
 .B "\-N <device>"
 ] [
+.B "\-L <facility>"
+] [
 .B "\-o [NSI]"
 ] [
 .B "\-O [NSI]"
@@ -73,7 +75,7 @@ In order for \fBipmon\fP to properly work, the kernel option
 \fBIPFILTER_LOG\fP must be turned on in your kernel.  Please see
 \fBoptions(4)\fP for more details.
 .LP
-\fBipmon\fP reopns its log file(s) and rereads its configuration file
+\fBipmon\fP reopens its log file(s) and rereads its configuration file
 when it receives a SIGHUP signal.
 .SH OPTIONS
 .TP
@@ -102,6 +104,9 @@ for normal IP Filter log records.
 Flush the current packet log buffer.  The number of bytes flushed is displayed,
 even should the result be zero.
 .TP
+.B \-L <facility>
+Using this option allows you to change the default syslog facility that
+ipmon uses for syslog messages.  The default is local0.
 .B \-n
 IP addresses and port numbers will be mapped, where possible, back into
 hostnames and service names.