Match docs to current code.
Merge pull request #1125 from gkapkowski/patch-1

Match docs to current code.