DOC: some minor doc fixes
Merge pull request #6653 from jorisvandenbossche/doc-fixes2

DOC: some minor doc fixes