Merge pull request #1811 from sandrine-bailleux-arm/sb/doc-fixes

Miscellaneous documentation fixes