summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-09-01 04:01:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-01 04:06:13 -0700
commitf368f5a6bc11855ab11013bc0c550bfc0868c140 (patch)
tree7f36ae0e7277ef3676a8e6b48298ea6926dbfd34
parentURL: allow port specification in ssh:// URLs (diff)
downloadtgif-f368f5a6bc11855ab11013bc0c550bfc0868c140.tar.xz
Documentation: minor AsciiDoc mark-up fixes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt12
-rw-r--r--Documentation/git-daemon.txt16
2 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cf7617a5b1..866e0534b8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -301,12 +301,12 @@ alias.*::
hide existing git commands are ignored. Arguments are split by
spaces, the usual shell quoting and escaping is supported.
quote pair and a backslash can be used to quote them.
-
- If the alias expansion is prefixed with an exclamation point,
- it will be treated as a shell command. For example, defining
- "alias.new = !gitk --all --not ORIG_HEAD", the invocation
- "git new" is equivalent to running the shell command
- "gitk --all --not ORIG_HEAD".
++
+If the alias expansion is prefixed with an exclamation point,
+it will be treated as a shell command. For example, defining
+"alias.new = !gitk --all --not ORIG_HEAD", the invocation
+"git new" is equivalent to running the shell command
+"gitk --all --not ORIG_HEAD".
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index efdcdadea7..99e47c9c25 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -248,16 +248,16 @@ a subdirectory for each virtual host IP address supported.
Repositories can still be accessed by hostname though, assuming
they correspond to these IP addresses.
-
-To enable `git-archive --remote` and disable `git-fetch` against
-a repository, have the following in the configuration file in the
-repository (that is the file 'config' next to 'HEAD', 'refs' and
-'objects').
+selectively enable/disable services per repository::
+ To enable `git-archive --remote` and disable `git-fetch` against
+ a repository, have the following in the configuration file in the
+ repository (that is the file 'config' next to 'HEAD', 'refs' and
+ 'objects').
+
----------------------------------------------------------------
-[daemon]
- uploadpack = false
- uploadarchive = true
+ [daemon]
+ uploadpack = false
+ uploadarchive = true
----------------------------------------------------------------