diff -u -r mxr_test/Local.pm new/Local.pm
--- mxr_test/Local.pm	Sun Nov 26 20:00:10 2006
+++ new/Local.pm	Tue Nov 28 05:08:32 2006
@@ -689,4 +689,3 @@
     return &endskip unless $Path->{'svnrepo'} =~ /stage/;
     return '';
 }
-
diff -u -r mxr_test/index.html new/index.html
--- mxr_test/index.html	Sun Nov 26 04:18:35 2006
+++ new/index.html	Tue Nov 28 05:14:30 2006
@@ -7,6 +7,9 @@
 text-align: right;
 white-space: nowrap; 
 }
+.note {
+font-size: 70%;
+}
 -->
 </style>
 </HEAD>
@@ -32,7 +35,7 @@
 <BR>
          <FONT SIZE="-1">
           Browse from the root
-          of the directory tree.
+          of this directory tree.
          </FONT>
 <P>
 <FORM METHOD=GET ACTION="search">
@@ -65,7 +68,9 @@
 	     Use this field to find a particular function, variable, etc.</FONT>
 </FORM>
 </p>
-     </TD>
+<p>
+<a href="../">Pick another root</a> <span class="note">(you can also
+change roots from within the search tools)</span>
     </TR>
    </TABLE>
 
@@ -73,26 +78,21 @@
   <TD WIDTH=8></TD>
   <TD ALIGN=LEFT VALIGN=TOP>
 
-   <H1>Mozilla Cross-Reference</H1>
 
-<P>This is a cross referenced display of the 
-<A HREF="http://www.mozilla.org/">Mozilla</A> source code.
-The sources displayed are those that are currently checked 
-in to the mainline of the mozilla.org
-<A HREF="http://www.mozilla.org/cvs.html">CVS server</A>;
-these pages are updated many times a day, so they should
-be pretty close to the latest-<WBR>and-<WBR>greatest.
+<H1>Using this Cross Reference</H1>
+<P>This is a cross reference designed to display
+source code.
+Sources may be retrieved via cvs, svn, apt, or through some
+other process.
 
-<P>Well, some of the roots are actually from other cvs repositories,
-If the name of the root doesn't resemble something that sounds like
-a thing from cvs.mozilla.org, then it probably isn't, :). You can
-read <a href="source/CVS/Root">CVS/Root</a> to find out if this
-Root is really from cvs.mozilla.org or something else.
+<P>It's possible to search through the entire source text (but this
+is very slow, it will work, but it is suggested that you at least
+include some simple file restriction by using the <a
+href="search">search</a> page)
+or to <a href="find">find files</a> whose name matches a pattern;
+or to search for the <a href="ident">definitions</a> of particular
+functions, variables, etc.
 
-<P>It's possible to search through the entire Mozilla source text;
-or to search for files whose name matches a pattern; or to search
-for the definitions of particular functions, variables, etc.
-
 <P>The individual files of the source code are formatted on the fly
 and presented with clickable identifiers.  An <I>identifier</I> is a
 macro, typedef, struct, enum, union, function, function prototype or
@@ -99,7 +99,7 @@
 variable.  Clicking on them shows you a summary of how and where they
 are used.
 
-<P>The <A HREF="search">free-text search</A> command is implemented
+<P>The <A HREF="search">free-text search</A> feature is implemented
 using <A HREF="http://glimpse.cs.arizona.edu">Glimpse</A>, so all the
 capabilities of Glimpse are available.  
 <A HREF="search-help.html">Regular expression</A> searches are
@@ -108,18 +108,9 @@
 <P>(Don't use a web-crawler to try and download all of these pages;
 the CGIs will feed you several <I>gigabytes</I> worth of generated HTML!)
 
-<P>The pages here are generated by the 
-<A HREF="http://lxr.linux.no/">LXR</A> tool, which was originally 
-written to display the source code of the Linux kernel (LXR stands
-for ``Linux Cross Reference.'')  Check out the
-<A HREF="http://lxr.linux.no/">main LXR site</a> for more information.
+<P>(That's beyond the nearly <strong>30 gigabytes</strong> worth of
+content that is indexed here.)
 
-<P>Thanks to 
- <A HREF="mailto:lxr@linux.no">Arne Georg Gleditsch</A> and
- <A HREF="mailto:lxr@linux.no">Per Kristian Gjermshus</A>, the
- authors of the LXR tool, for writing it and making it available
- to the world.
-
 <p>
 Complaints about this MXR should be directed elsewhere as none of
 the people listed on this page know or care about this MXR.
diff -u -r mxr_test/template-source-head new/template-source-head
--- mxr_test/template-source-head	Sun Nov 26 19:58:52 2006
+++ new/template-source-head	Tue Nov 28 05:08:32 2006
@@ -32,8 +32,8 @@
 $endbonsai
 <!-- $trachost -->
 $begintrac
-      <A HREF="$trachost/log/$virtfold/$filename">SVN Log</A><BR>
-      <A HREF="$trachost/browser/$virtfold/$filename">SVN View</A><BR>
+      <A HREF="$trachost/$virttree/log/$virtfold/$filename">SVN Log</A><BR>
+      <A HREF="$trachost/$virttree/browser/$virtfold/$filename">SVN View</A><BR>
 $endtrac
       <A HREF="$thisurl?raw=1">Raw file</A><BR>
      </TD>
diff -u -r mxr_test/lib/LXR/Common.pm new/lib/LXR/Common.pm
--- mxr_test/lib/LXR/Common.pm	Sun Nov 26 19:56:35 2006
+++ new/lib/LXR/Common.pm	Tue Nov 28 05:08:37 2006
@@ -76,7 +76,7 @@
   'verb',  '\\b(?:var|function|[gs]et\s|typeof)\\b', '[\s(]',
 );
 
-@pterm = (
+my @pterm = (
   'atom',       '\\\\.',        '',
   'comment',    '#',            '[\r\n]',
   'comment',    '^=(?:begin|pod|head)', '=cut',
@@ -92,23 +92,23 @@
   'verb',       '\\bsub\\b',      '\s',
 #loop control
   'verb',
-'^\s*(?:for|foreach|while|else|elsif|if|unless)\b',
+'^\s*(?:for|foreach|while|else|elsif|if|unless|do|BEGIN|END)\b',
 '[ \(\{]',
 #decl
   'verb',
-'^\s*(?:my|local|shift|defined|undef|eq|ne|close|open|join|split|do)\b',
+'^\s*(?:my|local|our)\b',
 '[ \(\{]',
 #internal type
   'verb',
-'^\s*(?:defined|undef|eq|ne|close|open|join|split|do)\b',
+'^\s*(?:defined|undef)\b',
 '[ \(\{]',
 #comparitors
   'verb',
-'^\s*(?:eq|ne|close|open|join|split|do)\b',
-'[ \(\{]',
+'^\s*(?:eq|ne|ge|le|s|tr|lib)\b',
+'[\s\(\{]',
 #native functions
   'verb',
-'^\s*(?:close|open|join|split|print|die|warn)\b',
+'^\s*(?:close|open|join|split|print|die|warn|push|pop|shift|unshift|delete|keys|tie|untie|length|scalar|ord|uc|lc|sprintf|qq|qw|q)\b',
 '[ \(\{]',
   'verb',
 '^\s*(?:exit|return|break|next|last|package)\\b',
@@ -806,6 +806,7 @@
         close SVN;
       }
     }
+
     my $svnentries = $real . ".svn/entries";
     if (-f $svnentries) {
       if (open (SVN, $svnentries))
diff -u -r mxr_test/lib/LXR/Config.pm new/lib/LXR/Config.pm
--- mxr_test/lib/LXR/Config.pm	Sun Aug 27 18:36:25 2006
+++ new/lib/LXR/Config.pm	Tue Nov 28 05:08:42 2006
@@ -39,6 +39,7 @@
         #there is one or more tree defined. (Using directory names with
         #embedded spaces here would be a bad thing.)
         my %treehash = split(/\s+/, $self->{'sourceroot'});
+        $self->{'treehash'} = %treehash;
 
         #To compute which tree we're looking at, grab the second to last
         #component from the script name which will be of the form: 
@@ -248,6 +249,11 @@
     return($self->varexpand($self->{'sourceroot'}));
 }
 
+sub treehash {
+    my $self = shift;
+    return $self->treehash;
+}
+
 sub prefix {
     my $self = shift;
     my $prefix = $self->{'sourceprefix'};
diff -u -r mxr_test/root/index.html new/root/index.html
--- mxr_test/root/index.html	Sun Nov 26 18:02:08 2006
+++ new/root/index.html	Tue Nov 28 05:12:48 2006
@@ -1,6 +1,13 @@
 <HTML>
 <HEAD>
  <TITLE>Mozilla Cross-Reference</TITLE>
+<style>
+<!--
+.note {
+font-size: 70%;
+}
+-->
+</style>
 </HEAD>
 <BODY   BGCOLOR="#FFFFFF" TEXT="#000000"
 	LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
@@ -528,7 +535,8 @@
 
    <H1>Mozilla Cross-Reference</H1>
 
-<P>This is a cross referenced display of the 
+<H1>About Cross References</H1>
+<P>This is a cross reference designed to display the 
 <A HREF="http://www.mozilla.org/">Mozilla</A> source code.
 The sources displayed are those that are currently checked 
 in to the mainline of the mozilla.org
@@ -536,7 +544,7 @@
 these pages are updated many times a day, so they should
 be pretty close to the latest-<WBR>and-<WBR>greatest.
 
-<P>It's possible to search through the entire Mozilla source text;
+<P>It's possible to search through an entire source text;
 or to search for files whose name matches a pattern; or to search
 for the definitions of particular functions, variables, etc.
 
@@ -560,11 +568,14 @@
 <P>(Don't use a web-crawler to try and download all of these pages;
 the CGIs will feed you several <I>gigabytes</I> worth of generated HTML!)
 
+<P>(That's beyond the nearly <strong>30 gigabytes</strong> worth of content that is indexed here.)
+
+<span class="note">
 <P>The pages here are generated by the 
 <A HREF="http://lxr.mozilla.org/">Mozilla LXR</A> tool, which is a hacked variant
 of the original LXR which was written to display the source code of the Linux kernel (LXR stands
-for ``Linux Cross Reference.'')  Check out the
-<A HREF="http://lxr.linux.no/">main LXR site</a> for more information.
+for ``Linux Cross Reference''). Check out the
+<A HREF="http://lxr.linux.no/">original LXR site</a> for more information. That LXR is now maintained on <a href="http://sourceforge.net/projects/lxr">sourceforge.net</a>.
 
 <P>Thanks to 
  <A HREF="mailto:lxr@linux.no">Arne Georg Gleditsch</A> and
@@ -574,6 +585,7 @@
  <A HREF="http://cannibal.mi.org/~dawn/">Dawn Endico</A> for
  doing almost all of the work to get LXR working with the Mozilla
  sources.
+</span>
 
 <p>
 Complaints about this MXR should be directed elsewhere as none of