summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-05-02 19:43:52 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-03 00:05:01 -0700
commit9a7b0bca366d8d9b3b26f1bb1a75885780c0f0e4 (patch)
treeec820bf0b43b860a488ef224844e5c4a6a53c30c /Documentation
parentThe eighth batch of topics graduated to 'master' (diff)
downloadtgif-9a7b0bca366d8d9b3b26f1bb1a75885780c0f0e4.tar.xz
doc/config: fix inline literals
Since commit 6cf378f, asciidoc backticks are now inline literals; therefore quoting {tilde} inside them is wrong (this instance was missed in 6cf378f because it happened on a parallel line of development). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cb9882d0a8..355ee53652 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -95,8 +95,8 @@ included file is expanded immediately, as if its contents had been
found at the location of the include directive. If the value of the
`include.path` variable is a relative path, the path is considered to be
relative to the configuration file in which the include directive was
-found. The value of `include.path` is subject to tilde expansion: `{tilde}/`
-is expanded to the value of `$HOME`, and `{tilde}user/` to the specified
+found. The value of `include.path` is subject to tilde expansion: `~/`
+is expanded to the value of `$HOME`, and `~user/` to the specified
user's home directory. See below for examples.
Example