DOC: small doc build fixes
Merge pull request #7635 from jorisvandenbossche/doc-fixes1

DOC: small doc build fixes