summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-06-20 12:05:58 +0000
committerMike Frysinger <vapier@gentoo.org>2009-06-20 12:05:58 +0000
commit8485fdc69c3963bbeeeb418fe12215f516a01dfc (patch)
treea8dbb0afc6d529f5c42fd61fd9fe1b0c352d951e /net-misc
parentAdd USE=vim-syntax #272692 by Dan Fego. (diff)
downloadgentoo-2-8485fdc69c3963bbeeeb418fe12215f516a01dfc.tar.gz
gentoo-2-8485fdc69c3963bbeeeb418fe12215f516a01dfc.tar.bz2
gentoo-2-8485fdc69c3963bbeeeb418fe12215f516a01dfc.zip
Update dhcp comments in ntp.conf #270672 by Rabbe Fogelholm.
(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ntp/ChangeLog5
-rw-r--r--net-misc/ntp/files/ntp.conf8
2 files changed, 7 insertions, 6 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 86834dfab79a..e026472dac10 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/ntp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.146 2009/06/20 12:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.147 2009/06/20 12:05:58 vapier Exp $
+
+ 20 Jun 2009; Mike Frysinger <vapier@gentoo.org> files/ntp.conf:
+ Update dhcp comments in ntp.conf #270672 by Rabbe Fogelholm.
20 Jun 2009; Mike Frysinger <vapier@gentoo.org> ntp-4.2.4_p7.ebuild:
Add USE=vim-syntax #272692 by Dan Fego.
diff --git a/net-misc/ntp/files/ntp.conf b/net-misc/ntp/files/ntp.conf
index ba3417d856e9..e376fbea2186 100644
--- a/net-misc/ntp/files/ntp.conf
+++ b/net-misc/ntp/files/ntp.conf
@@ -1,9 +1,7 @@
# NOTES:
-# - you should only have to update the server line below
-# - if you start getting lines like 'restrict' and 'fudge'
-# and you didnt add them, AND you run dhcpcd on your
-# network interfaces, be sure to add '-Y -N' to the
-# dhcpcd_ethX variables in /etc/conf.d/net
+# DHCP clients can append or replace NTP configuration files.
+# You should consult your DHCP client documentation about its
+# default behaviour and how to change it.
# Name of the servers ntpd should sync with
# Please respect the access policy as stated by the responsible person.