[Bug 1948] Update man page section layout

bk: 4e2209ebGF_mDMryefijeJOF6cfQZg

diff --git a/ChangeLog b/ChangeLog
index 3b004be2b978e99039f682f292eacf21af12bf71..d11a7a29e7e76319ea52bd0c130b0d99b22c365a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1948] Update man page section layout.
 * [Bug 1964] --without-sntp should not build sntp.
 (4.2.7p190) 2011/07/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1961] from 4.2.6p4: html2man update: distribute ntp-wait.html.

diff --git a/scripts/html2man.in b/scripts/html2man.in
index 2f5fb3f9935e95deb6b2d7a60755084d6324a9c5..adc484820a08fc30c39eb374fcddd622c5d23551 100755 (executable)
--- a/scripts/html2man.in
+++ b/scripts/html2man.in
@@ -19,21 +19,21 @@ $MANDIR = "./man";
 # HTML files to convert.  Also include per-file info here: 
 #   name of man page, man section, 'see also' section
 %manfiles = (
-            'ntpd' => ['ntpd', 8, 'ntp.conf(5), ntpq(8), ntpdc(8)'],
-            'ntpq' => ['ntpq', 8, 'ntp_decode(5), ntpd(8), ntpdc(8)'],
-            'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
-            'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
-            'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
-            'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
-            'ntp-wait' => ['ntp-wait', 8, 'ntpd(8)'],
-            'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
-            'tickadj' => ['tickadj', 8, 'ntpd(8)'],
-            'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
-            'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
+            'ntpd' => ['ntpd', @NTPD_MS@, 'ntp.conf(5), ntpq(@NTPQ_MS@), ntpdc(@NTPDC_MS@)'],
+            'ntpq' => ['ntpq', @NTPQ_MS@, 'ntp_decode(5), ntpd(@NTPD_MS@), ntpdc(@NTPDC_MS@)'],
+            'ntpdate' => ['ntpdate', @NTPDATE_MS@, 'ntpd(@NTPD_MS@)'],
+            'ntpdc' => ['ntpdc', @NTPDC_MS@, 'ntpd(@NTPD_MS@)'],
+            'ntptime' => ['ntptime', @NTPTIME_MS@, 'ntpd(@NTPD_MS@), ntpdate(@NTPDATE_MS@)'],
+            'ntptrace' => ['ntptrace', @NTPTRACE_MS@, 'ntpd(@NTPD_MS@)'],
+            'ntp-wait' => ['ntp-wait', @NTP_WAIT_MS@, 'ntpd(@NTPD_MS@)'],
+            'keygen' => ['ntp-keygen', @NTP_KEYGEN_MS@, 'ntpd(@NTPD_MS@), ntp_auth(5)'],
+            'tickadj' => ['tickadj', @TICKADJ_MS@, 'ntpd(@NTPD_MS@)'],
+            'confopt' => ['ntp.conf', 5, 'ntpd(@NTPD_MS@), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
+            'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(@NTPD_MS@)'],
             'monopt' => ['ntp_mon', 5, 'ntp.conf(5), ntp_decode(5)'],
             'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
             'clockopt' => ['ntp_clock', 5, 'ntp.conf(5)'],
-            'decode' => ['ntp_decode', 5, 'ntpq(8), ntp_mon(5)'],
+            'decode' => ['ntp_decode', 5, 'ntpq(@NTPQ_MS@), ntp_mon(5)'],
             'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']);
 
 %table_headers = (