Merge branch 'maint'

diff --git a/Documentation/sort_glossary.pl b/Documentation/sort_glossary.pl
index e57dc78e0e9fd54812727f28eda6d534ad55ec51..05dc7b2c7b3653c2b70850e881263e9c5236e153 100644 (file)
--- a/Documentation/sort_glossary.pl
+++ b/Documentation/sort_glossary.pl
@@ -48,7 +48,7 @@ ($)
 ';
 
 @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"