Update the timeout docs
Merge pull request #862 from zsxwing/timeout-docs

Update the timeout docs