From 1ceaa18b3a7e0b6765b018734a122ded76bc00f8 Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Wed, 16 Oct 2013 21:23:59 +0000
Subject: [PATCH] tidy up the "modifier" list a little and sync usage();

NB: this utility has only one option, and it's not optional! i haven;t
marked -s as being mandatory, since hopefully someone will make
ntpctl run without arguments do something useful;
---
 src/usr.sbin/ntpd/ntpctl.8 | 12 ++++++------
 src/usr.sbin/ntpd/ntpd.c   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntpctl.8 b/src/usr.sbin/ntpd/ntpctl.8
index 75d3cc83..37a63ef9 100644
--- a/src/usr.sbin/ntpd/ntpctl.8
+++ b/src/usr.sbin/ntpd/ntpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpctl.8,v 1.3 2013/10/06 16:52:31 jmc Exp $
+.\" $OpenBSD: ntpctl.8,v 1.4 2013/10/16 21:23:59 jmc Exp $
 .\"
 .\" Copyright (c) 2012 Mike Miller <mmiller@mgm51.com>
 .\"
@@ -14,7 +14,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 6 2013 $
+.Dd $Mdocdate: October 16 2013 $
 .Dt NTPCTL 8
 .Os
 .Sh NAME
@@ -36,21 +36,21 @@ The options are as follows:
 Show the data specified by
 .Ar modifier :
 .Bl -tag -width "sensorsXXX"
-.It Fl s Cm all
+.It Cm all
 Show all data.
-.It Fl s Cm peers
+.It Cm peers
 Show the following information about each peer: weight, trustlevel,
 stratum, number of seconds until the next poll, polling interval
 in seconds, and offset, network delay and network jitter in milliseconds.
 When the system clock is synced to a peer, an asterisk
 is displayed to the left of the weight column for that peer.
-.It Fl s Cm sensors
+.It Cm sensors
 Show the following information about each sensor: weight, sensor "good"
 status, stratum, and offset and the configured correction in
 milliseconds.
 When the system clock is synced to a sensor, an asterisk
 is displayed to the left of the weight column for that sensor.
-.It Fl s Cm status
+.It Cm status
 Show the status of peers and sensors, and whether the system clock is synced.
 When the system clock is synced, the stratum is displayed.
 When the system clock is not synced, the offset of the system clock,
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index a9660de9..f2c76050 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.73 2013/10/11 19:33:20 deraadt Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.74 2013/10/16 21:23:59 jmc Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -81,7 +81,7 @@ usage(void)
 	extern char *__progname;
 
 	if (strcmp(__progname, "ntpctl") == 0)
-		fprintf(stderr, "usage: ntpctl [-s all|peers|sensors|status]\n");
+		fprintf(stderr, "usage: ntpctl [-s modifier]\n");
 	else
 		fprintf(stderr, "usage: %s [-dnSsv] [-f file]\n",
 		    __progname);