--- /Data/Projects_Arthur/TWiki Subversion/twiki/lib/TWiki.pm   Sat Apr 16 21:08:29 2005
+++ /Users/arthurclemens/Desktop/TWiki.pm       Sat Apr 16 21:07:27 2005
@@ -370,7 +370,11 @@
     $regex{headerPatternNoTOC} = '(\!\!+|%NOTOC%)';
 
     # TWiki concept regexes
-    $regex{wikiWordRegex} = qr/[$regex{upperAlpha}]+[$regex{lowerAlpha}]+[$regex{upperAlpha}]+[$regex{mixedAlphaNum}]*/o;
+    $regex{classicWikiWordPattern} = qr/[$regex{upperAlpha}]+[$regex{lowerAlpha}]+[$regex{upperAlpha}]+[$regex{mixedAlphaNum}]*/o;
+    my $singularUnderscoreWordPattern = qr/\b[$regex{mixedAlphaNum}]+[_]+\b/o;
+    my $multiWordUnderscoreWordPattern = qr/\b[$regex{mixedAlphaNum}]+[_]+[$regex{mixedAlphaNum}_]*[$regex{mixedAlphaNum}]\b/o;
+    $regex{underscoreWikiWordPattern} = $singularUnderscoreWordPattern . '|' . $multiWordUnderscoreWordPattern;
+    $regex{wikiWordRegex} = qr/$regex{classicWikiWordPattern}|$regex{underscoreWikiWordPattern}/o;
     $regex{webNameRegex} = qr/[$regex{upperAlpha}]+[$regex{mixedAlphaNum}]*/o;
     $regex{defaultWebNameRegex} = qr/_[$regex{mixedAlphaNum}_]+/o;
     $regex{anchorRegex} = qr/\#[$regex{mixedAlphaNum}_]+/o;
@@ -712,7 +716,6 @@
 
 sub isValidTopicName {
     my( $name ) = @_;
-
     return isValidWikiWord( @_ ) || isValidAbbrev( @_ );
 }
 
@@ -1672,7 +1675,7 @@
 
 ---++ StaticMethod entityDecode ( $encodedText ) -> $text
 
-Revrses the encoding from =entityEncode=. _Does not_ decode
+Reverses the encoding from =entityEncode=. _Does not_ decode
 named entities such as &
 
 =cut