X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=git-daemon%2FREADME;h=97edd702ca263f51690a3c635ea09f9e73ef6ac4;hb=b943240f15db6b7684fbd241dc0ab5445390dde5;hp=d8e6a7a2f772d09b6121c4df079d16a2405d6ca4;hpb=e9fec26ad6b6fdbdf77a2422f7b0bdf2eeb5e07b;p=userv-utils.git

diff --git a/git-daemon/README b/git-daemon/README
index d8e6a7a..97edd70 100644
--- a/git-daemon/README
+++ b/git-daemon/README
@@ -15,7 +15,7 @@ userv-git-daemon uses $(libuserv), $(etcuserv), and $(services).
 
 Type make install.
 
-Create a "git" user that will run the outer part of the git-daemon.
+Create a "userv-git" user that will run the outer part of the git-daemon.
 Ensure your /etc/services contains a line like "git 9418/tcp".
 
 Insert the inetd.conf fragment into your /etc/inetd.conf
@@ -33,31 +33,36 @@ Operation:
 ----------
 
 The userv-git-daemon is invoked by inetd which also tells it where to
-find its global git-urlmap script.
+find its global git-urlmap config.
 
 The git-daemon parses the request from the network and uses the global
-git-urlmap script to determine which user will run the requested
-service. It invokes userv for the request to be performed. The most
+git-urlmap config to determine which user will run the requested
+service.  It invokes userv for the request to be performed.  The most
 common service is git-upload-pack, which is confusingly named: it
 uploads from the repository to the network; other services supported
 by git are git-upload-archive and git-receive-pack.
 
-The git-daemon will pass any service beginning git- to userv. The
+The git-daemon will pass any service beginning git- to userv.  The
 userv configuration determines which services may be requested. This
 package includes example git-upload-pack service configurations.
 
 The service configuration uses the git-service script to run the
-service. It passes the global and per-user git-urlmap scripts to the
+service.  It passes the global and per-user git-urlmap configs to the
 git-service script to determine where in the filesyetem the requested
-repository is. Later urlmap scripts override the choices made by
-earlier ones. See the sample git-urlmap script for details of the
-variables they can examine and set.
+repository is.  Later urlmap entries override the choices made by
+earlier ones.
 
 If a repository is located, the git-service script runs the requested
 service, which is simply the git program with the same name.
 
 
+Configuration:
+--------------
+
+See "git-urlmap" for syntax description and an example.
+
+
 ----------------------------------------------
-This was written by Tony Finch <dot@dotat.at>
-You may do anything with it, at your own risk.
+This was written by Tony Finch <dot@dotat.at> and subsequently
+heavily modified by Ian Jackson <ijackson@chiark.greenend.org.uk>
 http://creativecommons.org/publicdomain/zero/1.0/