summaryrefslogtreecommitdiff
path: root/Documentation/git-daemon.txt
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-12-17 09:08:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-18 04:49:18 (GMT)
commitf029427259c97af9ea98358866e1d28974fa4da5 (patch)
tree59078bf718ef08ae76ed80e76769bea3630dbaaf /Documentation/git-daemon.txt
parent5f48741a5a47643bf1b46ba1d23688f2ef8b1216 (diff)
downloadgit-f029427259c97af9ea98358866e1d28974fa4da5.zip
git-f029427259c97af9ea98358866e1d28974fa4da5.tar.gz
git-f029427259c97af9ea98358866e1d28974fa4da5.tar.bz2
Clean up documentation that references deprecated 'git peek-remote'.
Now that 'git peek-remote' is deprecated and only an alias for 'git ls-remote', it should not be referenced from other manual pages. This also removes the description of the --exec option, which is no longer present. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-daemon.txt')
-rw-r--r--Documentation/git-daemon.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 99e47c9..f1e48dd 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -31,8 +31,8 @@ pass some directory paths as 'git-daemon' arguments, you can further restrict
the offers to a whitelist comprising of those.
By default, only `upload-pack` service is enabled, which serves
-`git-fetch-pack` and `git-peek-remote` clients that are invoked
-from `git-fetch`, `git-ls-remote`, and `git-clone`.
+`git-fetch-pack` and `git-ls-remote` clients, which are invoked
+from `git-fetch`, `git-pull`, and `git-clone`.
This is ideally suited for read-only updates, i.e., pulling from
git repositories.
@@ -166,7 +166,7 @@ the per-repository configuration file can be used to enable or
disable them.
upload-pack::
- This serves `git-fetch-pack` and `git-peek-remote`
+ This serves `git-fetch-pack` and `git-ls-remote`
clients. It is enabled by default, but a repository can
disable it by setting `daemon.uploadpack` configuration
item to `false`.