Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE
cycle.

Prune svn:mergeinfo from the new branch, and rename it to RC1.

Update __FreeBSD_version.

Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and
the dvd1.iso packages population.

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

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

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

Bring a little more compability with GNU units 2.12
- notionally support a 'history file' flag. This doesn't do much now,
but is there to prevent scripts written against GNU units from
breaking
- correctly gracefully quit rather than exit (this will make it easier
to support a history file in the future)
- remove the "t" flag from fopen which was there to support windows. We
have not supported windows since at the latest, the introduction of
capsicum.

Rename units.lib -> definitions.units
- this matches GNU units 2.12
add ISO country codes from units 2.12

units(1): Add support for output-format
Add support for the output-format argument. This also exposes subtle
rounding differences between GNU units and our units.

units: Support start of line comments with '#'
Modern GNU units(1) supports comments anywhere with '#' but take the easy route for now and at least support start of line # comments.

units(1): Add 'terse' support
terse output is used when calling units from another script.

units(1): Add 'help' flag
- Add support for --help for compatibility
- Make usage() static

units(1): Fix man page
Igor walks one way. I walked the other.

Reported by: wblock

units(1): add long options
Things brings additional compatibility with units 2.10

Discussed with: wblock (man page)

use .Mt to mark up email addresses consistently (part3)

PR: 191174
Submitted by: Franco Fichtner <franco at lastsummer.de>

units(1): Add v option: verbose

For increased compatibility with GNU units: support a -v option which
produces more verbose output when spitting out the answer.
GNU -v does additional work in the version, information, and check output which
we do not (yet?) replicate.

units(1): Add U option

For increased compatibility with GNU units: support a -U option which tests for the
existence of the default units file and prints it to the screen.

units(1): make -V print version instead of -v

The units program is likely little used. It is even less likely that a script
will want the units program to print out its version number by passing -v.

GNU units uses -V for version and -v for verbosity.

Increase compatibility between these two versions (written by the same author)
by switching our flag as well.

Take this opportunity to remove bogus information about the version number and
just call it 'FreeBSD units'.

Discussed with: cperciva, rwatson

mdoc: terminate quoted strings.

Reviewed by: brueffer

It seems when I added code for affine unit changes to units, I
forgot to tell the man page we could now convert Celsius to Fahrenheit.

Approved by: re (kib)
MFC after: 1 month

Expand *n't contractions.

Sort sections.

Mechanically kill hard sentence breaks.

mdoc(7): Fixed list types.

Remove whitespace at EOL.

Reverse order of from and to in order to match reality.

PR: 26631
Submitted by: Glenn Johnson, glennpj@charter.net

All temperature scales are centigrades. Use "Celsius" instead.

As far as I can tell, you have never been able to use 'ab' as a unit
name if 'a' and 'b' are unit names. You can use 'a b' though.

Prepare for mdoc(7)NG.

mdoc(7) police: use certified section headers wherever possible.

$Id$ -> $FreeBSD$

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq.

Use err(3). Cosmetic in usage(). Rewrote man page in mdoc format.

Specify the full path of units.lib in the FILES section.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Added revised manpage submitted by the author of units.

Reviewed by: alex
Submitted by: Adrian Mariano <adrian@cam.cornell.edu>

This commit was generated by cvs2svn to compensate for changes in r16186,
which included commits to RCS files with non-trunk default branches.

Units conversion utility courtesy of NetBSD.

Submitted by: Jeremy Prior
Obtained from: NetBSD