Merge pull request #3508 from vlakoff/documentation-2

[ci skip] Small fixes in documentation