From 70fafca6859ed889fb00271bdfa2281a7948671a Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 6 Feb 2006 08:02:01 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.1.6-ga2c6

---
 git-daemon.html | 24 +++++++++++++++++++-----
 git-daemon.txt  | 15 ++++++++++++---
 2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/git-daemon.html b/git-daemon.html
index 99d667c6..1bb6d0c2 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -275,7 +275,8 @@ git-daemon(1) Manual Page
 <div class="verseblock">
 <div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
-             [--base-path=path] [directory&#8230;]</div></div>
+             [--base-path=path] [--user-path | --user-path=path]
+             [directory&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -314,8 +315,7 @@ the offers to a whitelist comprising of those.</p>
         This is sort of "GIT root" - if you run git-daemon with
         <em>--base-path=/srv/git</em> on example.com, then if you later try to pull
         <em>git://example.com/hello.git</em>, <tt>git-daemon</tt> will interpret the path
-        as <em>/srv/git/hello.git</em>. Home directories (the <em>~login</em> notation)
-        access is disabled.
+        as <em>/srv/git/hello.git</em>.
 </p>
 </dd>
 <dt>
@@ -374,6 +374,20 @@ the offers to a whitelist comprising of those.</p>
 </p>
 </dd>
 <dt>
+--user-path, --user-path=path
+</dt>
+<dd>
+<p>
+        Allow ~user notation to be used in requests.  When
+        specified with no parameter, requests to
+        git://host/~alice/foo is taken as a request to access
+        <em>foo</em> repository in the home directory of user <tt>alice</tt>.
+        If <tt>--user-path=path</tt> is specified, the same request is
+        taken as a request to access <tt>path/foo</tt> repository in
+        the home directory of user <tt>alice</tt>.
+</p>
+</dd>
+<dt>
 --verbose
 </dt>
 <dd>
@@ -408,7 +422,7 @@ the offers to a whitelist comprising of those.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 08-Jan-2006 16:53:07 PDT
+Last updated 06-Feb-2006 08:01:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-daemon.txt b/git-daemon.txt
index a20e0533..2cc6075f 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 [verse]
 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
-             [--base-path=path] [directory...]
+             [--base-path=path] [--user-path | --user-path=path]
+	     [directory...]
 
 DESCRIPTION
 -----------
@@ -42,8 +43,7 @@ OPTIONS
 	This is sort of "GIT root" - if you run git-daemon with
 	'--base-path=/srv/git' on example.com, then if you later try to pull
 	'git://example.com/hello.git', `git-daemon` will interpret the path
-	as '/srv/git/hello.git'. Home directories (the '~login' notation)
-	access is disabled.
+	as '/srv/git/hello.git'.
 
 --export-all::
 	Allow pulling from all directories that look like GIT repositories
@@ -70,6 +70,15 @@ OPTIONS
 	Log to syslog instead of stderr. Note that this option does not imply
 	--verbose, thus by default only error conditions will be logged.
 
+--user-path, --user-path=path::
+	Allow ~user notation to be used in requests.  When
+	specified with no parameter, requests to
+	git://host/~alice/foo is taken as a request to access
+	'foo' repository in the home directory of user `alice`.
+	If `--user-path=path` is specified, the same request is
+	taken as a request to access `path/foo` repository in
+	the home directory of user `alice`.
+
 --verbose::
 	Log details about the incoming connections and requested files.
 
-- 
2.11.0

