Merge pull request #362 from jabooth/smallfixes

Assorted doc fixes
Merge remote-tracking branch 'upstream/master' into hcopy2