--- migrate_from_trac.rake.orig2	2008-11-11 15:47:11.000000000 +0000
+++ migrate_from_trac.rake	2008-11-11 15:50:57.000000000 +0000
@@ -232,19 +232,21 @@
         text = text.gsub(/^(\=+)\s(.+)\s(\=+)/) {|s| "\nh#{$1.length}. #{$2}\n"}
         # External Links
         text = text.gsub(/\[(http[^\s]+)\s+([^\]]+)\]/) {|s| "\"#{$2}\":#{$1}"}
+
+        # Special cases like [wiki:"TextXXX"] or [wiki:"This is a page"]
+        text = text.gsub(/\[wiki\:"([^\"]+)\"\]/, '[[\1]]')
         # Internal Links
         text = text.gsub(/\[\[BR\]\]/, "\n") # This has to go before the rules below
         text = text.gsub(/\[\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
-        text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+)\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+)\s(.*)\]/) {|s| "[[#{$1.delete(',./?;|:')}|#{$2.delete(',./?;|:')}]]"}
 
-	# Links to pages UsingJustWikiCaps
-	text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
-	# Normalize things that were supposed to not be links
-	# like !NotALink
-	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')
+        # Links to pages UsingJustWikiCaps
+        text = text.gsub(/([^!]|^)(^| )((\[\[.+\]\]))([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
+        # Normalize things that were supposed to not be links
+        # like !NotALink
+	      text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')
         # Revisions links
         text = text.gsub(/\[(\d+)\]/, 'r\1')
         # Ticket number re-writing