- use .Bk/.Ek to avoid SYNOPSIS splitting

- put -p in the correct place
- sync the -p argument name and tweak its description
- add -p to usage()

2 files changed, 14 insertions, 10 deletions

diff --git a/sbin/pflogd/pflogd.8 b/sbin/pflogd/pflogd.8
index c1512ca8912..efbe0abc73c 100644
--- a/sbin/pflogd/pflogd.8
+++ b/sbin/pflogd/pflogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pflogd.8,v 1.33 2007/04/06 16:30:49 canacar Exp $
+.\"	$OpenBSD: pflogd.8,v 1.34 2007/04/07 07:48:50 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
 .\"
@@ -32,6 +32,7 @@
 .Nd packet filter logging daemon
 .Sh SYNOPSIS
 .Nm pflogd
+.Bk -words
 .Op Fl Dx
 .Op Fl d Ar delay
 .Op Fl f Ar filename
@@ -39,6 +40,7 @@
 .Op Fl p Ar pidfile
 .Op Fl s Ar snaplen
 .Op Ar expression
+.Ek
 .Sh DESCRIPTION
 .Nm
 is a background daemon which reads packets logged by
@@ -107,12 +109,6 @@ If not specified, the default is 60 seconds.
 Log output filename.
 Default is
 .Pa /var/log/pflog .
-.It Fl p Ar pidname
-Writes a file containing the process ID of the program.
-The file name has the form
-.Pa /var/run/pidname.pid .
-If the option is not given, pidname name defaults to
-.Pa pflogd .
 .It Fl i Ar interface
 Specifies the
 .Xr pflog 4
@@ -121,6 +117,14 @@ By default,
 .Nm
 will use
 .Ar pflog0 .
+.It Fl p Ar pidfile
+Writes a file containing the process ID of the program.
+The file name has the form
+.Pa /var/run/pidname.pid .
+If the option is not given,
+.Ar pidfile
+defaults to
+.Pa pflogd .
 .It Fl s Ar snaplen
 Analyze at most the first
 .Ar snaplen
diff --git a/sbin/pflogd/pflogd.c b/sbin/pflogd/pflogd.c
index df8271fd585..9232946d6bd 100644
--- a/sbin/pflogd/pflogd.c
+++ b/sbin/pflogd/pflogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pflogd.c,v 1.38 2007/04/06 16:30:49 canacar Exp $	*/
+/*	$OpenBSD: pflogd.c,v 1.39 2007/04/07 07:48:50 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001 Theo de Raadt
@@ -151,8 +151,8 @@ __dead void
 usage(void)
 {
 	fprintf(stderr, "usage: pflogd [-Dx] [-d delay] [-f filename]");
-	fprintf(stderr, " [-i interface] [-s snaplen]\n");
-	fprintf(stderr, "              [expression]\n");
+	fprintf(stderr, " [-i interface] [-p pidfile]\n");
+	fprintf(stderr, "              [-s snaplen] [expression]\n");
 	exit(1);
 }