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

Minor documentation fixes