Merge branch 'fixes'

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 348a7cacd721f48545e414c150fa87eee1aa888f..065f2aa721feef01d57c5dc6ecab79223eda5363 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -7,7 +7,7 @@ git-daemon - A really simple server for GIT repositories.
 
 SYNOPSIS
 --------
-'git-daemon' [--inetd | --port=n]
+'git-daemon' [--verbose] [--syslog] [--inetd | --port=n]
 
 DESCRIPTION
 -----------
@@ -32,6 +32,13 @@ OPTIONS
 --port::
        Listen on an alternative port.
 
+--syslog::
+       Log to syslog instead of stderr. Note that this option does not imply
+       --verbose, thus by default only error conditions will be logged.
+
+--verbose::
+       Log details about the incoming connections and requested files.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>