Fix building the docs

Mathieu Bridonrequested to merge
bochecha/fix-docs-master into master

Description

Trying to update the buildstream package to 1.2.5 in Fedora, I found two issues.

This MR fixes them in master, while !1302 (merged) was for the bst-1.2 branch.

I haven't unpinned sphinx (== 1.8.5 in tox.ini), as that not only requires the sphinx.ext.apidoc change, but it also requires some proper testing of the generated documentation which I didn't have the time to do.

Sphinx 1.8.5 already has the sphinx.ext.apidoc module change anyway, so this change won't break anything, it will just make it a little bit easier to move to Sphinx 2.0 eventually.

If unpinning sphinx is deemed a requirement for merging this, I'll try and take the time to test it eventually.

Merge request reports