Some fixes in doc

(backported from 2.1)
Merge branch 'v2.0' into v2.1