From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 21:43:24 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3-rc1~4^2~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4d1797332bca95635168032c90765a41eacdc7a;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  doc/git-daemon: add missing arguments to options
  init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
---

a4d1797332bca95635168032c90765a41eacdc7a
diff --cc Documentation/git-daemon.txt
index 36f00aed6,2172e1fed..d5596672a
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@@ -95,15 -94,11 +95,15 @@@ OPTION
  	client request is received (typically a rather low value, since
  	that should be basically immediate).
  
- --timeout::
+ --timeout=n::
  	Timeout for specific client sub-requests. This includes the time
- 	it takes for the server to process the sub-request and time spent
- 	waiting for next client's request.
+ 	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
 +	zero for no limit.
 +
  --syslog::
  	Log to syslog instead of stderr. Note that this option does not imply
  	--verbose, thus by default only error conditions will be logged.