# HG changeset patch
# User Daniel Brooks <db48x@db48x.net>
# Date 1211156009 18000
# Node ID 6c43adb62fcef29dbc77cd120c8565a8bd913cf3
# Parent  dd1162c4aa3c5bc00411ab5d26c223524342fa33
Backed out changeset dd1162c4aa3c

diff -r dd1162c4aa3c -r 6c43adb62fce lxr.conf
--- a/lxr.conf	Sun May 18 16:05:35 2008 -0700
+++ b/lxr.conf	Sun May 18 19:13:29 2008 -0500
@@ -173,5 +173,3 @@
 sourceprefix: oink-central oink
 sourceroot: webtools-central /var/www/html/mxr/lxr-root/lxr-data/webtools-central/webtools
 sourceprefix: webtools-central webtools
-sourceroot: bugzilla-bzr /var/www/html/mxr/lxr-root/lxr-data/bugzilla-bzr/bugzilla
-sourceprefix: bugzilla-bzr bugzilla
# HG changeset patch
# User Daniel Brooks <db48x@db48x.net>
# Date 1211156040 18000
# Node ID c27ac5144fa19dd57233f34c211c165066d19681
# Parent  81610a76c9ed7d4d3327a07278a763f0ba00df36
# Parent  6c43adb62fcef29dbc77cd120c8565a8bd913cf3
merge

diff -r 81610a76c9ed -r c27ac5144fa1 lxr.conf
--- a/lxr.conf	Sun May 18 17:03:59 2008 -0700
+++ b/lxr.conf	Sun May 18 19:14:00 2008 -0500
@@ -173,5 +173,3 @@
 sourceprefix: oink-central oink
 sourceroot: webtools-central /var/www/html/mxr/lxr-root/lxr-data/webtools-central/webtools
 sourceprefix: webtools-central webtools
-sourceroot: bugzilla-bzr /var/www/html/mxr/lxr-root/lxr-data/bugzilla-bzr/bugzilla
-sourceprefix: bugzilla-bzr bugzilla
# HG changeset patch
# User Daniel Brooks <db48x@db48x.net>
# Date 1211156079 18000
# Node ID 159797a0d5c04594ac2ea638480ee29f3dbd9aff
# Parent  a1ab366be1f4382f355891c4d4f3ab8937fac4ae
Backed out changeset a1ab366be1f4

diff -r a1ab366be1f4 -r 159797a0d5c0 .htaccess
--- a/.htaccess	Sun May 18 15:19:58 2008 -0700
+++ b/.htaccess	Sun May 18 19:14:39 2008 -0500
@@ -27,4 +27,3 @@
 DirectoryIndex index.cgi
 Options +ExecCGI +FollowSymlinks
 RewriteEngine On
-RewriteRule ^seamonkey(.*)$ http://mxr.mozilla.org/seamonkey$1 [R=301,L]
diff -r a1ab366be1f4 -r 159797a0d5c0 index.html
--- a/index.html	Sun May 18 15:19:58 2008 -0700
+++ b/index.html	Sun May 18 19:14:39 2008 -0500
@@ -110,18 +110,6 @@
   ++ / good place
   -->
 
-<p>
-There are two MXRs running on <a
-href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a>:
-<ul>
-<li><a href="http://mxr.landfill.bugzilla.org/$treename/">MXR for $treename</a> - pure <a
-href="../webtools/source/lxr">MXR from cvs</a>
-<li><a href="http://mxr-test.landfill.bugzilla.org/$treename/">MXR-test for $treename</a> - MXR from <a
-href="../webtools/source/lxr">MXR from cvs</a> with <a
-href="http://mxr-test.landfill.bugzilla.org/patches/">patches</a> applied (see <a
-href="http://mxr-test.landfill.bugzilla.org/patches/README">README</a>)
-</ul>
-
   </TD>
  </TR>
 </TABLE>
diff -r a1ab366be1f4 -r 159797a0d5c0 lxr.conf
--- a/lxr.conf	Sun May 18 15:19:58 2008 -0700
+++ b/lxr.conf	Sun May 18 19:14:39 2008 -0500
@@ -9,7 +9,7 @@
 
 # Define the base url for the LXR files. Tree name (if any) is appended
 # to this.
-baseurl: http://mxr-test.landfill.bugzilla.org/
+baseurl: http://mxr.mozilla.org/
 
 # url prefix for bonsai 
 bonsaihome: http://bonsai.mozilla.org
@@ -32,86 +32,81 @@
 
 # If we're indexing more than one tree then include one sourceroot
 # entry per tree where each entry is a tree/directory pair.
-sourceroot: classic /var/www/html/mxr/lxr-root/lxr-data/classic/mozilla
+
+#XXX: PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!!! :XXX#
+sourceroot: addons /data/mxr-data/mozillasvn/svn.mozilla.org/addons
+sourceprefix: addons addons
+sourceroot: aviary101branch /data/mxr-data/aviary101branch/mozilla
+sourceprefix: aviary101branch mozilla
+sourceroot: aviarybranch /data/mxr-data/aviarybranch/mozilla
+sourceprefix: aviarybranch mozilla
+sourceroot: bugzilla /data/mxr-data/bugzilla/bugzilla
+sourceprefix: bugzilla mozilla/webtools/bugzilla
+sourceroot: bugzilla-org /data/mxr-data/mozilla-org/bugzilla-org
+sourceprefix: bugzilla-org bugzilla-org
+sourceroot: bugzilla2.18 /data/mxr-data/bugzilla2.18/bugzilla
+sourceprefix: bugzilla2.18 mozilla/webtools/bugzilla
+sourceroot: bugzilla2.20 /data/mxr-data/bugzilla2.20/bugzilla
+sourceprefix: bugzilla2.20 mozilla/webtools/bugzilla
+sourceroot: bugzilla2.22 /data/mxr-data/bugzilla2.22/bugzilla
+sourceprefix: bugzilla2.22 mozilla/webtools/bugzilla
+sourceroot: bugzilla3.0 /data/mxr-data/bugzilla3.0/bugzilla
+sourceprefix: bugzilla3.0 mozilla/webtools/bugzilla
+sourceroot: classic /data/mxr-data/classic/mozilla
 sourceprefix: classic mozilla
-sourceroot: ef /var/www/html/mxr/lxr-root/lxr-data/ef/mozilla
-sourceprefix: ef mozilla
-sourceroot: mozilla /var/www/html/mxr/lxr-root/lxr-data/mozilla/mozilla
+sourceroot: firefox /data/mxr-data/firefox/mozilla
+sourceprefix: firefox mozilla
+sourceroot: firefox2 /data/mxr-data/firefox2/mozilla
+sourceprefix: firefox2 mozilla
+sourceroot: fuel /data/mxr-data/fuel/fuel
+sourceprefix: fuel mozilla/browser/fuel
+sourceroot: js /data/mxr-data/js/mozilla
+sourceprefix: js mozilla
+sourceroot: l10n /data/mxr-data/l10n/mozilla
+sourceprefix: l10n l10n
+sourceroot: l10n-aviarybranch /data/mxr-data/l10n-aviarybranch/mozilla
+sourceprefix: l10n-aviarybranch l10n
+sourceroot: l10n-mozilla1.8 /data/mxr-data/l10n-mozilla1.8/mozilla
+sourceprefix: l10n-mozilla1.8 l10n
+sourceroot: l10n-mozilla1.8.0 /data/mxr-data/l10n-mozilla1.8.0/mozilla
+sourceprefix: l10n-mozilla1.8.0 l10n
+sourceroot: mailnews /data/mxr-data/mailnews/mozilla
+sourceprefix: mailnews mozilla
+sourceroot: mozilla /data/mxr-data/mozilla/mozilla
 sourceprefix: mozilla mozilla
-sourceroot: mozilla1.0 /var/www/html/mxr/lxr-root/lxr-data/mozilla1.0/mozilla
-sourceprefix: mozilla1.0 mozilla
-sourceroot: mozilla1.0.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.0.x/mozilla
-sourceprefix: mozilla1.0.x mozilla
-sourceroot: mozilla1.4.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.4.x/mozilla
-sourceprefix: mozilla1.4.x mozilla
-sourceroot: mozilla1.7.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.7.x/mozilla
-sourceprefix: mozilla1.7.x mozilla
-sourceroot: mozilla1.8.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.8.x/mozilla
-sourceprefix: mozilla1.8.x mozilla
-sourceroot: mozilla1.8.0.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.8.0.x/mozilla
-sourceprefix: mozilla1.8.0.x mozilla
-sourceroot: aviarybranch /var/www/html/mxr/lxr-root/lxr-data/aviarybranch/mozilla
-sourceprefix: aviarybranch mozilla
-sourceroot: nspr /var/www/html/mxr/lxr-root/lxr-data/nspr/mozilla/nsprpub
+sourceroot: mozilla-central /data/mxr-data/mozilla-central/mozilla-central
+sourceprefix: mozilla-central mozilla
+sourceroot: mozilla-com /data/mxr-data/mozillasvn/svn.mozilla.org/projects/www.mozilla.com
+sourceprefix: mozilla-com mozilla-com
+sourceroot: mozilla-org /data/mxr-data/mozilla-org/mozilla-org
+sourceprefix: mozilla-org mozilla-org
+sourceroot: mozilla1.7 /data/mxr-data/mozilla1.7/mozilla
+sourceprefix: mozilla1.7 mozilla
+sourceroot: mozilla1.8 /data/mxr-data/mozilla1.8/mozilla
+sourceprefix: mozilla1.8 mozilla
+sourceroot: mozilla1.8.0 /data/mxr-data/mozilla1.8.0/mozilla
+sourceprefix: mozilla1.8.0 mozilla
+sourceroot: mozillalabs-central /data/mxr-data/mozillalabs-central/labs
+sourceprefix: mozillalabs-central mozillalabs
+sourceroot: mozillasvn /data/mxr-data/mozillasvn/svn.mozilla.org
+sourceprefix: mozillasvn svn.mozilla.org
+sourceroot: mozillasvn-all /data/mxr-data/mozillasvn-all/svn.mozilla.org
+sourceprefix: mozillasvn-all svn.mozilla.org
+sourceroot: mozillausers-central /data/mxr-data/mozillausers-central/users
+sourceprefix: mozillausers-central mozillausers
+sourceroot: nspr /data/mxr-data/nspr/mozilla
 sourceprefix: nspr mozilla/nsprpub
-sourceroot: seamonkey /var/www/html/mxr/lxr-root/lxr-data/seamonkey/mozilla
+sourceroot: seamonkey /data/mxr-data/seamonkey/mozilla
 sourceprefix: seamonkey mozilla
-sourceroot: security /var/www/html/mxr/lxr-root/lxr-data/security/mozilla
+sourceroot: security /data/mxr-data/security/mozilla
 sourceprefix: security mozilla
-sourceroot: m10 /var/www/html/mxr/lxr-root/lxr-data/m10/mozilla
-sourceprefix: m10 mozilla
-sourceroot: l10n /var/www/html/mxr/lxr-root/lxr-data/l10n/l10n
-sourceprefix: l10n l10n
-sourceroot: l10n-mozilla1.8.x /var/www/html/mxr/lxr-root/lxr-data/l10n-mozilla1.8.x/l10n
-sourceprefix: l10n-mozilla1.8.x l10n
-sourceroot: l10n-mozilla1.8.0.x /var/www/html/mxr/lxr-root/lxr-data/l10n-mozilla1.8.0.x/l10n
-sourceprefix: l10n-mozilla1.8.0.x l10n
-sourceroot: l10n-aviarybranch /var/www/html/mxr/lxr-root/lxr-data/l10n-aviarybranch/l10n
-sourceprefix: l10n-aviarybranch l10n
-sourceroot: grendel /var/www/html/mxr/lxr-root/lxr-data/grendel/mozilla
-sourceprefix: grendel mozilla
-sourceroot: kazehakase /var/www/html/mxr/lxr-root/lxr-data/kazehakase/kazehakase
-sourceprefix: kazehakase sourceforge
-sourceroot: samba /var/www/html/mxr/lxr-root/lxr-data/samba/samba
-sourceprefix: samba samba
-sourceroot: samba-all /var/www/html/mxr/lxr-root/lxr-data/samba-all/samba
-sourceprefix: samba-all samba
-sourceroot: js /var/www/html/mxr/lxr-root/lxr-data/js/mozilla
-sourceprefix: js mozilla
-sourceroot: webtools /var/www/html/mxr/lxr-root/lxr-data/webtools/mozilla/webtools
+sourceroot: spreadfirefox /data/mxr-data/mozillasvn/svn.mozilla.org/projects/spreadfirefox.com
+sourceprefix: spreadfirefox spreadfirefox
+sourceroot: tamarin-central /data/mxr-data/tamarin-central/tamarin-central
+sourceprefix: tamarin-central tamarin
+sourceroot: webtools /data/mxr-data/webtools/webtools
 sourceprefix: webtools mozilla/webtools
-sourceroot: mxr-test /var/www/html/mxr-test
-sourceprefix: mxr-test mozilla/webtools/mxr-test
-sourceroot: mxr /var/www/html/mxr
-sourceprefix: mxr mozilla/webtools/mxr
-sourceroot: bugzilla /var/www/html/mxr/lxr-root/lxr-data/bugzilla/mozilla/webtools/bugzilla
-sourceprefix: bugzilla mozilla/webtools/bugzilla
-sourceroot: bugzilla3.0.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla3.0.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla3.0.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.22.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.22.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.22.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.20.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.20.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.20.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.18.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.18.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.18.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.16.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.16.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.16.x mozilla/webtools/bugzilla
-sourceroot: update1.0 /var/www/html/mxr/lxr-root/lxr-data/update1.0/mozilla/webtools/update
-sourceprefix: update1.0 mozilla/webtools/update
-sourceroot: mozilla-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozilla-org
-sourceprefix: mozilla-org mozilla-org
-sourceroot: mozilla-com /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozilla-com
-sourceprefix: mozilla-com mozilla-com
-sourceroot: mozillafoundation-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozillafoundation-org
-sourceprefix: mozillafoundation-org mozillafoundation-org
-sourceroot: devmo /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/devmo
-sourceprefix: devmo devmo
-sourceroot: devmowiki /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/devmowiki
-sourceprefix: devmowiki devmowiki
-sourceroot: spreadfirefox /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/spreadfirefox
-sourceprefix: spreadfirefox spreadfirefox
-sourceroot: bugzilla-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/bugzilla-org
-sourceprefix: bugzilla-org bugzilla-org
+#XXX: PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!!! :XXX#
 
 # name of the source.
 srcrootname: mozilla
@@ -127,49 +122,17 @@
 #dbdir: /opt/lxr-data/db
 
 # If using multiple trees, give the parent directory containing
-# dirs for each tree. For mozilla, /var/www/html/mxr/lxr-root/lxr-data contains
+# dirs for each tree. For mozilla, /data/mxr-data contains
 # a directory for each tree. Each of these directories contains
 # the tree's databases, and a mozilla directory containing the
 # source.
-dbdir: /var/www/html/mxr/lxr-root/lxr-data
+dbdir: /data/mxr-data
 
 # Glimpse can be found here.
-glimpsebin: /usr/local/glimpse-4.18.1p/bin/glimpse
+glimpsebin: /usr/bin/glimpse
 
 # The power of regexps.  This is pretty Linux-specific, but quite
 # useful.  Tinker with it and see what it does.  (How's that for
 # documentation?)
 #map: /include/asm[^\/]*/ /include/asm-$a/
 #map: /arch/[^\/]+/ /arch/$a/
-sourceroot: bonsai-svn /var/www/html/mxr/lxr-root/lxr-data/bonsai-svn
-sourceprefix: bonsai-svn webtools
-sourceroot: bonsai-svn-all /var/www/html/mxr/lxr-root/lxr-data/bonsai-svn-all
-sourceprefix: bonsai-svn-all webtools
-sourceroot: tamarin-central /var/www/html/mxr/lxr-root/lxr-data/tamarin-central/tamarin-central
-sourceprefix: tamarin-central tamarin
-sourceroot: mozilla-central /var/www/html/mxr/lxr-root/lxr-data/mozilla-central/mozilla-central
-sourceprefix: mozilla-central mozilla
-sourceroot: mozillalabs-central /var/www/html/mxr/lxr-root/lxr-data/mozillalabs-central/labs
-sourceprefix: mozillalabs-central mozillalabs
-sourceroot: mozillausers-central /var/www/html/mxr/lxr-root/lxr-data/mozillausers-central/users
-sourceprefix: mozillausers-central mozillausers
-sourceroot: vlc /var/www/html/mxr/lxr-root/lxr-data/vlc/vlc
-sourceprefix: vlc vlc
-sourceroot: mozillasvn-all /var/www/html/mxr/lxr-root/lxr-data/mozillasvn-all/svn.mozilla.org
-sourceprefix: mozillasvn-all svn.mozilla.org
-sourceroot: mozillasvn /var/www/html/mxr/lxr-root/lxr-data/mozillasvn/svn.mozilla.org
-sourceprefix: mozillasvn svn.mozilla.org
-sourceroot: sqlite /var/www/html/mxr/lxr-root/lxr-data/sqlite/sqlite
-sourceprefix: sqlite sqlite
-sourceroot: mozilla0.9.4 /var/www/html/mxr/lxr-root/lxr-data/mozilla0.9.4/mozilla
-sourceprefix: mozilla0.9.4 mozilla
-sourceroot: mozilla0.6 /var/www/html/mxr/lxr-root/lxr-data/mozilla0.6/mozilla
-sourceprefix: mozilla0.6 mozilla
-sourceroot: m18 /var/www/html/mxr/lxr-root/lxr-data/m18/mozilla
-sourceprefix: m18 mozilla
-sourceroot: mobile-browser-central /var/www/html/mxr/lxr-root/lxr-data/mobile-browser-central/mobile-browser
-sourceprefix: mobile-browser-central browser
-sourceroot: oink-central /var/www/html/mxr/lxr-root/lxr-data/oink-central/oink
-sourceprefix: oink-central oink
-sourceroot: webtools-central /var/www/html/mxr/lxr-root/lxr-data/webtools-central/webtools
-sourceprefix: webtools-central webtools
diff -r a1ab366be1f4 -r 159797a0d5c0 root/index.html
--- a/root/index.html	Sun May 18 15:19:58 2008 -0700
+++ b/root/index.html	Sun May 18 19:14:39 2008 -0500
@@ -71,17 +71,55 @@
       <dl class="rootlist">
 
       <dt>
-         <a href="mozilla/">Mozilla</a>
+         <a href="mozilla-central/">Mozilla Central</a>
       </dt>
       <dd>
-          This contains the entire current CVS repository.
+          This contains the main mercurial (hg) repository for Gecko, XULRunner, and Firefox, the main line of development for releases after Gecko 1.9.0 / Firefox 3.0.
+      </dd>
+
+      <dt>
+         <a href="mozilla/">Mozilla CVS</a>
+      </dt>
+      <dd>
+          This contains the entire current CVS repository.  For Gecko, XULRunner, and Firefox, CVS trunk is no longer the trunk, and is instead used for Gecko 1.9 / Firefox 3 and the 1.9.0.* / 3.0.* security releases.
       </dd>
 
       <dt>
          <a href="seamonkey/">SeaMonkey</a> / <a href="l10n/">l10n</a>
       </dt>
       <dd>
-          This module is SeaMonkeyAll, the Mozilla browser project.
+          This the code in CVS for Gecko, XULRunner, Firefox, Thunderbird, Calendar, Camino, and SeaMonkey.  For Gecko, XULRunner, and Firefox, CVS trunk is only used for Gecko 1.9 / Firefox 3 and the 1.9.0.* / 3.0.* security releases.
+      </dd>
+
+      <dt>
+         <a href="firefox/">Firefox 3</a>
+      </dt>
+      <dd class="note">
+          The source specific to the Firefox 3 web browser.  Also available is the
+          <a href="firefox2/">Firefox 2.0 Branch</a>.
+      </dd>
+
+      <dt>
+         <a href="mailnews/">Mail/News</a>
+      </dt>
+      <dd class="note">
+          This contains the mail and news code on the trunk, including that
+          shared by both Seamonkey and Thunderbird (mozilla/mailnews/) as well
+          as that which is Thunderbird-specific (mozilla/mail/).
+      </dd>
+
+      <dt>
+         <a href="mozilla1.8/">Mozilla 1.8</a> / <a href="l10n-mozilla1.8/">l10n</a>
+      </dt>
+      <dd class="note">
+          This is the Mozilla 1.8 branch.  This module also hosts Aviary's 1.5 Branch (e.g. Firefox 2.0), for Mozilla toolkit derived projects.
+      </dd>
+
+      <dt>
+         <a href="mozilla1.8.0/">Mozilla 1.8.0</a> / <a href="l10n-mozilla1.8.0/">l10n</a>
+      </dt>
+      <dd class="note">
+          This is the Mozilla 1.8.0 branch.  This is for security releases products released from Mozilla 1.8 Release (e.g. Firefox 1.5).
       </dd>
 
       <dt>
@@ -91,133 +129,38 @@
           This module is Aviary's 1.0.1 Branch, Mozilla toolkit derived projects.
       </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.0/"><B>Mozilla 1.0</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.0 release.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.0.x/"><B>Mozilla 1.0.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.0 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.4.x/"><B>Mozilla 1.4.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.4 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.7.x/"><B>Mozilla 1.7.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.7 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.8.x/"><B>Mozilla 1.8.x</B></A> / <A HREF="l10n-mozilla1.8.x/"><B>l10n</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.8 branch.  This module also hosts Aviary's 1.5 Branch (e.g. Firefox 2.0), for Mozilla toolkit derived projects.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.8.0.x/"><B>Mozilla 1.8.0.x</B></A> / <A HREF="l10n-mozilla1.8.0.x/"><B>l10n</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.8.0 branch.  This is for security releases products released from Mozilla 1.8 Release (e.g. Firefox 1.5).
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="m10/"><B>M10</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the source of the M10 release and is provided here for use
-          by the
-          <A HREF="http://www.mozillazine.org/talkback.html?article=858">
-          design patterns</A> contest.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="classic/"><B>Classic</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="classic/">Classic</a>
+      </dt>
+      <dd class="note">
           This is Mozilla Classic. It's a snapshot of the MozillaSource
           module from Oct 26, 1998 just before the change was made to xpfe.
           This is here for reference. No work is done on this branch.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="nspr/"><B>NSPR</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="nspr/">NSPR</a>
+      </dt>
+      <dd class="note">
           This module is 
-          <A HREF="http://www.mozilla.org/projects/nspr/reference/html/index.html">NSPR</A>, 
+          <a href="http://www.mozilla.org/projects/nspr/reference/html/index.html">NSPR</a>, 
           a cross platform library for operating system facilities 
           including threads, I/O, timing and memory management.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="security/"><B>Security</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="security/">Security</a>
+      </dt>
+      <dd class="note">
          This module contains code related to 
          <a href="http://www.mozilla.org/projects/security/">Open Source PKI</a>
          including NSS.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="grendel/"><B>Grendel</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This module is Grendel, a mail reader written in java.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="ef/"><B>Electrical Fire</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is /mozilla/ef, a multi-platform Just&#8209;In&#8209;Time
-          Java compiler.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="songbird/"><B>Songbird</B></A></FONT>
-      </DT>
-      <DD>
-         <FONT SIZE="-1">
-          This contains the head for <a href="http://www.songbirdnest.com/">Songbird</a>.
-          (This includes integration with trac.)
-         </FONT>
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="songbird-all/"><B>Songbird (all)</B></A></FONT>
-      </DT>
-      <DD>
-         <FONT SIZE="-1">
-          This contains the entire source for <a href="http://www.songbirdnest.com/">Songbird</a>.
-          (This includes integration with trac.)
-         </FONT>
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="gcc-4.0.2/"><B>GCC 4.0.2</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This contains the entire <a href="http://gcc.gnu.org/">gcc</a>
-          source for 4.0.2. In particular, it has G++.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="js/"><B>JavaScript</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="js/">JavaScript</a>
+      </dt>
+      <dd class="note">
           This is Mozilla JavaScript. It includes
           <a href="js/source/js/src">SpiderMonkey</a>,
           <a href="js/source/js/rhino">Rhino</a>,
@@ -225,118 +168,74 @@
           as well as
           <a href="js/source/js/jsd">debuggers</a> and
           <a href="js/source/js/tests">test suites</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="webtools/"><B>Webtools</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="webtools/">Webtools</a>
+      </dt>
+      <dd class="note">
           These are the Mozilla Webtools. They include
           <a href="webtools/source/bugzilla">Bugzilla</a>,
           <a href="webtools/source/bonsai">Bonsai</a>,
           <a href="webtools/source/tinderbox">Tinderbox</a>
           (<a href="webtools/source/tinderbox2">2</a> and
           <a href="webtools/source/tinderbox3">3</a>),
-          <a href="webtools/source/lxr">MXR</a>,
+          <a href="webtools/source/lxr">LXR</a>,
           <a href="webtools/source/mozbot">Mozbot</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla/"><B>Bugzilla</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</A>
+      <dt>
+         <a href="bugzilla/">Bugzilla</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
           <a href="http://www.bugzilla.org/docs/tip/html/">tip</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla3.0.x/"><B>Bugzilla3.0.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/3.0/html/">3.0.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla3.0/">Bugzilla3.0</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/3.0/html/">3.0</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.22.x/"><B>Bugzilla2.22.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.22/html/">2.22.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla2.22/">Bugzilla2.22</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/2.22/html/">2.22</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.20.x/"><B>Bugzilla2.20.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.20/html/">2.20.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla2.20/">Bugzilla2.20</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/2.20/html/">2.20</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.18.x/"><B>Bugzilla2.18.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.18/html/">2.18.x</a>.
-      </DD>
+      <dt>
+         <a href="addons/">addons</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="https://addons.mozilla.org/">addons.mozilla.org</a> website.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.16.x/"><B>Bugzilla2.16.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.16/html/">2.16.x</a>.
-      </DD>
+      <dt>
+         <a href="mozilla-org/">mozilla-org</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="http://www.mozilla.org/">www.mozilla.org</a> website.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="update1.0/"><B>Update1.0</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the MOZILLA_UPDATE_1_0_BRANCH of the <a href="http://update.mozilla.org">Update webtool</a>.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla-org/"><B>mozilla-org</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozilla.org">mozilla.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozillafoundation-org/"><B>mozillafoundation-org</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozillafoundation.org">mozillafoundation.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla-com/"><B>mozilla-com</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozilla.com">mozilla.com</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="spreadfirefox/"><B>spreadfirefox</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://spreadfirefox.com">spreadfirefox.com</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="devmo/"><B>devmo</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://developer.mozilla.org">developer.mozilla.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="devmowiki/"><B>devmowiki</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://developer.mozilla.org/wiki">developer.mozilla.org/wiki</a> website.
-      </DD>
+      <dt>
+         <a href="spreadfirefox/">spreadfirefox</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="http://www.spreadfirefox.com">www.spreadfirefox.com</a> website.
+      </dd>
 
       </dl>
 
diff -r a1ab366be1f4 -r 159797a0d5c0 update-src.pl
--- a/update-src.pl	Sun May 18 15:19:58 2008 -0700
+++ b/update-src.pl	Sun May 18 19:14:39 2008 -0500
@@ -91,10 +91,6 @@
         print LOG `$TIME $CVSCOMMAND $CVSCO -P -rMozillaSourceClassic_19981026_BRANCH MozillaSource $STDERRTOSTDOUT`;
         last; 
     };
-    /^ef$/ && do { 
-        print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/ef mozilla/nsprpub $STDERRTOSTDOUT`;
-        last;
-    };
     /^js$/ && do {
         print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/js mozilla/js2 mozilla/nsprpub $STDERRTOSTDOUT`;
         last;
@@ -113,12 +109,8 @@
         print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/webtools/bugzilla $STDERRTOSTDOUT`;
         last;
     };
-    /^update1.0$/ && do {
-        print LOG `$TIME $CVSCOMMAND $CVSCO -P -r MOZILLA_UPDATE_1_0_BRANCH mozilla/webtools/update $STDERRTOSTDOUT`;
-        last;
-    };
-    /^grendel$/ && do {
-        print LOG `cd mozilla; $TIME $CVSCOMMAND $CVSUP-d grendel $STDERRTOSTDOUT`;
+    /^(l10n|l10n-(?:mozilla1\.8|aviarybranch|mozilla1\.8\.0))$/ && do {
+        print LOG `$TIME $CVS $CVSQUIETFLAGS -d ':pserver:anonymous\@cvs-mirror.mozilla.org:/l10n' $CVSUP -dP $STDERRTOSTDOUT`;
         last;
     };
     /^mailnews$/ && do {
@@ -144,25 +136,26 @@
         }
         last;
     };
-    /^mozillalabs-central$/ && do {
-        my @dirs = <$src_dir/*>;
-        foreach my $dir (@dirs) {
-            print LOG `cd $dir; $TIME $HGCOMMAND $HGUPDATE $STDERRTOSTDOUT`;
-        }
-        last;
-    };
     /^nspr$/ && do {
         print LOG `$TIME $CVSCOMMAND $CVSCO -P NSPR $STDERRTOSTDOUT`;
         last;
     };
-    /^(?:seamonkey|(?:aviary|reflow)branch|mozilla1.*)$/ && do {
+    /^(?:seamonkey|(?:aviary(?:101)?|reflow)branch|mozilla1.*)$/ && do {
         print LOG `$TIME make -C mozilla -f client.mk pull_all MOZ_CO_PROJECT=all $STDERRTOSTDOUT`;
         print LOG `cat cvsco.log $STDERRTOSTDOUT`;
         print LOG `cd mozilla; $TIME $CVSCOMMAND $CVSUP-d tools` if /^seamonkey$/;
         last;
     };
-    /^(?:netbeans|openoffice|gnome|eclipse|(?:bug|mo)zilla.*-.*|devmo.*|)$/ && do {
+    /^firefox.*$/ && do {
+        print LOG `$TIME make -C mozilla -f client.mk pull_all MOZ_CO_PROJECT=browser $STDERRTOSTDOUT`;
+        last;
+    };
+    /^(?:(?:bug|mo)zilla.*-.*)$/ && do {
         print LOG `cd $src_dir; $TIME $CVSCOMMAND $CVSUP-d * $STDERRTOSTDOUT`;
+        last;
+    };
+    /^fuel$/ && do {
+        print LOG `$TIME $CVSCOMMAND $CVSCO -P -d fuel -rFUEL_DEVEL_BRANCH mozilla/browser/fuel $STDERRTOSTDOUT`;
         last;
     };
     /^(?:.*)-central$/ && do {
# HG changeset patch
# User Daniel Brooks <db48x@db48x.net>
# Date 1211156089 18000
# Node ID 86db575181926cbca24951c56638f1729ba52206
# Parent  c27ac5144fa19dd57233f34c211c165066d19681
# Parent  159797a0d5c04594ac2ea638480ee29f3dbd9aff
merge

diff -r c27ac5144fa1 -r 86db57518192 .htaccess
--- a/.htaccess	Sun May 18 19:14:00 2008 -0500
+++ b/.htaccess	Sun May 18 19:14:49 2008 -0500
@@ -27,4 +27,3 @@
 DirectoryIndex index.cgi
 Options +ExecCGI +FollowSymlinks
 RewriteEngine On
-RewriteRule ^seamonkey(.*)$ http://mxr.mozilla.org/seamonkey$1 [R=301,L]
diff -r c27ac5144fa1 -r 86db57518192 index.html
--- a/index.html	Sun May 18 19:14:00 2008 -0500
+++ b/index.html	Sun May 18 19:14:49 2008 -0500
@@ -110,18 +110,6 @@
   ++ / good place
   -->
 
-<p>
-There are two MXRs running on <a
-href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a>:
-<ul>
-<li><a href="http://mxr.landfill.bugzilla.org/$treename/">MXR for $treename</a> - pure <a
-href="../webtools/source/lxr">MXR from cvs</a>
-<li><a href="http://mxr-test.landfill.bugzilla.org/$treename/">MXR-test for $treename</a> - MXR from <a
-href="../webtools/source/lxr">MXR from cvs</a> with <a
-href="http://mxr-test.landfill.bugzilla.org/patches/">patches</a> applied (see <a
-href="http://mxr-test.landfill.bugzilla.org/patches/README">README</a>)
-</ul>
-
   </TD>
  </TR>
 </TABLE>
diff -r c27ac5144fa1 -r 86db57518192 lxr.conf
--- a/lxr.conf	Sun May 18 19:14:00 2008 -0500
+++ b/lxr.conf	Sun May 18 19:14:49 2008 -0500
@@ -9,7 +9,7 @@
 
 # Define the base url for the LXR files. Tree name (if any) is appended
 # to this.
-baseurl: http://mxr-test.landfill.bugzilla.org/
+baseurl: http://mxr.mozilla.org/
 
 # url prefix for bonsai 
 bonsaihome: http://bonsai.mozilla.org
@@ -32,86 +32,81 @@
 
 # If we're indexing more than one tree then include one sourceroot
 # entry per tree where each entry is a tree/directory pair.
-sourceroot: classic /var/www/html/mxr/lxr-root/lxr-data/classic/mozilla
+
+#XXX: PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!!! :XXX#
+sourceroot: addons /data/mxr-data/mozillasvn/svn.mozilla.org/addons
+sourceprefix: addons addons
+sourceroot: aviary101branch /data/mxr-data/aviary101branch/mozilla
+sourceprefix: aviary101branch mozilla
+sourceroot: aviarybranch /data/mxr-data/aviarybranch/mozilla
+sourceprefix: aviarybranch mozilla
+sourceroot: bugzilla /data/mxr-data/bugzilla/bugzilla
+sourceprefix: bugzilla mozilla/webtools/bugzilla
+sourceroot: bugzilla-org /data/mxr-data/mozilla-org/bugzilla-org
+sourceprefix: bugzilla-org bugzilla-org
+sourceroot: bugzilla2.18 /data/mxr-data/bugzilla2.18/bugzilla
+sourceprefix: bugzilla2.18 mozilla/webtools/bugzilla
+sourceroot: bugzilla2.20 /data/mxr-data/bugzilla2.20/bugzilla
+sourceprefix: bugzilla2.20 mozilla/webtools/bugzilla
+sourceroot: bugzilla2.22 /data/mxr-data/bugzilla2.22/bugzilla
+sourceprefix: bugzilla2.22 mozilla/webtools/bugzilla
+sourceroot: bugzilla3.0 /data/mxr-data/bugzilla3.0/bugzilla
+sourceprefix: bugzilla3.0 mozilla/webtools/bugzilla
+sourceroot: classic /data/mxr-data/classic/mozilla
 sourceprefix: classic mozilla
-sourceroot: ef /var/www/html/mxr/lxr-root/lxr-data/ef/mozilla
-sourceprefix: ef mozilla
-sourceroot: mozilla /var/www/html/mxr/lxr-root/lxr-data/mozilla/mozilla
+sourceroot: firefox /data/mxr-data/firefox/mozilla
+sourceprefix: firefox mozilla
+sourceroot: firefox2 /data/mxr-data/firefox2/mozilla
+sourceprefix: firefox2 mozilla
+sourceroot: fuel /data/mxr-data/fuel/fuel
+sourceprefix: fuel mozilla/browser/fuel
+sourceroot: js /data/mxr-data/js/mozilla
+sourceprefix: js mozilla
+sourceroot: l10n /data/mxr-data/l10n/mozilla
+sourceprefix: l10n l10n
+sourceroot: l10n-aviarybranch /data/mxr-data/l10n-aviarybranch/mozilla
+sourceprefix: l10n-aviarybranch l10n
+sourceroot: l10n-mozilla1.8 /data/mxr-data/l10n-mozilla1.8/mozilla
+sourceprefix: l10n-mozilla1.8 l10n
+sourceroot: l10n-mozilla1.8.0 /data/mxr-data/l10n-mozilla1.8.0/mozilla
+sourceprefix: l10n-mozilla1.8.0 l10n
+sourceroot: mailnews /data/mxr-data/mailnews/mozilla
+sourceprefix: mailnews mozilla
+sourceroot: mozilla /data/mxr-data/mozilla/mozilla
 sourceprefix: mozilla mozilla
-sourceroot: mozilla1.0 /var/www/html/mxr/lxr-root/lxr-data/mozilla1.0/mozilla
-sourceprefix: mozilla1.0 mozilla
-sourceroot: mozilla1.0.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.0.x/mozilla
-sourceprefix: mozilla1.0.x mozilla
-sourceroot: mozilla1.4.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.4.x/mozilla
-sourceprefix: mozilla1.4.x mozilla
-sourceroot: mozilla1.7.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.7.x/mozilla
-sourceprefix: mozilla1.7.x mozilla
-sourceroot: mozilla1.8.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.8.x/mozilla
-sourceprefix: mozilla1.8.x mozilla
-sourceroot: mozilla1.8.0.x /var/www/html/mxr/lxr-root/lxr-data/mozilla1.8.0.x/mozilla
-sourceprefix: mozilla1.8.0.x mozilla
-sourceroot: aviarybranch /var/www/html/mxr/lxr-root/lxr-data/aviarybranch/mozilla
-sourceprefix: aviarybranch mozilla
-sourceroot: nspr /var/www/html/mxr/lxr-root/lxr-data/nspr/mozilla/nsprpub
+sourceroot: mozilla-central /data/mxr-data/mozilla-central/mozilla-central
+sourceprefix: mozilla-central mozilla
+sourceroot: mozilla-com /data/mxr-data/mozillasvn/svn.mozilla.org/projects/www.mozilla.com
+sourceprefix: mozilla-com mozilla-com
+sourceroot: mozilla-org /data/mxr-data/mozilla-org/mozilla-org
+sourceprefix: mozilla-org mozilla-org
+sourceroot: mozilla1.7 /data/mxr-data/mozilla1.7/mozilla
+sourceprefix: mozilla1.7 mozilla
+sourceroot: mozilla1.8 /data/mxr-data/mozilla1.8/mozilla
+sourceprefix: mozilla1.8 mozilla
+sourceroot: mozilla1.8.0 /data/mxr-data/mozilla1.8.0/mozilla
+sourceprefix: mozilla1.8.0 mozilla
+sourceroot: mozillalabs-central /data/mxr-data/mozillalabs-central/labs
+sourceprefix: mozillalabs-central mozillalabs
+sourceroot: mozillasvn /data/mxr-data/mozillasvn/svn.mozilla.org
+sourceprefix: mozillasvn svn.mozilla.org
+sourceroot: mozillasvn-all /data/mxr-data/mozillasvn-all/svn.mozilla.org
+sourceprefix: mozillasvn-all svn.mozilla.org
+sourceroot: mozillausers-central /data/mxr-data/mozillausers-central/users
+sourceprefix: mozillausers-central mozillausers
+sourceroot: nspr /data/mxr-data/nspr/mozilla
 sourceprefix: nspr mozilla/nsprpub
-sourceroot: seamonkey /var/www/html/mxr/lxr-root/lxr-data/seamonkey/mozilla
+sourceroot: seamonkey /data/mxr-data/seamonkey/mozilla
 sourceprefix: seamonkey mozilla
-sourceroot: security /var/www/html/mxr/lxr-root/lxr-data/security/mozilla
+sourceroot: security /data/mxr-data/security/mozilla
 sourceprefix: security mozilla
-sourceroot: m10 /var/www/html/mxr/lxr-root/lxr-data/m10/mozilla
-sourceprefix: m10 mozilla
-sourceroot: l10n /var/www/html/mxr/lxr-root/lxr-data/l10n/l10n
-sourceprefix: l10n l10n
-sourceroot: l10n-mozilla1.8.x /var/www/html/mxr/lxr-root/lxr-data/l10n-mozilla1.8.x/l10n
-sourceprefix: l10n-mozilla1.8.x l10n
-sourceroot: l10n-mozilla1.8.0.x /var/www/html/mxr/lxr-root/lxr-data/l10n-mozilla1.8.0.x/l10n
-sourceprefix: l10n-mozilla1.8.0.x l10n
-sourceroot: l10n-aviarybranch /var/www/html/mxr/lxr-root/lxr-data/l10n-aviarybranch/l10n
-sourceprefix: l10n-aviarybranch l10n
-sourceroot: grendel /var/www/html/mxr/lxr-root/lxr-data/grendel/mozilla
-sourceprefix: grendel mozilla
-sourceroot: kazehakase /var/www/html/mxr/lxr-root/lxr-data/kazehakase/kazehakase
-sourceprefix: kazehakase sourceforge
-sourceroot: samba /var/www/html/mxr/lxr-root/lxr-data/samba/samba
-sourceprefix: samba samba
-sourceroot: samba-all /var/www/html/mxr/lxr-root/lxr-data/samba-all/samba
-sourceprefix: samba-all samba
-sourceroot: js /var/www/html/mxr/lxr-root/lxr-data/js/mozilla
-sourceprefix: js mozilla
-sourceroot: webtools /var/www/html/mxr/lxr-root/lxr-data/webtools/mozilla/webtools
+sourceroot: spreadfirefox /data/mxr-data/mozillasvn/svn.mozilla.org/projects/spreadfirefox.com
+sourceprefix: spreadfirefox spreadfirefox
+sourceroot: tamarin-central /data/mxr-data/tamarin-central/tamarin-central
+sourceprefix: tamarin-central tamarin
+sourceroot: webtools /data/mxr-data/webtools/webtools
 sourceprefix: webtools mozilla/webtools
-sourceroot: mxr-test /var/www/html/mxr-test
-sourceprefix: mxr-test mozilla/webtools/mxr-test
-sourceroot: mxr /var/www/html/mxr
-sourceprefix: mxr mozilla/webtools/mxr
-sourceroot: bugzilla /var/www/html/mxr/lxr-root/lxr-data/bugzilla/mozilla/webtools/bugzilla
-sourceprefix: bugzilla mozilla/webtools/bugzilla
-sourceroot: bugzilla3.0.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla3.0.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla3.0.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.22.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.22.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.22.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.20.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.20.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.20.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.18.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.18.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.18.x mozilla/webtools/bugzilla
-sourceroot: bugzilla2.16.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.16.x/mozilla/webtools/bugzilla
-sourceprefix: bugzilla2.16.x mozilla/webtools/bugzilla
-sourceroot: update1.0 /var/www/html/mxr/lxr-root/lxr-data/update1.0/mozilla/webtools/update
-sourceprefix: update1.0 mozilla/webtools/update
-sourceroot: mozilla-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozilla-org
-sourceprefix: mozilla-org mozilla-org
-sourceroot: mozilla-com /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozilla-com
-sourceprefix: mozilla-com mozilla-com
-sourceroot: mozillafoundation-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/mozillafoundation-org
-sourceprefix: mozillafoundation-org mozillafoundation-org
-sourceroot: devmo /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/devmo
-sourceprefix: devmo devmo
-sourceroot: devmowiki /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/devmowiki
-sourceprefix: devmowiki devmowiki
-sourceroot: spreadfirefox /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/spreadfirefox
-sourceprefix: spreadfirefox spreadfirefox
-sourceroot: bugzilla-org /var/www/html/mxr/lxr-root/lxr-data/mozilla-org/bugzilla-org
-sourceprefix: bugzilla-org bugzilla-org
+#XXX: PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!!! :XXX#
 
 # name of the source.
 srcrootname: mozilla
@@ -127,49 +122,17 @@
 #dbdir: /opt/lxr-data/db
 
 # If using multiple trees, give the parent directory containing
-# dirs for each tree. For mozilla, /var/www/html/mxr/lxr-root/lxr-data contains
+# dirs for each tree. For mozilla, /data/mxr-data contains
 # a directory for each tree. Each of these directories contains
 # the tree's databases, and a mozilla directory containing the
 # source.
-dbdir: /var/www/html/mxr/lxr-root/lxr-data
+dbdir: /data/mxr-data
 
 # Glimpse can be found here.
-glimpsebin: /usr/local/glimpse-4.18.1p/bin/glimpse
+glimpsebin: /usr/bin/glimpse
 
 # The power of regexps.  This is pretty Linux-specific, but quite
 # useful.  Tinker with it and see what it does.  (How's that for
 # documentation?)
 #map: /include/asm[^\/]*/ /include/asm-$a/
 #map: /arch/[^\/]+/ /arch/$a/
-sourceroot: bonsai-svn /var/www/html/mxr/lxr-root/lxr-data/bonsai-svn
-sourceprefix: bonsai-svn webtools
-sourceroot: bonsai-svn-all /var/www/html/mxr/lxr-root/lxr-data/bonsai-svn-all
-sourceprefix: bonsai-svn-all webtools
-sourceroot: tamarin-central /var/www/html/mxr/lxr-root/lxr-data/tamarin-central/tamarin-central
-sourceprefix: tamarin-central tamarin
-sourceroot: mozilla-central /var/www/html/mxr/lxr-root/lxr-data/mozilla-central/mozilla-central
-sourceprefix: mozilla-central mozilla
-sourceroot: mozillalabs-central /var/www/html/mxr/lxr-root/lxr-data/mozillalabs-central/labs
-sourceprefix: mozillalabs-central mozillalabs
-sourceroot: mozillausers-central /var/www/html/mxr/lxr-root/lxr-data/mozillausers-central/users
-sourceprefix: mozillausers-central mozillausers
-sourceroot: vlc /var/www/html/mxr/lxr-root/lxr-data/vlc/vlc
-sourceprefix: vlc vlc
-sourceroot: mozillasvn-all /var/www/html/mxr/lxr-root/lxr-data/mozillasvn-all/svn.mozilla.org
-sourceprefix: mozillasvn-all svn.mozilla.org
-sourceroot: mozillasvn /var/www/html/mxr/lxr-root/lxr-data/mozillasvn/svn.mozilla.org
-sourceprefix: mozillasvn svn.mozilla.org
-sourceroot: sqlite /var/www/html/mxr/lxr-root/lxr-data/sqlite/sqlite
-sourceprefix: sqlite sqlite
-sourceroot: mozilla0.9.4 /var/www/html/mxr/lxr-root/lxr-data/mozilla0.9.4/mozilla
-sourceprefix: mozilla0.9.4 mozilla
-sourceroot: mozilla0.6 /var/www/html/mxr/lxr-root/lxr-data/mozilla0.6/mozilla
-sourceprefix: mozilla0.6 mozilla
-sourceroot: m18 /var/www/html/mxr/lxr-root/lxr-data/m18/mozilla
-sourceprefix: m18 mozilla
-sourceroot: mobile-browser-central /var/www/html/mxr/lxr-root/lxr-data/mobile-browser-central/mobile-browser
-sourceprefix: mobile-browser-central browser
-sourceroot: oink-central /var/www/html/mxr/lxr-root/lxr-data/oink-central/oink
-sourceprefix: oink-central oink
-sourceroot: webtools-central /var/www/html/mxr/lxr-root/lxr-data/webtools-central/webtools
-sourceprefix: webtools-central webtools
diff -r c27ac5144fa1 -r 86db57518192 root/index.html
--- a/root/index.html	Sun May 18 19:14:00 2008 -0500
+++ b/root/index.html	Sun May 18 19:14:49 2008 -0500
@@ -71,17 +71,55 @@
       <dl class="rootlist">
 
       <dt>
-         <a href="mozilla/">Mozilla</a>
+         <a href="mozilla-central/">Mozilla Central</a>
       </dt>
       <dd>
-          This contains the entire current CVS repository.
+          This contains the main mercurial (hg) repository for Gecko, XULRunner, and Firefox, the main line of development for releases after Gecko 1.9.0 / Firefox 3.0.
+      </dd>
+
+      <dt>
+         <a href="mozilla/">Mozilla CVS</a>
+      </dt>
+      <dd>
+          This contains the entire current CVS repository.  For Gecko, XULRunner, and Firefox, CVS trunk is no longer the trunk, and is instead used for Gecko 1.9 / Firefox 3 and the 1.9.0.* / 3.0.* security releases.
       </dd>
 
       <dt>
          <a href="seamonkey/">SeaMonkey</a> / <a href="l10n/">l10n</a>
       </dt>
       <dd>
-          This module is SeaMonkeyAll, the Mozilla browser project.
+          This the code in CVS for Gecko, XULRunner, Firefox, Thunderbird, Calendar, Camino, and SeaMonkey.  For Gecko, XULRunner, and Firefox, CVS trunk is only used for Gecko 1.9 / Firefox 3 and the 1.9.0.* / 3.0.* security releases.
+      </dd>
+
+      <dt>
+         <a href="firefox/">Firefox 3</a>
+      </dt>
+      <dd class="note">
+          The source specific to the Firefox 3 web browser.  Also available is the
+          <a href="firefox2/">Firefox 2.0 Branch</a>.
+      </dd>
+
+      <dt>
+         <a href="mailnews/">Mail/News</a>
+      </dt>
+      <dd class="note">
+          This contains the mail and news code on the trunk, including that
+          shared by both Seamonkey and Thunderbird (mozilla/mailnews/) as well
+          as that which is Thunderbird-specific (mozilla/mail/).
+      </dd>
+
+      <dt>
+         <a href="mozilla1.8/">Mozilla 1.8</a> / <a href="l10n-mozilla1.8/">l10n</a>
+      </dt>
+      <dd class="note">
+          This is the Mozilla 1.8 branch.  This module also hosts Aviary's 1.5 Branch (e.g. Firefox 2.0), for Mozilla toolkit derived projects.
+      </dd>
+
+      <dt>
+         <a href="mozilla1.8.0/">Mozilla 1.8.0</a> / <a href="l10n-mozilla1.8.0/">l10n</a>
+      </dt>
+      <dd class="note">
+          This is the Mozilla 1.8.0 branch.  This is for security releases products released from Mozilla 1.8 Release (e.g. Firefox 1.5).
       </dd>
 
       <dt>
@@ -91,133 +129,38 @@
           This module is Aviary's 1.0.1 Branch, Mozilla toolkit derived projects.
       </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.0/"><B>Mozilla 1.0</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.0 release.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.0.x/"><B>Mozilla 1.0.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.0 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.4.x/"><B>Mozilla 1.4.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.4 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.7.x/"><B>Mozilla 1.7.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.7 branch.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.8.x/"><B>Mozilla 1.8.x</B></A> / <A HREF="l10n-mozilla1.8.x/"><B>l10n</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.8 branch.  This module also hosts Aviary's 1.5 Branch (e.g. Firefox 2.0), for Mozilla toolkit derived projects.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla1.8.0.x/"><B>Mozilla 1.8.0.x</B></A> / <A HREF="l10n-mozilla1.8.0.x/"><B>l10n</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the Mozilla 1.8.0 branch.  This is for security releases products released from Mozilla 1.8 Release (e.g. Firefox 1.5).
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="m10/"><B>M10</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the source of the M10 release and is provided here for use
-          by the
-          <A HREF="http://www.mozillazine.org/talkback.html?article=858">
-          design patterns</A> contest.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="classic/"><B>Classic</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="classic/">Classic</a>
+      </dt>
+      <dd class="note">
           This is Mozilla Classic. It's a snapshot of the MozillaSource
           module from Oct 26, 1998 just before the change was made to xpfe.
           This is here for reference. No work is done on this branch.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="nspr/"><B>NSPR</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="nspr/">NSPR</a>
+      </dt>
+      <dd class="note">
           This module is 
-          <A HREF="http://www.mozilla.org/projects/nspr/reference/html/index.html">NSPR</A>, 
+          <a href="http://www.mozilla.org/projects/nspr/reference/html/index.html">NSPR</a>, 
           a cross platform library for operating system facilities 
           including threads, I/O, timing and memory management.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="security/"><B>Security</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="security/">Security</a>
+      </dt>
+      <dd class="note">
          This module contains code related to 
          <a href="http://www.mozilla.org/projects/security/">Open Source PKI</a>
          including NSS.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="grendel/"><B>Grendel</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This module is Grendel, a mail reader written in java.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="ef/"><B>Electrical Fire</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is /mozilla/ef, a multi-platform Just&#8209;In&#8209;Time
-          Java compiler.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="songbird/"><B>Songbird</B></A></FONT>
-      </DT>
-      <DD>
-         <FONT SIZE="-1">
-          This contains the head for <a href="http://www.songbirdnest.com/">Songbird</a>.
-          (This includes integration with trac.)
-         </FONT>
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="songbird-all/"><B>Songbird (all)</B></A></FONT>
-      </DT>
-      <DD>
-         <FONT SIZE="-1">
-          This contains the entire source for <a href="http://www.songbirdnest.com/">Songbird</a>.
-          (This includes integration with trac.)
-         </FONT>
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="gcc-4.0.2/"><B>GCC 4.0.2</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This contains the entire <a href="http://gcc.gnu.org/">gcc</a>
-          source for 4.0.2. In particular, it has G++.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="js/"><B>JavaScript</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="js/">JavaScript</a>
+      </dt>
+      <dd class="note">
           This is Mozilla JavaScript. It includes
           <a href="js/source/js/src">SpiderMonkey</a>,
           <a href="js/source/js/rhino">Rhino</a>,
@@ -225,118 +168,74 @@
           as well as
           <a href="js/source/js/jsd">debuggers</a> and
           <a href="js/source/js/tests">test suites</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="webtools/"><B>Webtools</B></A></FONT>
-      </DT>
-      <DD class="note">
+      <dt>
+         <a href="webtools/">Webtools</a>
+      </dt>
+      <dd class="note">
           These are the Mozilla Webtools. They include
           <a href="webtools/source/bugzilla">Bugzilla</a>,
           <a href="webtools/source/bonsai">Bonsai</a>,
           <a href="webtools/source/tinderbox">Tinderbox</a>
           (<a href="webtools/source/tinderbox2">2</a> and
           <a href="webtools/source/tinderbox3">3</a>),
-          <a href="webtools/source/lxr">MXR</a>,
+          <a href="webtools/source/lxr">LXR</a>,
           <a href="webtools/source/mozbot">Mozbot</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla/"><B>Bugzilla</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</A>
+      <dt>
+         <a href="bugzilla/">Bugzilla</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
           <a href="http://www.bugzilla.org/docs/tip/html/">tip</a>.
-      </DD>
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla3.0.x/"><B>Bugzilla3.0.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/3.0/html/">3.0.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla3.0/">Bugzilla3.0</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/3.0/html/">3.0</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.22.x/"><B>Bugzilla2.22.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.22/html/">2.22.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla2.22/">Bugzilla2.22</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/2.22/html/">2.22</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.20.x/"><B>Bugzilla2.20.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.20/html/">2.20.x</a>.
-      </DD>
+      <dt>
+         <a href="bugzilla2.20/">Bugzilla2.20</a>
+      </dt>
+      <dd class="note">
+          This is <a href="http://www.bugzilla.org/">Bugzilla</a>
+          <a href="http://www.bugzilla.org/docs/2.20/html/">2.20</a>.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.18.x/"><B>Bugzilla2.18.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.18/html/">2.18.x</a>.
-      </DD>
+      <dt>
+         <a href="addons/">addons</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="https://addons.mozilla.org/">addons.mozilla.org</a> website.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="bugzilla2.16.x/"><B>Bugzilla2.16.x</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is <a href="http://bugzilla.org/">Bugzilla</a>
-          <a href="http://www.bugzilla.org/docs/2.16/html/">2.16.x</a>.
-      </DD>
+      <dt>
+         <a href="mozilla-org/">mozilla-org</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="http://www.mozilla.org/">www.mozilla.org</a> website.
+      </dd>
 
-      <DT>
-         <FONT SIZE="+1"><A HREF="update1.0/"><B>Update1.0</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the MOZILLA_UPDATE_1_0_BRANCH of the <a href="http://update.mozilla.org">Update webtool</a>.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla-org/"><B>mozilla-org</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozilla.org">mozilla.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozillafoundation-org/"><B>mozillafoundation-org</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozillafoundation.org">mozillafoundation.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="mozilla-com/"><B>mozilla-com</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://mozilla.com">mozilla.com</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="spreadfirefox/"><B>spreadfirefox</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://spreadfirefox.com">spreadfirefox.com</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="devmo/"><B>devmo</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://developer.mozilla.org">developer.mozilla.org</a> website.
-      </DD>
-
-      <DT>
-         <FONT SIZE="+1"><A HREF="devmowiki/"><B>devmowiki</B></A></FONT>
-      </DT>
-      <DD class="note">
-          This is the <a href="http://developer.mozilla.org/wiki">developer.mozilla.org/wiki</a> website.
-      </DD>
+      <dt>
+         <a href="spreadfirefox/">spreadfirefox</a>
+      </dt>
+      <dd class="note">
+          This is the <a href="http://www.spreadfirefox.com">www.spreadfirefox.com</a> website.
+      </dd>
 
       </dl>
 
diff -r c27ac5144fa1 -r 86db57518192 update-src.pl
--- a/update-src.pl	Sun May 18 19:14:00 2008 -0500
+++ b/update-src.pl	Sun May 18 19:14:49 2008 -0500
@@ -91,10 +91,6 @@
         print LOG `$TIME $CVSCOMMAND $CVSCO -P -rMozillaSourceClassic_19981026_BRANCH MozillaSource $STDERRTOSTDOUT`;
         last; 
     };
-    /^ef$/ && do { 
-        print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/ef mozilla/nsprpub $STDERRTOSTDOUT`;
-        last;
-    };
     /^js$/ && do {
         print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/js mozilla/js2 mozilla/nsprpub $STDERRTOSTDOUT`;
         last;
@@ -113,12 +109,8 @@
         print LOG `$TIME $CVSCOMMAND $CVSCO -P mozilla/webtools/bugzilla $STDERRTOSTDOUT`;
         last;
     };
-    /^update1.0$/ && do {
-        print LOG `$TIME $CVSCOMMAND $CVSCO -P -r MOZILLA_UPDATE_1_0_BRANCH mozilla/webtools/update $STDERRTOSTDOUT`;
-        last;
-    };
-    /^grendel$/ && do {
-        print LOG `cd mozilla; $TIME $CVSCOMMAND $CVSUP-d grendel $STDERRTOSTDOUT`;
+    /^(l10n|l10n-(?:mozilla1\.8|aviarybranch|mozilla1\.8\.0))$/ && do {
+        print LOG `$TIME $CVS $CVSQUIETFLAGS -d ':pserver:anonymous\@cvs-mirror.mozilla.org:/l10n' $CVSUP -dP $STDERRTOSTDOUT`;
         last;
     };
     /^mailnews$/ && do {
@@ -144,25 +136,26 @@
         }
         last;
     };
-    /^mozillalabs-central$/ && do {
-        my @dirs = <$src_dir/*>;
-        foreach my $dir (@dirs) {
-            print LOG `cd $dir; $TIME $HGCOMMAND $HGUPDATE $STDERRTOSTDOUT`;
-        }
-        last;
-    };
     /^nspr$/ && do {
         print LOG `$TIME $CVSCOMMAND $CVSCO -P NSPR $STDERRTOSTDOUT`;
         last;
     };
-    /^(?:seamonkey|(?:aviary|reflow)branch|mozilla1.*)$/ && do {
+    /^(?:seamonkey|(?:aviary(?:101)?|reflow)branch|mozilla1.*)$/ && do {
         print LOG `$TIME make -C mozilla -f client.mk pull_all MOZ_CO_PROJECT=all $STDERRTOSTDOUT`;
         print LOG `cat cvsco.log $STDERRTOSTDOUT`;
         print LOG `cd mozilla; $TIME $CVSCOMMAND $CVSUP-d tools` if /^seamonkey$/;
         last;
     };
-    /^(?:netbeans|openoffice|gnome|eclipse|(?:bug|mo)zilla.*-.*|devmo.*|)$/ && do {
+    /^firefox.*$/ && do {
+        print LOG `$TIME make -C mozilla -f client.mk pull_all MOZ_CO_PROJECT=browser $STDERRTOSTDOUT`;
+        last;
+    };
+    /^(?:(?:bug|mo)zilla.*-.*)$/ && do {
         print LOG `cd $src_dir; $TIME $CVSCOMMAND $CVSUP-d * $STDERRTOSTDOUT`;
+        last;
+    };
+    /^fuel$/ && do {
+        print LOG `$TIME $CVSCOMMAND $CVSCO -P -d fuel -rFUEL_DEVEL_BRANCH mozilla/browser/fuel $STDERRTOSTDOUT`;
         last;
     };
     /^(?:.*)-central$/ && do {