DOC: fix some doc build warnings
Merge pull request #6989 from jorisvandenbossche/doc-fixes2

DOC: fix some doc build warnings