Merge r267867 from head:

  Remove example cvsup config files.
Merge r268488 from head:

  Reword an awkward option description

PR:		191726
Submitted by:	yaneurabeya gmail.com
Merge r268637 from head:

  fortune(8): Search fortune files installed by ports/packages as well as
  those supplied by the base system.

PR:		191800
Submitted by:	Andy Kosela