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

Minor doc fixes