Sundry doc changes

Replaces https://github.com/numpy/numpy/pull/5360 targeted at the right branch.