summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2011-12-01 06:41:34 +0000
committerpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2011-12-01 06:41:34 +0000
commit2d8f34e4ffc3c9a57b9fecfa58716323795fc6af (patch)
tree886681e1bba6347197f3757ccc1e54c7a5ade1d1
parent6859b6569cbd8633f2315b64d1001183f1434031 (diff)
downloadntp-2d8f34e4ffc3c9a57b9fecfa58716323795fc6af.tar.gz
Add descriptions of -4/-6 options to ntpd man page (closes: #613349)
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@346 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
-rw-r--r--debian/changelog1
-rw-r--r--debian/man/ntpd.86
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6e2f1ef..9c93a2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ntp (1:4.2.6.p3+dfsg-2) UNRELEASED; urgency=low
* Explicitly disable building ntpsnmpd and remove man page (closes:
#608542; see also #622819)
* ntpdate-debian: Improve parsing of ntp.conf (closes: #606349)
+ * Add descriptions of -4/-6 options to ntpd man page (closes: #613349)
-- Peter Eisentraut <petere@debian.org> Wed, 30 Nov 2011 06:51:46 +0200
diff --git a/debian/man/ntpd.8 b/debian/man/ntpd.8
index 1b2f97f..e53b695 100644
--- a/debian/man/ntpd.8
+++ b/debian/man/ntpd.8
@@ -155,6 +155,12 @@ Note: Since the slew rate of typical Unix kernels is limited to 0.5 ms/s, each s
Thus, an adjustment as much as 600 s will take almost 14 days to complete.
This option can be used with the \fB\-g\fR and \fB\-q\fR options.
Note: The kernel time discipline is disabled with this option.
+.TP
+.B \-4
+Force IPv4 DNS name resolution.
+.TP
+.B \-6
+Force IPv6 DNS name resolution.
.SH FILES
.TP
.I /etc/ntp.conf