X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-daemon.txt;h=065f2aa721feef01d57c5dc6ecab79223eda5363;hb=ab1630a3ed31d6ec5ae83769c78ed542fe3c4a28;hp=5886c83ec8b3b8a9b2d45a3094f6fbdd5f7c0904;hpb=58eaf287f1b25f6427b06bd72d8e555615828aeb;p=git.git

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 5886c83e..065f2aa7 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -3,26 +3,41 @@ git-daemon(1)
 
 NAME
 ----
-git-daemon - Some git command not yet documented.
-
+git-daemon - A really simple server for GIT repositories.
 
 SYNOPSIS
 --------
-'git-daemon' [ --option ] <args>...
+'git-daemon' [--verbose] [--syslog] [--inetd | --port=n]
 
 DESCRIPTION
 -----------
-Does something not yet documented.
+A really simple TCP git daemon that normally listens on port "DEFAULT_GIT_PORT"
+aka 9418. It waits for a connection, and will just execute "git-upload-pack"
+when it gets one.
+
+It's careful in that there's a magic request-line that gives the command and
+what directory to upload, and it verifies that the directory is ok.
 
+It verifies that the directory has the magic file "git-daemon-export-ok", and
+it will refuse to export any git directory that hasn't explicitly been marked
+for export this way.
+
+This is ideally suited for read-only updates, ie pulling from git repositories.
 
 OPTIONS
 -------
---option::
-	Some option not yet documented.
+--inetd::
+	Have the server run as an inetd service.
+
+--port::
+	Listen on an alternative port.
 
-<args>...::
-	Some argument not yet documented.
+--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
 ------
@@ -34,5 +49,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite