aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-06-30 17:15:57 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-01 17:20:09 -0700
commit963a653fa635c6b07ed399b2fafca2a4d7866a21 (patch)
tree7352248e78ffcacb02dce8306749d530aa9bda01
parent3861cd5582d4ae4b41a3bf4c464e780d1725ad4e (diff)
downloadgit-963a653fa635c6b07ed399b2fafca2a4d7866a21.tar.gz
git-963a653fa635c6b07ed399b2fafca2a4d7866a21.tar.xz
git-daemon(1): don't assume git-daemon is in /usr/bin
In the example inetd.conf lines in git-daemon(1), it was assumed that `git-daemon` resides in the user's /usr/bin. With this patch, we only assume `git` is in /usr/bin. The stronger assumption fails in the default installation nowadays. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-daemon.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 344f24ea5..b71eb94d5 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -206,8 +206,8 @@ git-daemon as inetd server::
/etc/inetd all on one line:
+
------------------------------------------------
- git stream tcp nowait nobody /usr/bin/git-daemon
- git-daemon --inetd --verbose --export-all
+ git stream tcp nowait nobody /usr/bin/git
+ git daemon --inetd --verbose --export-all
/pub/foo /pub/bar
------------------------------------------------
@@ -219,8 +219,8 @@ git-daemon as inetd server for virtual hosts::
`/etc/inetd` all on one line:
+
------------------------------------------------
- git stream tcp nowait nobody /usr/bin/git-daemon
- git-daemon --inetd --verbose --export-all
+ git stream tcp nowait nobody /usr/bin/git
+ git daemon --inetd --verbose --export-all
--interpolated-path=/pub/%H%D
/pub/www.example.org/software
/pub/www.example.com/software
@@ -241,7 +241,7 @@ git-daemon as regular daemon for virtual hosts::
their IP addresses, start the daemon like this:
+
------------------------------------------------
- git-daemon --verbose --export-all
+ git daemon --verbose --export-all
--interpolated-path=/pub/%IP/%D
/pub/192.168.1.200/software
/pub/10.10.220.23/software