From b8843efc062cd9e0a994943f6fc86182e4ebb0ec Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 27 Aug 2011 16:29:20 +0200 Subject: git-daemon.txt: specify --timeout in seconds Signed-off-by: Michael Stapelberg Signed-off-by: Junio C Hamano --- Documentation/git-daemon.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/git-daemon.txt') 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 -- cgit v1.2.1