8 files changed, 20 insertions, 14 deletions
diff --git a/contrib/ipfilter/ipmon.c b/contrib/ipfilter/ipmon.c
index aed6a8206d86..aea7f2075689 100644
--- a/contrib/ipfilter/ipmon.c
+++ b/contrib/ipfilter/ipmon.c
@@ -94,7 +94,7 @@ static	FILE	*newlog = NULL;
 static	char	*logfile = NULL;
 static	int	donehup = 0;
 static	void	usage __P((char *));
-static	void	handlehup __P((int));
+static	void	handlehup __P((void));
 static	void	flushlogs __P((char *, FILE *));
 static	void	print_log __P((int, FILE *, char *, int));
 static	void	print_ipflog __P((FILE *, char *, int));
@@ -126,8 +126,7 @@ static	void	logopts __P((int, char *));
 #endif
 
 
-static void handlehup(sig)
-int sig;
+static void handlehup()
 {
 	FILE	*fp;
 
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index 1e4e82e4729c..9fa459355fb6 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/contrib/ipfilter/ipsend/ipsend.5
@@ -323,7 +323,7 @@ If the new total length would exceed 64k, an error will be reported.
 .SH "ICMP TYPES"
 .TP
 .B echorep
-Echo Reply.
+Eecho Reply.
 .TP
 .B "unreach [ unreachable-code ]"
 Generic Unreachable error.  This is used to indicate that an error has
diff --git a/contrib/ipfilter/man/ipf.1 b/contrib/ipfilter/man/ipf.1
index 912d7ef475d0..5ea06fa74c35 100644
--- a/contrib/ipfilter/man/ipf.1
+++ b/contrib/ipfilter/man/ipf.1
@@ -99,7 +99,7 @@ Zero global statistics held in the kernel for filtering only (this doesn't
 affect fragment or state statistics).
 .DT
 .SH SEE ALSO
-ipfstat(1), ipftest(1), ipf(5)
+ipfstat(1), ipftest(1), ipf(5), mkfilters(1)
 .SH DIAGNOSTICS
 .PP
 Needs to be run as root for the packet filtering lists to actually
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5
index a186193002ef..79ab393b1fd2 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/contrib/ipfilter/man/ipf.5
@@ -351,7 +351,7 @@ with which they are associated can be used.  The most important from
 a security point of view is the ICMP redirect.
 .SH KEEP HISTORY
 .PP
-The second last parameter which can be set for a filter rule is whether or not
+The second last parameter which can be set for a filter rule is whether on not
 to record historical information for that packet, and what sort to keep. The
 following information can be kept:
 .TP
@@ -487,4 +487,4 @@ qualifies all service/port names with the protocol specified.
 .br
 /etc/services
 .SH SEE ALSO
-ipftest(1), iptest(1), ipf(4), ipnat(5), ipf(8), ipfstat(8)
+ipftest(1), iptest(1), mkfilters(1), ipf(4), ipnat(5), ipf(8), ipfstat(8)
diff --git a/contrib/ipfilter/man/ipf.8 b/contrib/ipfilter/man/ipf.8
index 16edfadccc8e..06d2723ffc15 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/contrib/ipfilter/man/ipf.8
@@ -113,7 +113,7 @@ affect fragment or state statistics).
 .br
 /dev/ipstate
 .SH SEE ALSO
-ipftest(1), ipf(4), ipl(4), ipf(5), ipfstat(8), ipmon(8), ipnat(8)
+ipftest(1), mkfilters(1), ipf(4), ipl(4), ipf(5), ipfstat(8), ipmon(8), ipnat(8)
 .SH DIAGNOSTICS
 .PP
 Needs to be run as root for the packet filtering lists to actually
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
index 44f313062e26..2826359ad16a 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/contrib/ipfilter/man/ipfilter.5
@@ -4,4 +4,4 @@ IP FIlter
 .SH DESCRIPTION
 .PP
 .SH SEE ALSO
-ipf(8), ipf(1), ipf(5), ipnat(1), ipnat(5) 
+ipf(8), ipf(1), ipf(5), ipnat(1), ipnat(5), mkfilters(1)
diff --git a/contrib/ipfilter/man/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index eff21d302eaa..94525eb2d491 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/contrib/ipfilter/man/ipfstat.8
@@ -14,7 +14,7 @@ ipfstat \- reports on packet filter statistics and filter list
 \fBipfstat\fP examines /dev/kmem using the symbols \fB_fr_flags\fP,
 \fB_frstats\fP, \fB_filterin\fP, and \fB_filterout\fP.
 To run and work, it needs to be able to read both /dev/kmem and the
-kernel itself.  The kernel name defaults to \fB/kernel\fP.
+kernel itself.  The kernel name defaults to \fB/vmunix\fP.
 .PP
 The default behaviour of \fBipfstat\fP
 is to retrieve and display the accumulated statistics which have been
@@ -73,7 +73,7 @@ kernel.
 .br
 /dev/ipstate
 .br
-/kernel
+/vmunix
 .SH SEE ALSO
 ipf(8)
 .SH BUGS
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 82898e18d8f7..6388bf69ee54 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -42,6 +42,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 "\-N <device>"
+Set the logfile to be opened for reading NAT log records from to <device>.
+.TP
 .B \-n
 IP addresses and port numbers will be mapped, where possible, back into
 hostnames and service names.
@@ -62,6 +65,10 @@ as for \fB-o\fP.
 .B \-s
 Packet information read in will be sent through syslogd rather than
 saved to a file.  The following levels are used:
+.TP
+.B "\-S <device>"
+Set the logfile to be opened for reading state log records from to <device>.
+.TP
 .IP
 .B LOG_INFO
 \- packets logged using the "log" keyword as the action rather
@@ -77,8 +84,8 @@ than pass or block.
 \- packets which have been logged and which can be considered
 "short".
 .TP
-.B "\-S <device>"
-Set the logfile to be opened for reading state log records from to <device>.
+.B \-S
+Treat the logfile as being composed of state log records.
 .TP
 .B \-t
 read the input file/device in a manner akin to tail(1).
@@ -100,4 +107,4 @@ recorded data.
 /dev/ipstate
 .SH SEE ALSO
 ipl(4), ipf(8), ipfstat(8), ipnat(8)
-.\".SH BUGS
+.SH BUGS