Merge r268295 from head:
  Fix equation and limerick to be correct.  NetBSD fixed this 14 years ago
  (src/games/fortune/datfiles/fortunes2 1.7).

PR:		188714
Submitted by:	ksmakoto dd.iij4u.or.jp
Merge r268342 from head:
  Remove /usr/share/doc/psd/28.cvs/paper.ps.gz if it exists, as it is
  obsolete since r251794.

PR:		191003
Submitted by:	Vick Khera
Merge r267865 from head:
  Drop example variables for updating over csup.  These have not functioned
  since r251084
Merge r267866 from head:
  Drop references to updating over csup from build(7).
Merge r268298,r268299 from head:
  Correct format string to fix build of uhsoctl when DEBUG is defined

PR:		185007
Submitted by:	saper saper.info