Cleanups for ntp-wait-opts.def and ntp.keys.def

bk: 4e5091e1p__iWEa0T-cFBn5GHn0aXg

diff --git a/ChangeLog b/ChangeLog
index 1738f34a44d059b0dcc4b99360f51ab5f582c275..84eb031ba0ef1c848b9c1a1777b10e21ded16ec7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Cleanups for ntp-wait-opts.def and ntp.keys.def .
 (4.2.7p206) 2011/08/20 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203.
 * sntp documentation and behavior improvements suggested by

diff --git a/ntpd/ntp.keys.def b/ntpd/ntp.keys.def
index fdf5ab2f23c7d70afeaf0dd976d654af3df88969..01dd2bcc9d2c5db4c8a0b981a3d9cd0545e74d1b 100644 (file)
--- a/ntpd/ntp.keys.def
+++ b/ntpd/ntp.keys.def
@@ -1,11 +1,11 @@
 /* -*- Mode: Text -*- */
 
-autogen definitions options;
+//autogen definitions options;
 
 #include copyright.def
 
 prog-name      = "/etc/ntp.keys";
-prog-title     = "NTP daemon key file format";
+prog-title     = "NTP key file format";
 
 /* explain: Additional information whenever the usage routine is invoked */
 explain = <<- _END_EXPLAIN
@@ -15,8 +15,8 @@ doc-section   = {
   ds-type      = 'DESCRIPTION';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_PROG_MDOC_DESCRIP
-Following is a description of the format of NTP key files.
-For a description of the use of these files, see the
+Following is a description of the format of an NTP key file.
+For a description of the use of this type of file, see the
 .Qq Authentication Support
 section of the
 .Xr ntp.conf 5
@@ -117,7 +117,7 @@ doc-section = {
   ds-type      = 'FILES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_FILES
-.Bl -tag -width /etc/ntp.drift -compact
+.Bl -tag -width /etc/ntp.keys -compact
 .It Pa /etc/ntp.keys
 the default name of the configuration file
 .El
@@ -128,12 +128,14 @@ doc-section       = {
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_SEE_ALSO
 .Xr ntp.conf 5 ,
-.Xr ntpd 8 ,
-.Xr ntpdate 8 ,
-.Xr ntpdc 8
+.Xr ntpd 1ntpdmdoc ,
+.Xr ntpdate 1ntpdatemdoc ,
+.Xr ntpdc 1ntpdcmdoc ,
+.Xr sntp 1sntpmdoc
        _END_MDOC_SEE_ALSO;
 };
 
+/*
 doc-section    = {
   ds-type      = 'BUGS';
   ds-format    = 'mdoc';
@@ -147,6 +149,7 @@ were designed more with a busy primary server, rather than a high
 stratum workstation, in mind.
        _END_MDOC_BUGS;
 };
+*/
 
 doc-section    = {
   ds-type      = 'NOTES';

diff --git a/scripts/ntp-wait-opts.def b/scripts/ntp-wait-opts.def
index 6e82d2198c42030a66c90aeeafa8ac0e0d0d9b83..5f42dfaad844ce99b617c0925be0691b7454be13 100644 (file)
--- a/scripts/ntp-wait-opts.def
+++ b/scripts/ntp-wait-opts.def
@@ -1,6 +1,6 @@
 /* -*- Mode: Text -*- */
 
-autogen definitions options;
+//autogen definitions options;
 
 #include copyright.def
 // #include homerc.def
@@ -55,15 +55,16 @@ doc-section = {
   ds-type      = 'DESCRIPTION';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_PROG_MDOC_DESCRIP
-.Nm will send at most
+.Nm
+will send at most
 .Ar num-tries
 queries to
-.Xr ntpd 8
-(sleeping for
+.Xr ntpd 8 ,
+sleeping for
 .Ar secs-between-tries
 after each status return that says
 .Xr ntpd 8
-has not yet produced a synchronized and stable system clock).
+has not yet produced a synchronized and stable system clock.
 .Pp
 .Nm
 will do this quietly, unless the