[Git][NTPsec/ntpsec][master] 4 commits: Double and

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
c6607ca3 by Matt Selsky at 2016-12-24T05:52:05-05:00
Double and

- - - - -
5b7558cf by Matt Selsky at 2016-12-24T05:52:05-05:00
Typos

- - - - -
c43c3bbb by Matt Selsky at 2016-12-24T05:52:05-05:00
No need to define doc_source twice

- - - - -
659b19f6 by Matt Selsky at 2016-12-24T05:52:05-05:00
Alphabetize manual pages list and add link for ntpwait

- - - - -


4 changed files:

- devel/tour.txt
- docs/includes/manual.txt
- docs/wscript
- ntpd/ntp.conf-man.txt


Changes:

=====================================
devel/tour.txt
=====================================
--- a/devel/tour.txt
+++ b/devel/tour.txt
@@ -475,7 +475,7 @@ ASCIIizations of MRU records, oldest to newest.  The spans include
 sequence metadata intended to allow you to stitch them together on the
 fly in O(n) time.
 
-There is also a direct mode thsat makes the individual spans available
+There is also a direct mode that makes the individual spans available
 as they come in.  This may be useful for getting partial data from
 very heavily-loaded servers.
 
@@ -484,13 +484,13 @@ source-address spoofing.  The mrulist() code begins by requesting a
 nonce from ntpd, which it then replays between span requets to
 convince ntpd that the address it's firehosing all that MRU data at is
 the same one that asked for the nonce. To foil replay attacks, the
-nonce is timed out; you haveto re-request another every 16 seconds
+nonce is timed out; you have to re-request another every 16 seconds
 (the code does this automatically).
 
 The Python code does not replicate the old C logic for stitching
 together the MRU spans; that looked pretty fragile in the presence of
 span dropouts (we don't know that those can ever happen, but we don't
-know that they can't, either).  Instead, just brute-forces the problem
+know that they can't, either).  Instead, it just brute-forces the problem
 - accumulates all the MRU spans until either the protocol marker for
 the end of the last one or ^C interrupting the span-read loop, and
 then quicksorts the list before handing it up to the front end for


=====================================
docs/includes/manual.txt
=====================================
--- a/docs/includes/manual.txt
+++ b/docs/includes/manual.txt
@@ -1,12 +1,13 @@
 === Manual Pages ===
 * link:ntpd.html[+ntpd+ - Network Time Protocol (NTP) daemon]
 * link:ntpdig.html[+ntpdig+ - Simple Network Time Protocol (SNTP) client]
-* link:ntpq.html[+ntpq+ - standard NTP query program]
-* link:ntpmon.html[+ntpmon+ - real-time NTP status monitor]
 * link:ntpfrob.html[+ntpfrob+ - frob the local clock hardware]
 * link:ntpkeygen.html[+ntpkeygen+ - generate public and private keys]
 * link:ntpleapfetch.html[+ntpleapfetch+ fetch and manage leap-offset file]
+* link:ntpmon.html[+ntpmon+ - real-time NTP status monitor]
+* link:ntpq.html[+ntpq+ - standard NTP query program]
 * link:ntptime.html[+ntptime+ - read and set kernel time variables]
 * link:ntptrace.html[`ntptrace` - trace a chain of NTP servers back to the primary source]
 * link:ntpviz.html[+ntpviz+ - make offset, jitter, and other plots from logfiles]
+* link:ntpwait.html[+ntpwait+ - wait until ntpd is in synchronized state]
 


=====================================
docs/wscript
=====================================
--- a/docs/wscript
+++ b/docs/wscript
@@ -1,6 +1,5 @@
 def build(ctx):
 
-	doc_source = ctx.path.ant_glob("*.txt")
 	doc_source = ctx.path.ant_glob("*.txt", excl='*-body.txt')
 
 	ctx(


=====================================
ntpd/ntp.conf-man.txt
=====================================
--- a/ntpd/ntp.conf-man.txt
+++ b/ntpd/ntp.conf-man.txt
@@ -111,7 +111,7 @@ include::../docs/includes/mon-commands.txt[]
 
 The {ntpdman} daemon implements a general purpose address/mask
 based restriction list. The list contains address/match entries sorted
-first by increasing address values and and then by increasing mask
+first by increasing address values and then by increasing mask
 values. A match occurs when the bitwise AND of the mask and the packet
 source address is equal to the bitwise AND of the mask and address in
 the list. The list is searched in order with the last match found



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/59f4f1924b3a9a7200d90ad0d68cadf0d4d02cc4...659b19f66afd262cc769b81253ee0bdf1572f779
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161224/892e03d2/attachment.html>