small fixes to documentation
Merge remote-tracking branch 'fredrik/master'