From: A Large Angry SCM <gitzilla@gmail.com>
Date: Tue, 30 Aug 2005 02:31:22 +0000 (-0400)
Subject: [PATCH] Documentation for git-daemon.
X-Git-Tag: v0.99.6~56
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=62cd033daa48f5fadda8921635a7073d3adc4a32;p=git.git

[PATCH] Documentation for git-daemon.

Copy & paste source comments into documentation.

Signed-off-by:  <gitzilla@gmail.com>
(cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit)
---

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 5886c83e..5fc45f21 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -3,26 +3,34 @@ 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' [--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.
-
-<args>...::
-	Some argument not yet documented.
+--inetd::
+	Have the server run as an inetd service.
 
+--port::
+	Listen on an alternative port.
 
 Author
 ------