Merge branch 'ms/daemon-timeout-is-in-seconds'

* ms/daemon-timeout-is-in-seconds:
  git-daemon.txt: specify --timeout in seconds
This commit is contained in:
Junio C Hamano 2011-09-02 13:17:58 -07:00
commit c33e30675b

View File

@ -93,14 +93,14 @@ OPTIONS
Listen on an alternative port. Incompatible with '--inetd' option. Listen on an alternative port. Incompatible with '--inetd' option.
--init-timeout=<n>:: --init-timeout=<n>::
Timeout between the moment the connection is established and the Timeout (in seconds) between the moment the connection is established
client request is received (typically a rather low value, since and the client request is received (typically a rather low value, since
that should be basically immediate). that should be basically immediate).
--timeout=<n>:: --timeout=<n>::
Timeout for specific client sub-requests. This includes the time Timeout (in seconds) for specific client sub-requests. This includes
it takes for the server to process the sub-request and the time spent the time it takes for the server to process the sub-request and the
waiting for the next client's request. time spent waiting for the next client's request.
--max-connections=<n>:: --max-connections=<n>::
Maximum number of concurrent clients, defaults to 32. Set it to Maximum number of concurrent clients, defaults to 32. Set it to