Merge r233257, r233258 from head:

Merge r233257, r233258 from head:
  Don't run through time checks when entry is definitely oversized. This
  leads to newsyslog rotating on (size OR time) if both are specified.

  Fix a sentence in a paragraph that describes time and interval based
  trimming. This sentence vaguely can be interpreted as if it was speaking
  about time and size interaction, while it wasn't about it.

PR:	100018, 160432

git-svn-id: svn://svn.freebsd.org/base/stable/9@234674 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f