Merge branch 'maint-1.6.0' into maint

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

diff --cc Documentation/git-daemon.txt
index 36f00aed6798d543b2ee8f7315e447726fa100e5,2172e1fedccc99a6494d85feb9f99735af32267d..d5596672a5493062afbbd3b57f94a3673f9de659
--- 1/Documentation/git-daemon.txt
--- 2/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.

diff --cc builtin-init-db.c
Simple merge