summaryrefslogtreecommitdiffstats
path: root/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
commit341071d878757c06a3931db660fe318effc8317e (patch)
tree8cb7bf28351c062adbe71172b942a3228d40725d /git-daemon.txt
parentbb8fb05ed082c81af81f9eecf356f993e2ef83b7 (diff)
downloadgit-htmldocs-341071d878757c06a3931db660fe318effc8317e.tar.gz
Autogenerated HTML docs for v1.3.3-g16a4
Diffstat (limited to 'git-daemon.txt')
-rw-r--r--git-daemon.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-daemon.txt b/git-daemon.txt
index 924a676a6..4c357daf6 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -20,7 +20,7 @@ aka 9418. It waits for a connection, and will just execute "git-upload-pack"
when it gets one.
It's careful in that there's a magic request-line that gives the command and
-what directory to upload, and it verifies that the directory is ok.
+what directory to upload, and it verifies that the directory is OK.
It verifies that the directory has the magic file "git-daemon-export-ok", and
it will refuse to export any git directory that hasn't explicitly been marked
@@ -28,7 +28,7 @@ for export this way (unless the '--export-all' parameter is specified). If you
pass some directory paths as 'git-daemon' arguments, you can further restrict
the offers to a whitelist comprising of those.
-This is ideally suited for read-only updates, ie pulling from git repositories.
+This is ideally suited for read-only updates, i.e., pulling from git repositories.
OPTIONS
-------