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>
Junio C Hamano committed
Aug 23, 2010 at 14:20 UTC
2839478774f48074d7d87b8a9838827742a5b058
7 files changed
+19
-18
Documentation/asciidoc.conf
+1
@@ -18,6 +18,7 @@ startsb=[
18
endsb=]
19
tilde=~
20
backtick=`
21
+litdd=--
22
23
ifdef::backend-docbook[]
24
[linkgit-inlinemacro]
Documentation/git-add.txt
+1
-1
@@ -220,7 +220,7 @@ binary so line count cannot be shown) and there is no
220
difference between indexed copy and the working tree
221
version (if the working tree version were also different,
222
'binary' would have been shown in place of 'nothing'). The
223
-other file, git-add--interactive.perl, has 403 lines added
223
+other file, git-add{litdd}interactive.perl, has 403 lines added
224
and 35 lines deleted if you commit what is in the index, but
225
working tree file has further modifications (one addition and
226
one deletion).
Documentation/git-archimport.txt
+3
-3
@@ -44,7 +44,7 @@ archives that it imports, it is also possible to specify git branch names
44
manually. To do so, write a git branch name after each <archive/branch>
45
parameter, separated by a colon. This way, you can shorten the Arch
46
branch names and convert Arch jargon to git jargon, for example mapping a
47
-"PROJECT--devo--VERSION" branch to "master".
47
+"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
48
49
Associating multiple Arch branches to one git branch is possible; the
50
result will make the most sense only if no commits are made to the first
@@ -85,8 +85,8 @@ OPTIONS
85
-o::
86
Use this for compatibility with old-style branch names used by
87
earlier versions of 'git archimport'. Old-style branch names
88
- were category--branch, whereas new-style branch names are
89
- archive,category--branch--version. In both cases, names given
88
+ were category{litdd}branch, whereas new-style branch names are
89
+ archive,category{litdd}branch{litdd}version. In both cases, names given
90
on the command-line will override the automatically-generated
91
ones.
92
Documentation/git-help.txt
+3
-3
@@ -55,9 +55,9 @@ other display programs (see below).
55
+
56
The web browser can be specified using the configuration variable
57
'help.browser', or 'web.browser' if the former is not set. If none of
58
-these config variables is set, the 'git web--browse' helper script
58
+these config variables is set, the 'git web{litdd}browse' helper script
59
(called by 'git help') will pick a suitable default. See
60
-linkgit:git-web--browse[1] for more information about this.
60
+linkgit:git-web{litdd}browse[1] for more information about this.
61
62
CONFIGURATION VARIABLES
63
-----------------------
@@ -80,7 +80,7 @@ help.browser, web.browser and browser.<tool>.path
80
The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
81
be checked if the 'web' format is chosen (either by command line
82
option or configuration variable). See '-w|--web' in the OPTIONS
83
-section above and linkgit:git-web--browse[1].
83
+section above and linkgit:git-web{litdd}browse[1].
84
85
man.viewer
86
~~~~~~~~~~
Documentation/git-instaweb.txt
+3
-3
@@ -44,9 +44,9 @@ OPTIONS
44
-b::
45
--browser::
46
The web browser that should be used to view the gitweb
47
- page. This will be passed to the 'git web--browse' helper
47
+ page. This will be passed to the 'git web{litdd}browse' helper
48
script along with the URL of the gitweb instance. See
49
- linkgit:git-web--browse[1] for more information about this. If
49
+ linkgit:git-web{litdd}browse[1] for more information about this. If
50
the script fails, the URL will be printed to stdout.
51
52
--start::
@@ -79,7 +79,7 @@ You may specify configuration in your .git/config
79
80
If the configuration variable 'instaweb.browser' is not set,
81
'web.browser' will be used instead if it is defined. See
82
-linkgit:git-web--browse[1] for more information about this.
82
+linkgit:git-web{litdd}browse[1] for more information about this.
83
84
Author
85
------
Documentation/git-mergetool--lib.txt
+4
-4
@@ -1,5 +1,5 @@
1
-git-mergetool--lib(1)
2
-=====================
1
+git-mergetool{litdd}lib(1)
2
+==========================
3
4
NAME
5
----
@@ -16,11 +16,11 @@ This is not a command the end user would want to run. Ever.
16
This documentation is meant for people who are studying the
17
Porcelain-ish scripts and/or are writing new ones.
18
19
-The 'git-mergetool--lib' scriptlet is designed to be sourced (using
19
+The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using
20
`.`) by other shell scripts to set up functions for working
21
with git merge tools.
22
23
-Before sourcing 'git-mergetool--lib', your script must set `TOOL_MODE`
23
+Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`
24
to define the operation mode for the functions listed below.
25
'diff' and 'merge' are valid values.
26
Documentation/git-web--browse.txt
+4
-4
@@ -1,5 +1,5 @@
1
-git-web--browse(1)
2
-==================
1
+git-web{litdd}browse(1)
2
+=======================
3
4
NAME
5
----
@@ -7,7 +7,7 @@ git-web--browse - git helper script to launch a web browser
7
8
SYNOPSIS
9
--------
10
-'git web--browse' [OPTIONS] URL/FILE ...
10
+'git web{litdd}browse' [OPTIONS] URL/FILE ...
11
12
DESCRIPTION
13
-----------
@@ -71,7 +71,7 @@ browser.<tool>.cmd
71
When the browser, specified by options or configuration variables, is
72
not among the supported ones, then the corresponding
73
'browser.<tool>.cmd' configuration variable will be looked up. If this
74
-variable exists then 'git web--browse' will treat the specified tool
74
+variable exists then 'git web{litdd}browse' will treat the specified tool
75
as a custom command and will use a shell eval to run the command with
76
the URLs passed as arguments.
77