summaryrefslogtreecommitdiffstats
path: root/git-daemon.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
commite1aeb5ef657d0c4fdff12a9c7503431edd9cd128 (patch)
tree0b26e69547edd5d5bbc66d1dd470d1ce66463b1e /git-daemon.html
parentb051caf02ee59e3c9d1da4a61339f667f28754d1 (diff)
downloadgit-htmldocs-e1aeb5ef657d0c4fdff12a9c7503431edd9cd128.tar.gz
Autogenerated HTML docs for v2.0.0-239-g09531
Diffstat (limited to 'git-daemon.html')
-rw-r--r--git-daemon.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-daemon.html b/git-daemon.html
index 79a1151e5..337bce57d 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -1019,7 +1019,7 @@ Git configuration files in that directory are readable by <tt>&lt;user&gt;</tt>.
<p>
Allow/forbid overriding the site-wide default with per
repository configuration. By default, all the services
- are overridable.
+ may be overridden.
</p>
</dd>
<dt class="hdlist1">
@@ -1044,7 +1044,7 @@ Git configuration files in that directory are readable by <tt>&lt;user&gt;</tt>.
Every time a client connects, first run an external command
specified by the &lt;path&gt; with service name (e.g. "upload-pack"),
path to the repository, hostname (%H), canonical hostname
- (%CH), ip address (%IP), and tcp port (%P) as its command line
+ (%CH), IP address (%IP), and TCP port (%P) as its command-line
arguments. The external command can decide to decline the
service by exiting with a non-zero status (or to allow it by
exiting with a zero status). It can also look at the $REMOTE_ADDR
@@ -1072,7 +1072,7 @@ it declines the service.</p></div>
<h2 id="_services">SERVICES</h2>
<div class="sectionbody">
<div class="paragraph"><p>These services can be globally enabled/disabled using the
-command line options of this command. If a finer-grained
+command-line options of this command. If finer-grained
control is desired (e.g. to allow <em>git archive</em> to be run
against only in a few selected repositories the daemon serves),
the per-repository configuration file can be used to enable or
@@ -1234,7 +1234,7 @@ services are performed.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2014-06-06 12:15:38 PDT
</div>
</div>
</body>