DOC: some doc build fixes
Merge pull request #7185 from jorisvandenbossche/doc-fixes3

DOC: some doc build fixes