From: Junio C Hamano Date: Fri, 2 Sep 2011 20:17:58 +0000 (-0700) Subject: Merge branch 'ms/daemon-timeout-is-in-seconds' X-Git-Tag: v1.7.7-rc1~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c33e30675b601d6707dc4022a8f64812509c7566?hp=b43b8a20d33f6b19b088b505537133fc898048f6 Merge branch 'ms/daemon-timeout-is-in-seconds' * ms/daemon-timeout-is-in-seconds: git-daemon.txt: specify --timeout in seconds --- diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index ebd13be72e..69a1e4af9e 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -93,14 +93,14 @@ OPTIONS Listen on an alternative port. Incompatible with '--inetd' option. --init-timeout=:: - Timeout between the moment the connection is established and the - client request is received (typically a rather low value, since + Timeout (in seconds) between the moment the connection is established + and the client request is received (typically a rather low value, since that should be basically immediate). --timeout=:: - Timeout for specific client sub-requests. This includes the time - it takes for the server to process the sub-request and the time spent - waiting for the next client's request. + Timeout (in seconds) for specific client sub-requests. This includes + the time it takes for the server to process the sub-request and the + time spent waiting for the next client's request. --max-connections=:: Maximum number of concurrent clients, defaults to 32. Set it to