X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-daemon.html;h=ae1dea8daa02f696bf2d672298df22ad39228141;hb=341071d878757c06a3931db660fe318effc8317e;hp=7aecf6409700e7c596c3e6ba9a1cb0b4f624943c;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-daemon.html b/git-daemon.html
index 7aecf640..ae1dea8d 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 {
@@ -266,14 +266,17 @@ git-daemon(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-daemon -
-   A really simple server for git repositories.
+   A really simple server for git repositories
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
-             [--timeout=n] [--init-timeout=n] [--strict-paths] [directory&#8230;]</p>
+<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] [--user-path | --user-path=path]
+             [directory&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -281,13 +284,13 @@ git-daemon(1) Manual Page
 aka 9418. It waits for a connection, and will just execute "git-upload-pack"
 when it gets one.</p>
 <p>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.</p>
+what directory to upload, and it verifies that the directory is OK.</p>
 <p>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 (unless the <em>--export-all</em> parameter is specified). If you
 pass some directory paths as <em>git-daemon</em> arguments, you can further restrict
 the offers to a whitelist comprising of those.</p>
-<p>This is ideally suited for read-only updates, ie pulling from git repositories.</p>
+<p>This is ideally suited for read-only updates, i.e., pulling from git repositories.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -304,6 +307,18 @@ the offers to a whitelist comprising of those.</p>
 </p>
 </dd>
 <dt>
+--base-path
+</dt>
+<dd>
+<p>
+        Remap all the path requests as relative to the given path.
+        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>.
+</p>
+</dd>
+<dt>
 --export-all
 </dt>
 <dd>
@@ -359,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>
@@ -393,7 +422,7 @@ the offers to a whitelist comprising of those.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:15:59 PDT
+Last updated 04-Jun-2006 07:24:23 UTC
 </div>
 </div>
 </body>
