Merge r684337, r684338 from trunk:

* Fix bogus explanation of timeout parameter

* Improve timeout documentation even more

Submitted by: rpluem
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@684343 13f79535-47bb-0310-9956-ffa450edef68