summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2006-10-26 06:33:07 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-10-25 22:35:20 -0700
commitd9c04ba3ddd0945ef18657a2a373c5edfe86ef7c (patch)
treeb8a042b11ee1a30ffd9c8227da857db736329ef8 /Documentation
parentDocumentation: updates to "Everyday GIT" (diff)
downloadtgif-d9c04ba3ddd0945ef18657a2a373c5edfe86ef7c.tar.xz
Remove --syslog in git-daemon inetd documentation examples.
It is useless because --inetd implies --syslog. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/everyday.txt4
-rw-r--r--Documentation/git-daemon.txt6
2 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 99e24a445b..278161f587 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -358,7 +358,7 @@ Run git-daemon to serve /pub/scm from inetd.::
------------
$ grep git /etc/inetd.conf
git stream tcp nowait nobody \
- /usr/bin/git-daemon git-daemon --inetd --syslog --export-all /pub/scm
+ /usr/bin/git-daemon git-daemon --inetd --export-all /pub/scm
------------
+
The actual configuration line should be on one line.
@@ -378,7 +378,7 @@ service git
wait = no
user = nobody
server = /usr/bin/git-daemon
- server_args = --inetd --syslog --export-all --base-path=/pub/scm
+ server_args = --inetd --export-all --base-path=/pub/scm
log_on_failure += USERID
}
------------
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index d562232e52..4b2ea2df31 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -165,8 +165,7 @@ git-daemon as inetd server::
+
------------------------------------------------
git stream tcp nowait nobody /usr/bin/git-daemon
- git-daemon --inetd --verbose
- --syslog --export-all
+ git-daemon --inetd --verbose --export-all
/pub/foo /pub/bar
------------------------------------------------
@@ -179,8 +178,7 @@ git-daemon as inetd server for virtual hosts::
+
------------------------------------------------
git stream tcp nowait nobody /usr/bin/git-daemon
- git-daemon --inetd --verbose
- --syslog --export-all
+ git-daemon --inetd --verbose --export-all
--interpolated-path=/pub/%H%D
/pub/www.example.org/software
/pub/www.example.com/software