Bug 1099799: Update docs
Merge pull request #61 from jhadvig/BZ_1099799

Bug 1099799: Update docs