summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-03-04 19:13:09 -0500
committerLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-03-10 23:05:01 -0500
commitc816eb1784b324fcf3988253affac4d43bce78c9 (patch)
treec9b957fa8718ad7eef0349f14833343e6d3d5e85
parentCatch write_ref_sha1 failure in receive-pack (diff)
downloadtgif-c816eb1784b324fcf3988253affac4d43bce78c9.tar.xz
glossary: fix overoptimistic automatic linking of defined terms
The script sort_glossary.pl turns each use of "term" into a link to the definition of "term". To avoid mangling links like gitlink:git-term[1] it doesn't replace any occurence of "term" preceded by "link:git-". This fails for gitlink:git-symbolic-ref[1] when substituting for "ref". So instead just refuse to replace anything preceded by a "-". That could result in missing some opportunities, but that's a less annoying error. Actually I find the automatic substitution a little distracting; some day maybe we should just run it once and commit the result, so it can be hand-tuned. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
-rw-r--r--Documentation/sort_glossary.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sort_glossary.pl b/Documentation/sort_glossary.pl
index e0bc552a64..05dc7b2c7b 100644
--- a/Documentation/sort_glossary.pl
+++ b/Documentation/sort_glossary.pl
@@ -48,7 +48,7 @@ This list is sorted alphabetically:
';
@keys=sort {uc($a) cmp uc($b)} keys %terms;
-$pattern='(\b(?<!link:git-)'.join('\b|\b(?<!link:git-)',reverse @keys).'\b)';
+$pattern='(\b(?<!link:git-)'.join('\b|\b(?<!-)',reverse @keys).'\b)';
foreach $key (@keys) {
$terms{$key}=~s/$pattern/sprintf "<<ref_".no_spaces($1).",$1>>";/eg;
print '[[ref_'.no_spaces($key).']]'.$key."::\n"