diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2007-12-29 00:20:38 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-06 18:41:44 -0800 |
| commit | 5162e69732d13dd079919a389a6ace8878aad716 (patch) | |
| tree | 18758df98847d563bfa4a1d87a0998ff010c95ed /Documentation/git-annotate.txt | |
| parent | 5f8bee5859a82144fc03feee2cc99288eb923d9d (diff) | |
| download | git-5162e69732d13dd079919a389a6ace8878aad716.tar.gz | |
Documentation: rename gitlink macro to linkgit
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock
Asciidoc configuration:
@@ -149,7 +153,10 @@
# Inline macros.
# Backslash prefix required for escape processing.
# (?s) re flag for line spanning.
-(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
+# Explicit so they can be nested.
+(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
# Anchor: [[[id]]]. Bibliographic anchor.
(?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3
# Anchor: [[id,xreflabel]]
This default regex now matches explicit values, and unfortunately in this
case gitlink was being matched by just 'link', causing the wrong inline
macro template to be applied. By renaming the macro, we can avoid being
matched by the wrong regex.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-annotate.txt')
| -rw-r--r-- | Documentation/git-annotate.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 02dc4740d0..45a6a7251e 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.txt @@ -20,7 +20,7 @@ include::blame-options.txt[] SEE ALSO -------- -gitlink:git-blame[1] +linkgit:git-blame[1] AUTHOR ------ @@ -28,4 +28,4 @@ Written by Ryan Anderson <ryan@michonline.com>. GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite |