Merge branch 'tr/maint-merge-file-subdir'

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 2f0ddf6fe817ab7b59fb5f5276ba688447661ee3..5054f790a140b43640d1e4d68a032d95da3daaca 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -85,6 +85,7 @@ OPTIONS
        be either an IPv4 address or an IPv6 address if supported.  If IPv6
        is not supported, then --listen=hostname is also not supported and
        --listen must be given an IPv4 address.
+       Can be given more than once.
        Incompatible with '--inetd' option.
 
 --port=<n>::