Merge branch 'fix/misc-documents-fixes' into 'master'

Miscellaneous documents fixes

Closes #612 (closed)

See merge request !765 (merged)

(cherry picked from commit e9b4c45a)

95fc4a10 Miscellaneous documents fixes