Merge branch 'maint'

diff --git a/Documentation/sort_glossary.pl b/Documentation/sort_glossary.pl
index babbea04158404e0b38d332f4fd47e91482d3c60..05dc7b2c7b3653c2b70850e881263e9c5236e153 100644 (file)
--- a/Documentation/sort_glossary.pl
+++ b/Documentation/sort_glossary.pl
@@ -42,14 +42,13 @@ ($)
 
 print 'GIT Glossary
 ============
-Aug 2005
 
 This list is sorted alphabetically:
 
 ';
 
 @keys=sort {uc($a) cmp uc($b)} keys %terms;
-$pattern='(\b'.join('\b|\b',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"