Merge pull request #481 from sandrine-bailleux/sb/fix-doc

Various documentation fixes