summaryrefslogtreecommitdiff
path: root/Documentation/git-help.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-23 21:20:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-24 16:48:20 (GMT)
commit2839478774f48074d7d87b8a9838827742a5b058 (patch)
treef883af92b0d36789220ea5e38c128be66edf099b /Documentation/git-help.txt
parent22e5e58a3c75b73764b860907e4d871195f276ac (diff)
downloadgit-2839478774f48074d7d87b8a9838827742a5b058.zip
git-2839478774f48074d7d87b8a9838827742a5b058.tar.gz
git-2839478774f48074d7d87b8a9838827742a5b058.tar.bz2
Work around em-dash handling in newer AsciiDoc
Older versions of AsciiDoc used to literally pass double dashes when we used them in our linkgit macros and manpage titles, but newer ones (the issue was first reported with AsciiDoc 8.5.2) turn them into em dashes. Define litdd (literal double-dash) custom attribute in asciidoc.conf to work this around. While we are at it, fix a few double-dashes (e.g. the description of "project--devo--version" convention used by tla, among other things) that used to be incorrectly written as em dashes in the body text to also use this attribute. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-help.txt')
-rw-r--r--Documentation/git-help.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index f8df109..eccd0ff 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -55,9 +55,9 @@ other display programs (see below).
+
The web browser can be specified using the configuration variable
'help.browser', or 'web.browser' if the former is not set. If none of
-these config variables is set, the 'git web--browse' helper script
+these config variables is set, the 'git web{litdd}browse' helper script
(called by 'git help') will pick a suitable default. See
-linkgit:git-web--browse[1] for more information about this.
+linkgit:git-web{litdd}browse[1] for more information about this.
CONFIGURATION VARIABLES
-----------------------
@@ -80,7 +80,7 @@ help.browser, web.browser and browser.<tool>.path
The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
be checked if the 'web' format is chosen (either by command line
option or configuration variable). See '-w|--web' in the OPTIONS
-section above and linkgit:git-web--browse[1].
+section above and linkgit:git-web{litdd}browse[1].
man.viewer
~~~~~~~~~~