Update to r42525:
Clarify, improve language and tags.
Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D4305