[1.6.x] Fixed docs problems found by Tim Graham

Backpatch of e97e73df4b3a3674a400c5a2f1c0c2279ca38add