Merge branch 'mh/p4'

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 5054f790a140b43640d1e4d68a032d95da3daaca..d15cb6a845645d7fe76e7782ce580b3678bd25e4 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -78,7 +78,8 @@ OPTIONS
 
 --inetd::
        Have the server run as an inetd service. Implies --syslog.
-       Incompatible with --port, --listen, --user and --group options.
+       Incompatible with --detach, --port, --listen, --user and --group
+       options.
 
 --listen=<host_or_ipaddr>::
        Listen on a specific IP address or hostname.  IP addresses can