From: Christian Couder Date: Thu, 26 Oct 2006 04:33:07 +0000 (+0200) Subject: Remove --syslog in git-daemon inetd documentation examples. X-Git-Tag: v1.4.3.4~22 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d9c04ba3ddd0945ef18657a2a373c5edfe86ef7c;p=git.git Remove --syslog in git-daemon inetd documentation examples. It is useless because --inetd implies --syslog. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index 99e24a445..278161f58 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 d562232e5..4b2ea2df3 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