Thu Jul 28 12:55:36 2011 UTC ()
Remove duplicate (but commented out) entries.


(mbalmer)
diff -r1.10 -r1.11 src/etc/ntp.conf

cvs diff -r1.10 -r1.11 src/etc/ntp.conf (expand / switch to unified diff)

--- src/etc/ntp.conf 2011/07/09 19:24:13 1.10
+++ src/etc/ntp.conf 2011/07/28 12:55:35 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ntp.conf,v 1.10 2011/07/09 19:24:13 christos Exp $ 1# $NetBSD: ntp.conf,v 1.11 2011/07/28 12:55:35 mbalmer Exp $
2# 2#
3# NetBSD default Network Time Protocol (NTP) configuration file for ntpd 3# NetBSD default Network Time Protocol (NTP) configuration file for ntpd
4 4
5# This file is intended to be both a usable default, and a Quick-Start 5# This file is intended to be both a usable default, and a Quick-Start
6# Guide. The directives and options listed here are not at all complete. 6# Guide. The directives and options listed here are not at all complete.
7# A great deal of additional documentation, including links to FAQS and 7# A great deal of additional documentation, including links to FAQS and
8# other guides, may be found on the official NTP web site, in particular 8# other guides, may be found on the official NTP web site, in particular
9# 9#
10# http://www.ntp.org/documentation.html 10# http://www.ntp.org/documentation.html
11# 11#
12 12
13# Process ID file, so that the daemon can be signalled from scripts 13# Process ID file, so that the daemon can be signalled from scripts
14 14
@@ -61,27 +61,25 @@ mdnstries 0 @@ -61,27 +61,25 @@ mdnstries 0
61# The pool.ntp.org project needs more volunteers! The only criteria to 61# The pool.ntp.org project needs more volunteers! The only criteria to
62# join are a nailed-up connection and a static IP address. For details, 62# join are a nailed-up connection and a static IP address. For details,
63# see the web page: 63# see the web page:
64# 64#
65# http://www.pool.ntp.org/  65# http://www.pool.ntp.org/
66# 66#
67 67
68# The country codes can help you find servers that are net-wise close. 68# The country codes can help you find servers that are net-wise close.
69# As explained above, closer is better... 69# As explained above, closer is better...
70 70
71# Northern U.S.A 71# Northern U.S.A
72#server ca.pool.ntp.org 72#server ca.pool.ntp.org
73#server us.pool.ntp.org 73#server us.pool.ntp.org
74#server us.pool.ntp.org 
75 74
76# Northern Europe 75# Northern Europe
77#server de.pool.ntp.org 76#server de.pool.ntp.org
78#server de.pool.ntp.org 
79#server dk.pool.ntp.org 77#server dk.pool.ntp.org
80 78
81# Depending on the vagaries of DNS can occasionally pull in the same 79# Depending on the vagaries of DNS can occasionally pull in the same
82# server twice. The following CNAMES are guaranteed to be disjoint, at 80# server twice. The following CNAMES are guaranteed to be disjoint, at
83# least over some short interval. 81# least over some short interval.
84 82
85server 0.pool.ntp.org 83server 0.pool.ntp.org
86server 1.pool.ntp.org 84server 1.pool.ntp.org
87server 2.pool.ntp.org 85server 2.pool.ntp.org