From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 28 Jul 2006 05:14:12 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.2-rc2-gc2c4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abb53dc4ac58c5009a30ecb0a38895dce61b5296;p=git.git

Autogenerated HTML docs for v1.4.2-rc2-gc2c4
---

diff --git a/git-daemon.html b/git-daemon.html
index 148925150..e500baec9 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -276,7 +276,7 @@ git-daemon(1) Manual Page
 <div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
              [--base-path=path] [--user-path | --user-path=path]
-             [directory&#8230;]</div></div>
+             [--reuseaddr] [--detach] [--pid-file=file] [directory&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -396,6 +396,32 @@ the offers to a whitelist comprising of those.</p>
 </p>
 </dd>
 <dt>
+--reuseaddr
+</dt>
+<dd>
+<p>
+        Use SO_REUSEADDR when binding the listening socket.
+        This allows the server to restart without waiting for
+        old connections to time out.
+</p>
+</dd>
+<dt>
+--detach
+</dt>
+<dd>
+<p>
+        Detach from the shell. Implies --syslog.
+</p>
+</dd>
+<dt>
+--pid-file=file
+</dt>
+<dd>
+<p>
+        Save the process id in <em>file</em>.
+</p>
+</dd>
+<dt>
 &lt;directory&gt;
 </dt>
 <dd>
@@ -422,7 +448,7 @@ the offers to a whitelist comprising of those.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Jul-2006 01:37:40 UTC
+Last updated 28-Jul-2006 05:14:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-daemon.txt b/git-daemon.txt
index 4c357daf6..0f7d274ea 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
              [--base-path=path] [--user-path | --user-path=path]
-	     [directory...]
+	     [--reuseaddr] [--detach] [--pid-file=file] [directory...]
 
 DESCRIPTION
 -----------
@@ -82,6 +82,17 @@ OPTIONS
 --verbose::
 	Log details about the incoming connections and requested files.
 
+--reuseaddr::
+	Use SO_REUSEADDR when binding the listening socket.
+	This allows the server to restart without waiting for
+	old connections to time out.
+
+--detach::
+	Detach from the shell. Implies --syslog.
+
+--pid-file=file::
+	Save the process id in 'file'.
+
 <directory>::
 	A directory to add to the whitelist of allowed directories. Unless
 	--strict-paths is specified this will also include subdirectories