Skip to content

Commit

Permalink
doc/git-daemon: add missing arguments to options
Browse files Browse the repository at this point in the history
Also fix some spellings and typos.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Markus Heidelberg authored and Junio C Hamano committed Apr 18, 2009
1 parent 32d1776 commit 6285441
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Documentation/git-daemon.txt
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ OPTIONS
'git-daemon' will refuse to start when this option is enabled and no
whitelist is specified.

--base-path::
--base-path=path::
Remap all the path requests as relative to the given path.
This is sort of "GIT root" - if you run 'git-daemon' with
'--base-path=/srv/git' on example.com, then if you later try to pull
@@ -80,24 +80,24 @@ OPTIONS
Incompatible with --port, --listen, --user and --group options.

--listen=host_or_ipaddr::
Listen on an a specific IP address or hostname. IP addresses can
be either an IPv4 address or an IPV6 address if supported. If IPv6
Listen on a specific IP address or hostname. IP addresses can
be either an IPv4 address or an IPv6 address if supported. If IPv6
is not supported, then --listen=hostname is also not supported and
--listen must be given an IPv4 address.
Incompatible with '--inetd' option.

--port=n::
Listen on an alternative port. Incompatible with '--inetd' option.

--init-timeout::
--init-timeout=n::
Timeout between the moment the connection is established and the
client request is received (typically a rather low value, since
that should be basically immediate).

--timeout::
--timeout=n::
Timeout for specific client sub-requests. This includes the time
it takes for the server to process the sub-request and time spent
waiting for next client's request.
it takes for the server to process the sub-request and the time spent
waiting for the next client's request.

--syslog::
Log to syslog instead of stderr. Note that this option does not imply
@@ -145,7 +145,7 @@ the facility of inet daemon to achieve the same before spawning
Enable/disable the service site-wide per default. Note
that a service disabled site-wide can still be enabled
per repository if it is marked overridable and the
repository enables the service with an configuration
repository enables the service with a configuration
item.

--allow-override=service::

0 comments on commit 6285441

Please sign in to comment.