Minor docs autogen fixes (rebased onto develop)



This is the same as gh-1021 but rebased onto develop.

----

Noticed by @snoopycrimecop and @sbesson.