summaryrefslogtreecommitdiffstats
path: root/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-21 23:32:22 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-21 23:32:22 -0700
commit7bd050fbdc12530213c7058bbba1b4a333ec7c02 (patch)
tree1cac5747e8b50eb2c2e683de8ea603761d0bdcc5 /git-daemon.txt
parent5723afaf3a61cef537e1f4dfa88f8faf31060ef0 (diff)
downloadgit-htmldocs-7bd050fbdc12530213c7058bbba1b4a333ec7c02.tar.gz
Autogenerated HTML docs for v1.7.7-rc2-4-g5ec82
Diffstat (limited to 'git-daemon.txt')
-rw-r--r--git-daemon.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-daemon.txt b/git-daemon.txt
index ebd13be72..69a1e4af9 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -93,14 +93,14 @@ OPTIONS
Listen on an alternative port. Incompatible with '--inetd' option.
--init-timeout=<n>::
- 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=<n>::
- 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=<n>::
Maximum number of concurrent clients, defaults to 32. Set it to