Merge into the manual pages the changes from 4.0.99b:

	ntpd.8:
	    add -gx to SYNOPSIS
	    clarify explanation of -g
	ntp.conf.5:
	    add missing field description for rawstats lines

Install audio.htm, driver3[567].htm and qth.htm.

3 files changed, 20 insertions, 14 deletions

diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 95a13db..3004b0a 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -4,20 +4,22 @@ MAINTAINER=	sheldonh
 
 DOCSDIR=	/usr/share/doc/ntp
 
-HTMLS=	accopt.htm assoc.htm authopt.htm biblio.htm build.htm clockopt.htm \
+HTMLS=	accopt.htm assoc.htm audio.htm authopt.htm biblio.htm build.htm \
+	clockopt.htm \
 	config.htm confopt.htm copyright.htm debug.htm driver1.htm \
 	driver10.htm driver11.htm driver12.htm driver16.htm driver18.htm \
 	driver19.htm driver2.htm driver20.htm driver22.htm driver23.htm \
 	driver24.htm driver26.htm driver27.htm driver28.htm driver29.htm \
 	driver3.htm driver30.htm driver32.htm driver33.htm driver34.htm \
+	driver35.htm driver36.htm driver37.htm \
 	driver4.htm driver5.htm driver6.htm driver7.htm driver8.htm \
 	driver9.htm exec.htm extern.htm gadget.htm hints.htm \
 	howto.htm htmlprimer.htm index.htm kern.htm kernpps.htm \
 	ldisc.htm measure.htm miscopt.htm monopt.htm mx4200data.htm \
 	notes.htm ntpd.htm ntpdate.htm ntpdc.htm ntpq.htm ntptime.htm \
 	ntptrace.htm parsedata.htm parsenew.htm patches.htm porting.htm \
-	pps.htm prefer.htm quick.htm rdebug.htm refclock.htm release.htm \
-	tickadj.htm vxworks.htm y2k.htm
+	pps.htm prefer.htm qth.htm quick.htm rdebug.htm refclock.htm \
+	release.htm tickadj.htm vxworks.htm y2k.htm
 
 MAN5=	ntp.conf.5 ntp.keys.5
 MAN8=	ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index 5e0d175..a48db5a 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -825,10 +825,6 @@ to the file generation set named rawstats:
 .Li 50928
 .Li 2132.543
 .Li 128.4.1.1
-.\"
-.\" XXX The next field is unaccounted for in the descriptive text
-.\"	that follows.
-.\"
 .Li 128.4.1.20
 .Li 3102453281.584327000
 .Li 3102453281.58622800031
@@ -838,7 +834,9 @@ to the file generation set named rawstats:
 .Pp
 The first two fields show the date (Modified Julian Day)
 and time (seconds and fraction past UTC midnight).
-The next field shows the peer or clock address
+The next two fields show
+the remote peer or clock address
+followed by the local address
 in dotted-quad notation.
 The final four fields show the originate,
 receive, transmit and final NTP timestamps in order.
@@ -886,7 +884,9 @@ as shown in the
 command.
 .It file Ar filename
 This is the file name for the statistics records.
-Filenames of set members are built from three elements:
+Filenames of set members are built
+from three concatenated elements
+prefix, filename and suffix:
 .Bl -tag -width indent
 .It prefix
 This is a constant filename path.
@@ -950,10 +950,10 @@ One file generation set element is created per day.
 A day is defined as the period between 00:00 and 24:00 UTC.
 The file set member suffix consists of a
 .Qq \&.
-(dot) and a day specification in the form YYYYMMDD.
+(dot) and a day specification in the form YYYYMMdd.
 YYYY is a 4-digit year number (e.g. 1992).
 MM is a two digit month number.
-DD is a two digit day number.
+dd is a two digit day number.
 Thus, all information written at 10 December 1992
 would end up in a file named
 .Pa <prefix><filename>.19921210 .
@@ -985,7 +985,8 @@ This number is taken to be the number of seconds
 the server has been running
 at the start of the corresponding 24-hour period.
 Information is only written to a file generation
-by specifying enable; output is prevented by specifying disable.
+by specifying enable;
+output is prevented by specifying disable.
 .It link | nolink
 It is convenient to be able to access the current element
 of a file generation set by a fixed name.
diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8
index 77e8f5b..5d4af77 100644
--- a/usr.sbin/ntp/doc/ntpd.8
+++ b/usr.sbin/ntp/doc/ntpd.8
@@ -9,7 +9,7 @@
 .Nd Network Time Protocol (NTP) daemon
 .Sh SYNOPSIS
 .Nm ntpd
-.Op Fl aAbdm
+.Op Fl aAbdgmx
 .Op Fl c Ar conffile
 .Op Fl f Ar driftfile
 .Op Fl k Ar keyfile
@@ -118,7 +118,10 @@ Specify the name and path of the drift file.
 Normally, the daemon exits
 if the offset exceeds a 1000 s sanity limit.
 This option overrides this limit
-and allows the time to be set to any value without restriction.
+and allows the time to be set to any value without restriction;
+however, this can happen only once.
+After that,
+the daemon will exit if the limit is exceeded.
 .It Fl k Ar keyfile
 Specify the name and path of the file
 containing the NTP authentication keys.