- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

General mdoc(7) and typo fixes.

PR: 167804
Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org)
MFC after: 3 days

Remove superfluous paragraph macro.

Spelling fixes for usr.sbin/

Fix some duplicate-word typos in manpages.

Submitted by: arundel
MFC after: 1 week

Fix typos and spelling mistakes.

Add a sentence to the man page explaining that the -d option
can only be used when ntpd is compiled with DEBUG support.

PR: docs/138206
Submitted by: Oliver Pinter (oliver dot pntr at gmail dot com)
MFC after: 5 days
Approved by: roberto

Complete ntptrace(8) removal:
- do not install man page
- update ObsoleteFiles.inc

Approved by: roberto@

Correct typo: thetime -> the time

PR: docs/139447
Submitted by: Guido Falsi mad at madpilot dot net

- fix typo

PR: docs/128973
Submitted by: tabthorpe

Update the various files to sync with vendor import of 4.2.4p5.
sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy. It is an internal library, not
installed.

MFC after: 2 weeks

Delete description of non-existent options: "-4" and "-6".

ntpd's "-4" and "-6" options are described in the original documentation
(contrib/ntp/html/ntpd.html). It may be original's doc bug.

PR: docs/112642
Submitted by: Seth Hieronymus<shieronymus@speakeasy.net>
Discussed with: ume
MFC after: 1 week

- Fix typo in ntpd(8).

Noticed by: Ben Kaduk (minimarmot _at_ gmail.com)
Approved by: delphij@ (mentor)

Fix typo.

Correct the description of minpoll and maxpoll.

Note that while later versions of the ntpd documentation use the term
"dual logarithm", the text added here is consistent with the remainder
of the current document.

PR: docs/106926
Submitted by: Jeremy Chadwick

Revise markup.

Markup fixes.

- Fix markup

PR: docs/98471
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
MFC after: 1 day

- Update to ntp-4.2.0

PR: docs/79857
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

If we don't want HTML docs, we might still want manpages.
If we don't want manpages, we might still want HTML docs.

Fix all the spelling mistakes I could find in the man pages for words
that have at least 3 characters.

MFC after: 1 week
Thanks to: Music band ``Chingon''
for keeping me company while searching for these.

Document that /etc/rc.d/ntpdate will read this file to find out a list
of NTP hosts, if ntpdate_hosts is unset or empty.

PR: conf/79712
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
mdoc text by: Matteo Riondato <rionda@gufi.org>

Release maintainership. More ambitious minds have plans for the ntp
docs. Last I heard, Harlan Stenn was considering using FreeBSD's
pages as a starting point for the ISC NTP distribution's own pages.
If that happens, everyone wins and these can go away, to be replaced
by imported versions in contrib/ntp.

Expand *n't contractions.

Fix typo.

Submitted by: Patrick Oonk <patrick@cookie.monster.org>
PR: docs/72912
MFC after: 1 week

Update our ntpd to the long awaited 4.2.0 version.

This bring us several things:
- updated drivers
- IPv6 support at last
- ntp-genkeys is replaced by ntp-keygen
- ntptrace is now a script (courtesy of John Hay)
- lots of renamed files from .htm to .html (while I prefer .html, I
find the change a bit gratuitous)
- still no manpages :(

Please test and report.

Commit very much helped by: GNU arch (http://gnuarch.org/)

Eliminated double whitespace.

Mechanically kill hard sentence breaks.

Add missing spaces after "logconfig" in example lines.

PR: docs/64082
Submitted by: Tsurutani Naoki
MFC after: 3 days

Xref police: ntp.conf(8) -> ntp.conf(5).

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

english(4) police.

mdoc(7) police: Deal with self-xrefs.

Uniformly refer to a file system as "file system".

Approved by: re

mdoc(7) police: kill whitespace at EOL.

Approved by: re

Update ntpd to 4.1.1a. This contains many bug fixes made on the STABLE
branch and a few new drivers. See contrib/ntp/ChangeLog for details.

Hide kernel header sys/lock.h from ntp [1]

PR: bin/33914
Submitted by: thomas, bde[1]
MFC after: 1 month

The .Nm utility

Fix spelling errors: minumum, overriden, inheritted

MFC after: 3 weeks

Consistancy check: s/file system/filesystem/g

Various fixes, mostly for problems introduced by my mdoc transcription,
rather than problems that existed in the original HTML "source".

PR: docs/33585
Submitted: Norihiro Kumagai <kumagai@attbi.com>

There are 4 key formats, not 3.

PR: 33586
Submitted by: Norihiro Kumagai <kuma@12-225-156-18.client.attbi.com>

Correct typos and macro usage.

PR: 33179, 33181, 33295
Submitted by: Norihiro Kumagai <kumagai@attbi.com>
Reviewed by: sheldonh (MAINTAINER)
MFC after: 2 days

Install files via FILES.

mdoc(7) police: This still can be done with one-line display.

Connect the new ntp-genkeys.8 page to the build.

Update the mdoc NTP documentation transcribed from the HTML documentation
for ntp-4.1.0.

Unfortunately, David Mills insists on managing the documentation in
such a way as to make it impossible for me to make things easy on our
translators, without printing out the documentation and reading through
it side-by-side with a finger on each page.

mdoc(7) police: join split punctuation to macro calls.

Miscellaneous fixes.

In particularly, the -h and -m flags were incorrectly described.

mdoc(7) police: sort SEE ALSO xrefs (sort -b -f +2 -3 +1 -2).

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Preceed/preceeding are not english words. Use precede and preceding.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

mdoc(7) police: use the new features of the Nm macro.

Fix cross-references which referred to xntp* instead of ntp*.

PR: 22483
Submitted by: Philipp Mergenthaler <un1i@rz.uni-karlsruhe.de>

Improve some slightly confused formatting.

Reviewed by: sheldonh

Fix more HTML -> mdoc transcription errors.

Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Remove trailing whitespace.

Work around mdoc macro argument limit.

PR: 18562
Submitted by: takamune@avrl.mei.co.jp (Kazu TAKAMUNE)

Work around the mdoc argument limit in the Nd name description.

PR: 18465
Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Fix a typo inherited from the HTML documentation:
assocation -> association

PR: 17501
Submitted by: Yoshihiko SARUMARU <mistral@imasy.org>

Replace erroneous use of Ic (internal command) with the intended
It (list item) and remove a duplicated list entry obscured by this
mistake.

PR: 17500
Submitted by: Yoshihiko SARUMARU <mistral@imasy.org>

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Merge into the manual pages the changes from 4.0.99b:
ntpd.8:
add -gx to SYNOPSIS
clarify explanation of -g
ntp.conf.5:
add missing field description for rawstats lines

Install audio.htm, driver3[567].htm and qth.htm.

Add myself as ntp docs maintainer, with roberto's permission.

Move the Variables section of the old ntp_misc(8) manual page to
the correct location in the ntpd(8) page.

Abandon hope of keeping in line with the author's structure,
in favour of placing information in the correct sections.

The ntp_acc(8), ntp_auth(8), ntp_clock(8), ntp_conf(8),
ntp_misc(8) and ntp_mon(8) pages have been merged into
ntp.conf(5) and ntp.keys(5).

Requested by: rgrimes, wollman

Add selected manual pages transcribed from the HTML documentation.
Those pages which have not been transcribed are referenced as
gracefully as possible.

There is no perfect section for the ntp_* files, which document
configuration options for the NTP suite, so I'm putting them in
the same section as the pages for the utilities themselves.

Install ntp html docs as /usr/share/doc/ntp