sort options and SYNOPSIS;

sync usage();

2 files changed, 21 insertions, 21 deletions

diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index f37aa8a1705..896998f6ed7 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslogd.8,v 1.19 2004/01/04 08:28:49 djm Exp $
+.\"	$OpenBSD: syslogd.8,v 1.20 2004/01/05 09:45:49 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,9 +40,9 @@
 .Nm syslogd
 .Bk -words
 .Op Fl dnu
+.Op Fl a Ar path
 .Op Fl f Ar config_file
 .Op Fl m Ar mark_interval
-.Op Fl a Ar path
 .Op Fl p Ar log_socket
 .Op Fl s Ar reporting_socket
 .Ek
@@ -53,6 +53,14 @@ machines and/or users as specified by its configuration file.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl a Pa path
+Specify a location where
+.Nm
+should place an additional log socket.
+Up to about 20 additional logging sockets can be specified.
+The primary use for this is to place additional log sockets in
+.Pa /dev/log
+of various chroot filespaces.
 .It Fl d
 Enable debugging to the standard output,
 and do not disassociate from the controlling terminal.
@@ -72,30 +80,22 @@ which can be useful when combined with the
 option on a loghost with no DNS cache.
 Messages from the local host will still be logged with
 the symbolic local host name.
-.It Fl u
-Select the historical
-.Dq insecure
-mode, in which syslogd will
-accept input from the UDP port.
-Some software wants this, but you can be subjected to a variety of
-attacks over the network, including attackers remotely filling logs.
 .It Fl p Ar log_socket
 Specify the pathname of an alternate log socket to be used instead;
 the default is
 .Pa /dev/log .
-.It Fl a Pa path
-Specify a location where
-.Nm
-should place an additional log socket.
-Up to about 20 additional logging sockets can be specified.
-The primary use for this is to place additional log sockets in
-.Pa /dev/log
-of various chroot filespaces.
 .It Fl s Ar reporting_socket
 Specify path to an
 .Dv AF_LOCAL
 socket for use in reporting logs stored in memory buffers using
 .Xr syslogc 8 .
+.It Fl u
+Select the historical
+.Dq insecure
+mode, in which syslogd will
+accept input from the UDP port.
+Some software wants this, but you can be subjected to a variety of
+attacks over the network, including attackers remotely filling logs.
 .El
 .Pp
 .Nm
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index ac8424d2e59..ce54ae2d40c 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.71 2004/01/04 18:29:33 deraadt Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.72 2004/01/05 09:45:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.71 2004/01/04 18:29:33 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.72 2004/01/05 09:45:49 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -541,8 +541,8 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "usage: syslogd [-dnu] [-f config_file] [-m mark_interval] "
-	    "[-a path] [-p log_socket]\n");
+	    "usage: syslogd [-dnu] [-a path] [-f config_file] [-m mark_interval]\n"
+	    "               [-p log_socket] [-s reporting_socket]\n");
 	exit(1);
 }