- document "-G netgroup";

from Kurt V. Hindenburg on misc@
- show that -i and -n are mutually exclusive
- sync SYNOPSIS and usage()

help from millert@

2 files changed, 19 insertions, 9 deletions

diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index df888f79022..e6e8045053f 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.9 2003/06/02 23:36:55 millert Exp $
+.\"	$OpenBSD: timed.8,v 1.10 2003/06/17 06:21:55 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -37,12 +37,13 @@
 .Nd time server daemon
 .Sh SYNOPSIS
 .Nm timed
-.Op Fl M
-.Op Fl t
-.Op Fl d
-.Op Fl i Ar network
-.Op Fl n Ar network
+.Op Fl dtM
+.Xo
+.Oo Fl i Ar network No \&|
+.Fl n Ar network Oc
+.Xc
 .Op Fl F Ar host1 host2 ...
+.Op Fl G Ar netgroup
 .Sh DESCRIPTION
 This
 is a time server daemon and is normally invoked
@@ -139,6 +140,15 @@ The
 and
 .Fl i
 flags are meaningless if used together.
+The
+.Fl G
+flag is used to specify a
+.Ar netgroup
+of trustworthy hosts,
+in addition to any masters specified with the
+.Fl M
+flag.
+It may only be specified once.
 .Pp
 .Nm
 checks for a master time server on each network to which
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 82b0a078f38..ba5d1c46c2d 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timed.c,v 1.19 2003/06/12 21:09:48 deraadt Exp $	*/
+/*	$OpenBSD: timed.c,v 1.20 2003/06/17 06:21:56 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -856,7 +856,7 @@ good_host_name(const char *name)
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "timed: [-dtM] [-i net|-n net] "
-	    "[-F host1 host2 ...] [-G netgp]\n");
+	(void)fprintf(stderr, "timed: [-dtM] [-i network | -n network] "
+	    "[-F host1 host2 ...] [-G netgroup]\n");
 	exit(1);
 }