Skip to content

Commit 5162e69

Browse files
toofishesgitster
toofishes
authored and
gitster
committed
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>
1 parent 5f8bee5 commit 5162e69

File tree

149 files changed

+603
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+603
-603
lines changed

‎Documentation/asciidoc.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## gitlink: macro
1+
## linkgit: macro
22
#
3-
# Usage: gitlink:command[manpage-section]
3+
# Usage: linkgit:command[manpage-section]
44
#
55
# Note, {0} is the manpage section, while {target} is the command.
66
#
@@ -15,7 +15,7 @@ endsb=&#93;
1515
tilde=&#126;
1616

1717
ifdef::backend-docbook[]
18-
[gitlink-inlinemacro]
18+
[linkgit-inlinemacro]
1919
{0%{target}}
2020
{0#<citerefentry>}
2121
{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -61,6 +61,6 @@ endif::backend-docbook[]
6161
endif::doctype-manpage[]
6262

6363
ifdef::backend-xhtml11[]
64-
[gitlink-inlinemacro]
64+
[linkgit-inlinemacro]
6565
<a href="{target}.html">{target}{0?({0})}</a>
6666
endif::backend-xhtml11[]

‎Documentation/blame-options.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
3939
Show raw timestamp (Default: off).
4040

4141
-S <revs-file>::
42-
Use revs from revs-file instead of calling gitlink:git-rev-list[1].
42+
Use revs from revs-file instead of calling linkgit:git-rev-list[1].
4343

4444
-p, --porcelain::
4545
Show in a format designed for machine consumption.

‎Documentation/cmd-list.perl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sub format_one {
2727
die "No description found in $name.txt";
2828
}
2929
if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {
30-
print $out "gitlink:$name\[1\]::\n\t";
30+
print $out "linkgit:$name\[1\]::\n\t";
3131
if ($attr =~ / deprecated /) {
3232
print $out "(deprecated) ";
3333
}

0 commit comments

Comments
 (0)