Merge "Improve some timeout docs"