diff --git a/mozilla/webtools/tinderbox2/Goals b/mozilla/webtools/tinderbox2/Goals
index eb9ef461bb3..bd6a8e74c6c 100644
--- a/mozilla/webtools/tinderbox2/Goals
+++ b/mozilla/webtools/tinderbox2/Goals
@@ -46,7 +46,7 @@ Improvements needed from Tinderbox1
     opened when the builds fail.
 
   * Greater flexibility in setting status of builds.  We may need more
-    graduations of failure then just 'busted' or 'test-failed' to
+    graduations of failure than just 'busted' or 'test-failed' to
     distinguish the types of tests which have failed.
 
   * Generated HTML must be readable and help isolate programming errors.
diff --git a/mozilla/webtools/tinderbox2/Install b/mozilla/webtools/tinderbox2/Install
index 3dcbd3df2fa..f84d15538bd 100644
--- a/mozilla/webtools/tinderbox2/Install
+++ b/mozilla/webtools/tinderbox2/Install
@@ -245,7 +245,7 @@ the other files depending on how you wish to have Tinderbox configured.
 
 10. Configure the build machines to mail their build logs (with Tinderbox2
     variables on the top) to the web server machine.  New builds must not
-    start earlier then 6 minutes after the last build started.  Each build
+    start earlier than 6 minutes after the last build started.  Each build
     machine mails the build log of each build and puts some build data at
     the top of the log.  Build information includes whether the build was
     a success, which error parsers to use on the log file and what build
diff --git a/mozilla/webtools/tinderbox2/Policies b/mozilla/webtools/tinderbox2/Policies
index 29e41efbfbd..a26de8f3175 100644
--- a/mozilla/webtools/tinderbox2/Policies
+++ b/mozilla/webtools/tinderbox2/Policies
@@ -46,7 +46,7 @@ understand the policies which are used to administer your web server.
     id.  It is suggested that this id not be a privileged id (higher
     ids are better, please make this number be greater than 10 and
     bigger than 100 is recommended). Smaller ids are often assumed to
-    have more privileges on a Unix box then larger ids. It is not a
+    have more privileges on a Unix box than larger ids. It is not a
     good idea for an un-authenticated user to have any privileges so a
     large id is recommended.
 
@@ -57,7 +57,7 @@ understand the policies which are used to administer your web server.
     RedHat runs all its CGI scripts as the user 'apache', this is an
     acceptable user.  I would prefer to have a separate user to run the
     Tinderbox2 CGI scripts but this would require recompiling apache to
-    enable suEXEC, and it is more effort then most groups can afford.
+    enable suEXEC, and it is more effort than most groups can afford.
 
   * Tinderbox2 Files. There are other Tinderbox2 files which need to
     be placed on the web server.  These include libraries and non-cgi
diff --git a/mozilla/webtools/tinderbox2/README.TESTING_IDEAS b/mozilla/webtools/tinderbox2/README.TESTING_IDEAS
index 324c080b7ae..7516ecad739 100644
--- a/mozilla/webtools/tinderbox2/README.TESTING_IDEAS
+++ b/mozilla/webtools/tinderbox2/README.TESTING_IDEAS
@@ -10,7 +10,7 @@ milestone was reached and metrics were finally examined major rework
 was needed to bring the code into compliance.  Tinderbox makes it very
 cheap to continual monitor a wide variety of metrics and identify
 incremental problems with the code.  It is much easier to keep an
-application in compliance with a set of metrics then it is to "bring
+application in compliance with a set of metrics than it is to "bring
 an application into compliance".
 
 While tinderbox can not reduce the coding effort needed to use a large
diff --git a/mozilla/webtools/tinderbox2/ReleaseNotes b/mozilla/webtools/tinderbox2/ReleaseNotes
index 0538223e925..b291ae52482 100644
--- a/mozilla/webtools/tinderbox2/ReleaseNotes
+++ b/mozilla/webtools/tinderbox2/ReleaseNotes
@@ -31,7 +31,7 @@ Release ???
     Add support for build machines to tell the server to add text/links 
     into build cells (TinderboxPrint).
 
-    When builds are started too frequently (more then once every five minutes) 
+    When builds are started too frequently (more than once every five minutes) 
     newest build is now kept and oldest build is thrown away.
 
     New Configure script contributed by Stephen Lamm (slamm@yahoo-inc.com)
diff --git a/mozilla/webtools/tinderbox2/src/bin/addnote.cgi b/mozilla/webtools/tinderbox2/src/bin/addnote.cgi
index ef44d5b8fe4..2049e2163f5 100644
--- a/mozilla/webtools/tinderbox2/src/bin/addnote.cgi
+++ b/mozilla/webtools/tinderbox2/src/bin/addnote.cgi
@@ -6,9 +6,9 @@
 #		 displayed on the tinderbox status page.
 
 
-# $Revision: 1.25 $ 
-# $Date: 2004-04-19 12:42:16 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.26 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/addnote.cgi,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -80,7 +80,7 @@ sub timestring2time {
         $time = timelocal($sec,$min,$hours,$mday,$mon,$year);    
 
         # This fix is needed every year on Jan 1. On that day $time is
-        # nearly a year in the future so is much bigger then $main::TIME.
+        # nearly a year in the future so is much bigger than $main::TIME.
         
         if ( ($time - $main::TIME) > $main::SECONDS_PER_MONTH) {
             $time = timelocal($sec,$min,$hours,$mday,$mon,$year - 1);    
diff --git a/mozilla/webtools/tinderbox2/src/bin/processmail_bugs b/mozilla/webtools/tinderbox2/src/bin/processmail_bugs
index da0a8496e82..7c533c9fe13 100644
--- a/mozilla/webtools/tinderbox2/src/bin/processmail_bugs
+++ b/mozilla/webtools/tinderbox2/src/bin/processmail_bugs
@@ -23,9 +23,9 @@
 
 
 
-# $Revision: 1.15 $ 
-# $Date: 2005-11-25 21:57:07 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.16 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/processmail_bugs,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -374,7 +374,7 @@ sub set_tinderbox_variables {
   foreach $tree (@trees) {
     
       # It is easier to ignore trees we do not know about here rather
-      # then to make the BTData module depend on the TreeData module.
+      # than to make the BTData module depend on the TreeData module.
 
       ($tree) || next;
       $TreeData::VC_TREE {$tree} || next;
diff --git a/mozilla/webtools/tinderbox2/src/bin/processmail_builds b/mozilla/webtools/tinderbox2/src/bin/processmail_builds
index e533e7860fa..842997cf50d 100755
--- a/mozilla/webtools/tinderbox2/src/bin/processmail_builds
+++ b/mozilla/webtools/tinderbox2/src/bin/processmail_builds
@@ -12,9 +12,9 @@
 # server.  No locks are used by the mail processes, data is passed to
 # the tinderbox server in a maildir like format.
 
-# $Revision: 1.36 $ 
-# $Date: 2004-07-18 18:37:46 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.37 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/processmail_builds,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -152,7 +152,7 @@ compilation the build machine has progressed.
 HTTP Post
 
 This script can also process mail which is sent via HTTP Post rather
-then SMTP.  To use this feature simply put this script in the CGI bin
+than SMTP.  To use this feature simply put this script in the CGI bin
 directory and make sure that your webserver will accept posts to this
 executable.  This may require changing the name of this executable to
 end in '.cgi' or some other extension as your local security policy
@@ -1010,7 +1010,7 @@ sub parse_mail_body {
 
     push @lastlines, $html[1];
     
-    # don't keep more lines of history then we need
+    # don't keep more lines of history than we need
     
     if ( !( $#lastlines & 127 ) ){
       my ($first) = $#lastlines - $Error_Parse::LINES_BEFORE_ERROR; 
diff --git a/mozilla/webtools/tinderbox2/src/bin/rmlogs b/mozilla/webtools/tinderbox2/src/bin/rmlogs
index d9a86a84942..4300cba28fe 100644
--- a/mozilla/webtools/tinderbox2/src/bin/rmlogs
+++ b/mozilla/webtools/tinderbox2/src/bin/rmlogs
@@ -2,13 +2,13 @@
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 
-# rmlogs - remove the log files which are older then the number of
+# rmlogs - remove the log files which are older than the number of
 #          days set in TinderConfig.  This program should be 
 # 	   run from cron daily.
 
-# $Revision: 1.10 $ 
-# $Date: 2003-08-17 00:44:05 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.11 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/rmlogs,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -58,7 +58,7 @@ $FULL_TRIM = $TinderConfig::FULL_LOG_TRIM_DAYS || 7;
 
 
 
-# If the argument to this function is a log file which is older then
+# If the argument to this function is a log file which is older than
 # $old_days, we remove the file.
 
 sub rm_logfile {
diff --git a/mozilla/webtools/tinderbox2/src/bin/tinder.cgi b/mozilla/webtools/tinderbox2/src/bin/tinder.cgi
index e82fb10c831..2de4d8745eb 100755
--- a/mozilla/webtools/tinderbox2/src/bin/tinder.cgi
+++ b/mozilla/webtools/tinderbox2/src/bin/tinder.cgi
@@ -2,9 +2,9 @@
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 
-# $Revision: 1.40 $ 
-# $Date: 2005-11-25 21:57:07 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.41 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/tinder.cgi,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -95,7 +95,7 @@ CGI Mode Arguments
 		time is assumed.
 
 --end-time	The time which the table should end at, in time() format.
-		The start-time is always earlier then then end-time.
+		The start-time is always earlier than the end-time.
 
 --display-hours The number of hours which the table should show starting
 		at time --start-time.  If --end-time and --display-hours 
@@ -229,7 +229,7 @@ sub parse_args {
     my ($display_hours) = int (($start_time - $end_time) / ($main::SECONDS_PER_HOUR));
 
     ($display_hours > 0) ||
-      die("start_time must be greater then end_time.".
+      die("start_time must be greater than end_time.".
           " start_time: $start_time, end_time: $end_time. \n");
     
     ($display_hours <= $MAX_DISPLAY_HOURS) ||
diff --git a/mozilla/webtools/tinderbox2/src/clientbin/build_shellscript b/mozilla/webtools/tinderbox2/src/clientbin/build_shellscript
index 5fe980bf5ea..e47bc79f7ca 100755
--- a/mozilla/webtools/tinderbox2/src/clientbin/build_shellscript
+++ b/mozilla/webtools/tinderbox2/src/clientbin/build_shellscript
@@ -35,9 +35,9 @@
 #     mozilla/webtools/tinderbox2/Contact file.
 # Contributor(s): 
 
-# $Revision: 1.21 $
-# $Date: 2004-01-14 00:22:50 $
-# $Author: kestes%walrus.com $
+# $Revision: 1.22 $
+# $Date: 2006-07-27 16:31:06 $
+# $Author: bear%code-bear.com $
 # $Name: not supported by cvs2svn $
 
 
@@ -75,7 +75,7 @@ Global Options:
   --test                 Print the build commands, do not run the build 
 			     commands or mail logs.
   --build BUILDTYPE      The name of the build type to run. You may specify
-			 more then one build on the command line by 
+			 more than one build on the command line by 
 			 separating build types with colons (':') each build 
 			 will be run in the order given. This will result in 
 			 gaps in each of the tinderbox display pages. If you 
@@ -83,7 +83,7 @@ Global Options:
 			 then run several copies of this program.
 
   --tree TREENAME        Checkout sources with tree (module and branch)
-			 TREENAME. You may specify more then one build on
+			 TREENAME. You may specify more than one build on
 			 the command line by separating build types with 
 			 colons (':') each build will be run in the order
 			 given. This will result in gaps in each of the
@@ -183,7 +183,7 @@ page the information will be displayed on.  The tinderbox build name
 is the name used for the column that the data will be displayed in.
 Typically there is one daemon running continually for each column of
 each page. It may be clearer to have different build names display on
-the tinderbox columns then are used by this build script.
+the tinderbox columns than are used by this build script.
 
 Users should provide functions which prepare the tinderbox tree and
 build name based on both the command line arguments and the
@@ -236,7 +236,7 @@ sub set_static_vars {
   $BUILDCF = "buildcf";
 
   # minimum time between the start of consecutive builds.  Tinderbox
-  # requires this to be greater then 5 minutes.
+  # requires this to be greater than 5 minutes.
 
   $MINIMUM_BUILD_SECONDS = 8*60;
 
diff --git a/mozilla/webtools/tinderbox2/src/clientbin/cull_archive_dirs b/mozilla/webtools/tinderbox2/src/clientbin/cull_archive_dirs
index 520eaf056c5..d9d94088e5a 100644
--- a/mozilla/webtools/tinderbox2/src/clientbin/cull_archive_dirs
+++ b/mozilla/webtools/tinderbox2/src/clientbin/cull_archive_dirs
@@ -26,9 +26,9 @@
 #     mozilla/webtools/tinderbox2/Contact file.
 # Contributor(s): 
 
-# $Revision: 1.13 $
-# $Date: 2005-11-25 21:57:08 $
-# $Author: timeless%mozdev.org $
+# $Revision: 1.14 $
+# $Date: 2006-07-27 16:31:06 $
+# $Author: bear%code-bear.com $
 # $Name: not supported by cvs2svn $
 
 
@@ -89,7 +89,7 @@ A new build is completed about once an hour and this script is used
 to ensure that recent files and a few historical files are saved.
 
 The files are sorted by date and kept according to this rule: The most
-recent min-archive-files are kept and if there are more then
+recent min-archive-files are kept and if there are more than
 min-archive-files then additionally one file each day is kept for the
 previous max-archive-days.  All other files are deleted.
 
@@ -345,7 +345,7 @@ sub purge_dirs {
 # this is necessary because our filenames are so long (embedded
 # date/time) that by default browsers do not show the full name in a
 # directory listing. However if we put the names in an index.html file
-# then the bwoser displays the filenames, no matter how long they are.
+# then the browser displays the filenames, no matter how long they are.
 
 
 sub print_dirs_index {
diff --git a/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf b/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf
index 2d01500080d..177615d8d43 100644
--- a/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf
+++ b/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf
@@ -24,9 +24,9 @@
 # variables substituted.
 
 
-# $Revision: 1.12 $ 
-# $Date: 2004-07-18 18:38:36 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.13 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -149,7 +149,7 @@ sub build_scripts {
                      $args{'tree_name'}.
                      "");
     
-    # pick a time earlier then the current time. Check out the sources
+    # pick a time earlier than the current time. Check out the sources
     # as of that time and use that time as the name of the tar
     # file. Now anyone who wants to recreate the sources of the binary
     # tar can use the tarfile name to checkout the sources as if we had
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/BTData.pm b/mozilla/webtools/tinderbox2/src/default_conf/BTData.pm
index af011de59ee..6ad75b94441 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/BTData.pm
+++ b/mozilla/webtools/tinderbox2/src/default_conf/BTData.pm
@@ -4,9 +4,9 @@
 # Tracking system and its relationship to the tinderbox trees.
 
 
-# $Revision: 1.13 $ 
-# $Date: 2003-08-17 02:13:16 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.14 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/BTData.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -224,7 +224,7 @@ $STATUS_FIELD_NAME = 'Status';
 # ignored so it is fine to return a tree for every ticket parsed even
 # if some tickets do not map to tinderbox trees.
 # It is cleaner to ignore trees we do not know about in the mail processor 
-# then to make the BTData module depend on the TreeData module.
+# than to make the BTData module depend on the TreeData module.
 
 sub update2tree {
   my ($tinderbox_ref) = @_;
@@ -277,7 +277,7 @@ sub bug_id2bug_url {
 
 
 # Given a bug record  return a URL ('href') to the bug. 
-# this might work for a larger collection of trackers then the above.
+# this might work for a larger collection of trackers than the above.
 
 sub rec2bug_url {
   my ($tinderbox_ref) = @_;
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/Error_Parse.pm b/mozilla/webtools/tinderbox2/src/default_conf/Error_Parse.pm
index 0f2eac937b8..7d18c61830a 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/Error_Parse.pm
+++ b/mozilla/webtools/tinderbox2/src/default_conf/Error_Parse.pm
@@ -5,9 +5,9 @@
 # errors and creating links into the source code where the errors
 # occurred.
 
-# $Revision: 1.19 $ 
-# $Date: 2005-11-25 21:57:08 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.20 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/Error_Parse.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -410,7 +410,7 @@ out the error messages of various build tools.  There are different
 name spaces for each build type and a set of parsing programs in each
 namespace.  Currently build types are the major OS (Unix, Mac,
 Windows).  It may be possible in the future to have a single universal
-parsing program or alternatly to have build types specify a list of
+parsing program or alternatively to have build types specify a list of
 parsing programs for each tool (compler, make language, script) which
 is used in the build process then a build would also need to specify a
 list of tools that are used.  This may be necessary as people run unix
@@ -425,7 +425,7 @@ compilers on NT and vice versa.
 
 returns a string describing if the line has any errors or warnings.
 The list of types may grow in the future as some warnings become more
-important then others.  The possible return codes are:
+important than others.  The possible return codes are:
 
 	'error'
 	'warning'
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/FileStructure.pm b/mozilla/webtools/tinderbox2/src/default_conf/FileStructure.pm
index 12d0a0c5d35..b95fe283ac3 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/FileStructure.pm
+++ b/mozilla/webtools/tinderbox2/src/default_conf/FileStructure.pm
@@ -4,11 +4,11 @@
 # for each tree, are stored on the filesystem.  Local system
 # administrator may need to put different trees onto different disk
 # partitions and this will require making directory structure in
-# get_filename() less regular then we have defined it here.
+# get_filename() less regular than we have defined it here.
 
-# $Revision: 1.11 $ 
-# $Date: 2004-07-18 16:44:15 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.12 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/FileStructure.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -112,7 +112,7 @@ $DEFAULT_HTML_PAGE = $TinderConfig::DEFAULT_HTML_PAGE || 'index.html';
 # The lookup for where different file/directories are stored on the
 # filesystem.  Local system administrator may need to put different
 # trees onto different disk partitions and this will require making
-# get_filename() less regular then we have defined it here.
+# get_filename() less regular than we have defined it here.
 
 sub get_filename {
   my ($tree, $file,) = @_;
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/README b/mozilla/webtools/tinderbox2/src/default_conf/README
index ea42d935a5d..2f02dfab21f 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/README
+++ b/mozilla/webtools/tinderbox2/src/default_conf/README
@@ -34,7 +34,7 @@ FileStructure.pm - The lookup for where different file/directories,
 for each tree, are stored on the filesystem.  Local system
 administrator may need to put different trees onto different disk
 partitions and this will require making the directory structure less
-regular then we have defined it here.
+regular than we have defined it here.
 
 Error_Parser.pm - Used by processmail to turn the build logs into
 HTML.  Contains the parsing functions for highlighting the build
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm b/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm
index 26e1bad1f7a..05345aba5b0 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm
+++ b/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm
@@ -5,9 +5,9 @@
 # customizable settings.
 
 
-# $Revision: 1.53 $ 
-# $Date: 2005-11-25 19:47:47 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.54 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -72,7 +72,7 @@ $ENV{'PATH'}=  (
 
 # The user/group ids which tinderbox will run as. Hopefully these
 # integers are out of the restricted range (bigger is safer, bigger
-# then 100 is ideal but bigger than 25 is recommended.).
+# than 100 is ideal but bigger than 25 is recommended.).
 
 $TINDERBOX_UID=3310;
 $TINDERBOX_GID=3310;
@@ -160,7 +160,7 @@ $REFRESH_TIME = (60 * 15);
 # libraries deprecated. You may wish to run the test vcdisplay.tst to
 # see samples of all the windows.
 
-# Overlib : this library is a bit larger then the rest but I am
+# Overlib : this library is a bit larger than the rest but I am
 #            particularly fond of the portable and supported 
 #	     windows it creates.
 # MozillaClick: Should be bortable to all browsers written my the
@@ -191,7 +191,7 @@ $PopUpImpl = (
 # These uses determine the columns of the build page and their
 # include order is the order in which the columns are displayed.
 
-# The time Column can occur more then once if you like.
+# The time Column can occur more than once if you like.
 
 
 # The main choice of implementations is how to gather information
@@ -202,8 +202,8 @@ $PopUpImpl = (
 	   'TinderDB::Time',
 
            # If you development spans multiple time zones you may wish
-           # to display a time other then the time on the server. More
-           # then one time column can be included if you
+           # to display a time other than the time on the server. More
+           # than one time column can be included if you
            # desire. Time_UTC displays the UTC time while Time_Local
            # will use JavaScript to compute the correct time for each
            # browser.
@@ -296,7 +296,7 @@ $DB_TRIM_SECONDS = (60 * 60 * 24 * 8);
 $SECONDS_AGO_ACCEPTABLE = (60 * 60 * 10);
 
 # set this to zero to enforce the client machines never having a
-# faster clock then the server machine.
+# faster clock than the server machine.
 
 $SECONDS_FROM_NOW_ACCEPTABLE = (60 * 10);
 
@@ -464,7 +464,7 @@ $FULL_LOG_TRIM_DAYS = 8;
 # Should we write performance data to the log file?
 # zero means no, one means yes.
 # This is useful to see if on average the time it takes to create the
-# pages is longer then the time between runs of the pages.
+# pages is longer than the time between runs of the pages.
 
 
 $LOG_PERFORMANCE = 0;
diff --git a/mozilla/webtools/tinderbox2/src/default_conf/TreeData.pm b/mozilla/webtools/tinderbox2/src/default_conf/TreeData.pm
index 72c2f4e1462..04a51bf7d13 100644
--- a/mozilla/webtools/tinderbox2/src/default_conf/TreeData.pm
+++ b/mozilla/webtools/tinderbox2/src/default_conf/TreeData.pm
@@ -29,9 +29,9 @@
 # issue to work out.
 
 
-# $Revision: 1.21 $ 
-# $Date: 2004-07-12 01:03:38 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.22 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/TreeData.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -211,7 +211,7 @@ $VERSION = '#tinder_version#';
                    # I assume that the branch is the prefix of the
                    # filespex and the module is the suffix of the
                    # filespec.  The funtion Tree2Filespec is more
-                   # important then the way you store the tree data.
+                   # important than the way you store the tree data.
 
                    # In these Perforce examples I assume that the
                    # filespec will be $branch.$module
diff --git a/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm b/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm
index 61d89731db8..d3d23f48339 100644
--- a/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm
@@ -7,9 +7,9 @@
 # module which uses this library is: lib/TinderDB/VC_Bonsai.pm
 
 
-# $Revision: 1.16 $ 
-# $Date: 2003-12-23 13:18:23 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.17 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -205,7 +205,7 @@ sub get_tree_state {
 # We must set global variables to call query_checkins();
 
 # This function is used to prevent other modules from using this
-# global data, which would cause the code to become more nonlocal then
+# global data, which would cause the code to become more nonlocal than
 # it already is.
 
 sub undef_query_vars {
diff --git a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp.pm b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp.pm
index 360aea2fba2..76a2e9e371e 100644
--- a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp.pm
@@ -2,7 +2,7 @@
 
 # HTML.pm - a lightweight replacement for cgi.pm and general html/cgi
 # processing.  This provides popup windows and a more highly
-# structured interface for linking then CGI.pm does.  The popup window
+# structured interface for linking than CGI.pm does.  The popup window
 # code is easily changed to use different technology if needed.  The
 # parts of tinderbox which need user input via forms all use the
 # standard perl library CGI.pm.
@@ -12,9 +12,9 @@
 # the completed string before it is returned.
 
 
-# $Revision: 1.29 $ 
-# $Date: 2005-11-25 21:57:09 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.30 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
diff --git a/mozilla/webtools/tinderbox2/src/lib/MailProcess.pm b/mozilla/webtools/tinderbox2/src/lib/MailProcess.pm
index de29aeb2a3f..4419dc375a5 100644
--- a/mozilla/webtools/tinderbox2/src/lib/MailProcess.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/MailProcess.pm
@@ -1,12 +1,12 @@
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 
-# MailProcess.pm - all the functions which are used by more then one
+# MailProcess.pm - all the functions which are used by more than one
 # mailprocessing program.
 
 
-# $Revision: 1.15 $ 
-# $Date: 2005-11-25 21:57:09 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.16 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/MailProcess.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
diff --git a/mozilla/webtools/tinderbox2/src/lib/Persistence/Dumper.pm b/mozilla/webtools/tinderbox2/src/lib/Persistence/Dumper.pm
index 90c78f25e64..db0d606c28e 100644
--- a/mozilla/webtools/tinderbox2/src/lib/Persistence/Dumper.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/Persistence/Dumper.pm
@@ -14,9 +14,9 @@
 #	was spend in 32878 calls to Data::Dumper::_dump()
 
 
-# $Revision: 1.11 $ 
-# $Date: 2005-11-25 21:57:09 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.12 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/Persistence/Dumper.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -55,7 +55,7 @@ use Data::Dumper;
 
 
 # The calling structure looks like the call for Storable because the
-# arguments for that module are more strict then Data::Dumper.
+# arguments for that module are more strict than Data::Dumper.
 
 #    $data: is a scalar (often a list of references to the data) which
 #    contains the data we will save. We can only save scalars to be
diff --git a/mozilla/webtools/tinderbox2/src/lib/Persistence/Storable.pm b/mozilla/webtools/tinderbox2/src/lib/Persistence/Storable.pm
index 42574b6b5c7..fc0bcf403d1 100644
--- a/mozilla/webtools/tinderbox2/src/lib/Persistence/Storable.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/Persistence/Storable.pm
@@ -9,9 +9,9 @@
 # browser.
 
 
-# $Revision: 1.9 $ 
-# $Date: 2005-11-25 21:57:09 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.10 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/Persistence/Storable.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -56,7 +56,7 @@ use lib '#tinder_libdir#';
 
 
 # The calling structure looks like the call for Storable because the
-# arguments for that module are more strict then Data::Dumper.
+# arguments for that module are more strict than Data::Dumper.
 
 #    $data: is a scalar (often a list of references to the data) which
 #    contains the data we will save. We can only save scalars to be
diff --git a/mozilla/webtools/tinderbox2/src/lib/README b/mozilla/webtools/tinderbox2/src/lib/README
index 2985cc4c1f6..b7c74e02cf3 100644
--- a/mozilla/webtools/tinderbox2/src/lib/README
+++ b/mozilla/webtools/tinderbox2/src/lib/README
@@ -45,7 +45,7 @@ The files in this directory follow several conventions:
 The library files in this directory:
 
   MailProcess.pm
-      All the functions which are used by more then one mail
+      All the functions which are used by more than one mail
       processing program.
 
   Persistence.pm
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB.pm
index 4cf0f20dfb5..26e46e93148 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB.pm
@@ -17,8 +17,8 @@
 #     Time Column, Version Control (VC) checkin lists, 
 #     notice board display,  build display (colored squares)
 
-# $Revision: 1.23 $ 
-# $Date: 2005-10-19 04:20:35 $ 
+# $Revision: 1.24 $ 
+# $Date: 2006-07-27 16:31:06 $ 
 # $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB.pm,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -619,8 +619,8 @@ the static HTML files which describe the state of the build.  When
 Tinderbox2 runs it looks for files with the known prefix then it reads
 each one in turn, loads it into a common database then deletes the
 file.  To ensure that Tinderbox2 never encounters a partially written
-file each file is written to the disk using a name with a different
-prefix then the server looks for (beginning with 'Tmp') then the name
+file, each file is written to the disk using a name with a different
+prefix than the server looks for (beginning with 'Tmp'), then the name
 is changed to be the name Tinderbox2 looks for.  Since name changes, on
 Unix systems, in the same directory, are atomic, Tinderbox2 will never
 be confused by incomplete updates.
@@ -635,9 +635,9 @@ it can shade the VC column correctly.  This does not require any
 locking or data storage on the part of the TreeState module.
 
 The Tinderbox2 server can be run by the web server in cgi_mode (non
-daemon_mode) this does not allow any databases to be updated and does
+daemon_mode), and this does not allow any databases to be updated and does
 not update any static HTML files but will allow users to generate the
-build data pages using different configuration parameters then is
+build data pages using different configuration parameters than is
 standard.
 
 The Tinderbox2 server does not use any information about the internal
@@ -714,10 +714,10 @@ called.
 
 =item B<trim_db_history>
 
-Purge any history from this tree's database which is older then the
+Purge any history from this tree's database which is older than the
 time given.  This should not be called directly, rather it is called
 every time the number of updates made by apply_db_updates() since the
-last purge is greater then $MAX_UPDATES_SINCE_TRIM.
+last purge is greater than $MAX_UPDATES_SINCE_TRIM.
 
 =back
 
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Generic.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Generic.pm
index ab75e2b653a..7b6888612f3 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Generic.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Generic.pm
@@ -35,9 +35,9 @@
 # Contributor(s): 
 
 
-# $Revision: 1.24 $ 
-# $Date: 2003-08-17 01:37:52 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.25 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Generic.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -76,7 +76,7 @@ use VCDisplay;
 use TinderDB::Notice;
 
 
-$VERSION = ( qw $Revision: 1.24 $ )[1];
+$VERSION = ( qw $Revision: 1.25 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -379,7 +379,7 @@ sub status_table_start {
   @DB_TIMES = sort {$b <=> $a} keys %{ $DATABASE{$tree} };
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Req.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Req.pm
index 6b2d23b6d89..24e7c1339b9 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Req.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Req.pm
@@ -40,9 +40,9 @@
 
 
 
-# $Revision: 1.9 $ 
-# $Date: 2005-11-25 19:47:48 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.10 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/BT_Req.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -80,7 +80,7 @@ use VCDisplay;
 
 
 
-$VERSION = ( qw $Revision: 1.9 $ )[1];
+$VERSION = ( qw $Revision: 1.10 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -89,7 +89,7 @@ $VERSION = ( qw $Revision: 1.9 $ )[1];
 $REQ_NAME = $TinderConfig::REQ_NAME || "Req";
 
 # Return the oldest time we have data for.
-# This should not be older then the time we would keep if we 
+# This should not be older than the time we would keep if we 
 # were to trim the database now.
 
 sub find_last_data {
@@ -309,7 +309,7 @@ sub status_table_start {
   @DB_TIMES = sort {$b <=> $a} keys %{ $DATABASE{$tree} };
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BasicTxtDB.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BasicTxtDB.pm
index 9d475ae72ef..c673bcd2562 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/BasicTxtDB.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/BasicTxtDB.pm
@@ -6,9 +6,9 @@
 # as a Dump of the $DATABASE reference.
 
 
-# $Revision: 1.14 $ 
-# $Date: 2005-11-25 21:57:10 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.15 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/BasicTxtDB.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -48,7 +48,7 @@ use FileStructure;
 use Persistence;
 
 
-$VERSION = ( qw $Revision: 1.14 $ )[1];
+$VERSION = ( qw $Revision: 1.15 $ )[1];
 
 
 # To help preserve the database in the event of a serious system
@@ -251,7 +251,7 @@ sub savetree_db {
 
 
 
-# remove all records from the database which are older then last_time.
+# remove all records from the database which are older than last_time.
 
 sub trim_db_history {
   my ($self, $tree,) = (@_);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/Build.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/Build.pm
index 0d8a3bc414b..d2d81e28cd2 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/Build.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/Build.pm
@@ -7,9 +7,9 @@
 # the build was and display a link to the build log.
 
 
-# $Revision: 1.68 $ 
-# $Date: 2005-11-25 19:47:48 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.69 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/Build.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -476,7 +476,7 @@ sub loadtree_db {
 }
 
 
-# remove all records from the database which are older then
+# remove all records from the database which are older than
 # $TinderDB::TRIM_SECONDS.  Since we are making a pass over all
 # data this is a good time to find the average run time of the build.
 # Both of these operations need not be run every time the database is
@@ -537,7 +537,7 @@ sub trim_db_history {
     pop @run_times;
     pop @dead_times;
 
-    # medians are a more robust statistical estimator then the mean.
+    # medians are a more robust statistical estimator than the mean.
     # They will give us better answers than a typical "average"
 
     delete $DATABASE{$tree}{$buildname}{'average_buildtime'};
@@ -1000,7 +1000,7 @@ sub apply_db_updates {
 
       ($starttime <= $timenow) ||
         die("Error in updatefile: $file, ".
-            "starttime: $starttime, is less then timenow: $timenow.");
+            "starttime: $starttime, is less than timenow: $timenow.");
 
    }  
 
@@ -1018,7 +1018,7 @@ sub apply_db_updates {
       my ($different_builds) = ($record->{'starttime'} !=
                                 $previous_rec->{'starttime'});
 
-      # Keep the spacing between builds greater then our HTML grid
+      # Keep the spacing between builds greater than our HTML grid
       # spacing.  There can be very frequent updates for any build
       # but different builds must be spaced apart.
 
@@ -1186,7 +1186,7 @@ sub status_table_start {
   # the first element of $row_times.
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/Notice.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/Notice.pm
index 2f7d90f4dce..a9411c4762d 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/Notice.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/Notice.pm
@@ -28,9 +28,9 @@
 #     mozilla/webtools/tinderbox2/Contact file.
 # Contributor(s): 
 
-# $Revision: 1.28 $ 
-# $Date: 2003-08-17 01:37:52 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.29 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/Notice.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -83,7 +83,7 @@ use VCDisplay;
 use HTMLPopUp;
 use TinderDB::BasicTxtDB;
 
-$VERSION = ( qw $Revision: 1.28 $ )[1];
+$VERSION = ( qw $Revision: 1.29 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -191,7 +191,7 @@ sub apply_db_updates {
 
 
 
-# remove all records from the database which are older then last_time.
+# remove all records from the database which are older than last_time.
 
 sub trim_db_history {
   my ($self, $tree, ) = (@_);
@@ -225,7 +225,7 @@ sub status_table_start {
   # not want the first row to have all of todays data in it.
 
   # Adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages which start and stop
   # on the same time.
 
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm
index cd27e1e754e..41e422b0edc 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm
@@ -38,9 +38,9 @@
 # Contributor(s): 
 
 
-# $Revision: 1.73 $ 
-# $Date: 2006-02-23 04:38:47 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.74 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -105,7 +105,7 @@ use HTMLPopUp;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.73 $ )[1];
+$VERSION = ( qw $Revision: 1.74 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -317,7 +317,7 @@ sub apply_db_updates {
   # duplicates.
 
   # If we have three data points in a row, and all of them have the
-  # same state and the oldest is less then an hour old, then we can
+  # same state and the oldest is less than an hour old, then we can
   # delete the middle state.  While writing this code I kept trying to
   # make do with only one older state being remembered.  The problem
   # is that if you keep deleting the oldest member you always have
@@ -789,7 +789,7 @@ sub status_table_start {
 
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm
index 95295f9d270..f5208953746 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm
@@ -33,9 +33,9 @@
 #     mozilla/webtools/tinderbox2/Contact file.
 # Contributor(s): 
 
-# $Revision: 1.37 $ 
-# $Date: 2005-11-25 21:57:10 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.38 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -137,7 +137,7 @@ use TreeData;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.37 $ )[1];
+$VERSION = ( qw $Revision: 1.38 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -199,7 +199,7 @@ sub parse_cvs_time {
   my ($time) = timegm($sec,$min,$hours,$mday,$mon,$year);    
 
   # This fix is needed every year on Jan 1. On that day $time is
-  # nearly a year in the future so is much bigger then $main::TIME.
+  # nearly a year in the future so is much bigger than $main::TIME.
 
   if ( ($time - $main::TIME) > $main::SECONDS_PER_MONTH) {
     $time = timegm($sec,$min,$hours,$mday,$mon,$year - 1);    
@@ -210,7 +210,7 @@ sub parse_cvs_time {
   if ( (($main::TIME - $main::SECONDS_PER_YEAR) > $time) || 
        (($main::TIME + $main::SECONDS_PER_MONTH) < $time) ) {
     die("CVS reported time: $time ".scalar(gmtime($time)).
-        " which is more then a year away from now or in the future.\n");
+        " which is more than a year away from now or in the future.\n");
   }
 
   return $time;
@@ -233,7 +233,7 @@ sub time2cvsformat {
 }
 
 
-# remove all records from the database which are older then last_time.
+# remove all records from the database which are older than last_time.
 
 sub trim_db_history {
   my ($self, $tree,) = (@_);
@@ -439,7 +439,7 @@ sub apply_db_updates {
   # duplicates.
 
   # If we have three data points in a row, and all of them have the
-  # same state and the oldest is less then an hour old, then we can
+  # same state and the oldest is less than an hour old, then we can
   # delete the middle state.  While writing this code I kept trying to
   # make do with only one older state being remembered.  The problem
   # is that if you keep deleting the oldest member you always have
@@ -577,7 +577,7 @@ sub apply_db_updates {
         if ( (($main::TIME - $main::SECONDS_PER_YEAR) > $time) || 
              (($main::TIME + $main::SECONDS_PER_MONTH) < $time) ) {
           die("CVS reported time: $time ".gmtime($time).
-              " which is more then a year away from now.\n")
+              " which is more than a year away from now.\n")
         }
 
         $author = main::extract_user($author);
@@ -683,7 +683,7 @@ sub status_table_start {
   @DB_TIMES = sort {$b <=> $a} keys %{ $DATABASE{$tree} };
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
@@ -710,7 +710,7 @@ sub status_table_row {
   my (@outrow) = ();
 
   # we assume that tree states only change rarely so there are very
-  # few cells which have more then one state associated with them.
+  # few cells which have more than one state associated with them.
   # It does not matter what we do with those cells.
   
   # find all the authors who changed code at any point in this cell
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_PVCSDimensions.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_PVCSDimensions.pm
index 9d94110b56a..c6d2b439a5b 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_PVCSDimensions.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_PVCSDimensions.pm
@@ -63,9 +63,9 @@
 # Contributor(s): 
 
 
-# $Revision: 1.5 $ 
-# $Date: 2006-02-23 04:38:47 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.6 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_PVCSDimensions.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -131,7 +131,7 @@ use Utils;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.5 $ )[1];
+$VERSION = ( qw $Revision: 1.6 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -401,7 +401,7 @@ sub apply_db_updates {
   # duplicates.
 
   # If we have three data points in a row, and all of them have the
-  # same state and the oldest is less then an hour old, then we can
+  # same state and the oldest is less than an hour old, then we can
   # delete the middle state.  While writing this code I kept trying to
   # make do with only one older state being remembered.  The problem
   # is that if you keep deleting the oldest member you always have
@@ -899,7 +899,7 @@ sub status_table_start {
 
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
index 15f2f58c141..956ec42d164 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
@@ -75,9 +75,9 @@
 # Contributor(s): 
 
 
-# $Revision: 1.32 $ 
-# $Date: 2006-02-23 04:38:47 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.33 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -156,7 +156,7 @@ use Utils;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.32 $ )[1];
+$VERSION = ( qw $Revision: 1.33 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -764,7 +764,7 @@ sub status_table_start {
   @DB_TIMES = sort {$b <=> $a} keys %{ $DATABASE{$tree} };
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
@@ -943,7 +943,7 @@ sub apply_db_updates {
   # duplicates.
 
   # If we have three data points in a row, and all of them have the
-  # same state and the oldest is less then an hour old, then we can
+  # same state and the oldest is less than an hour old, then we can
   # delete the middle state.  While writing this code I kept trying to
   # make do with only one older state being remembered.  The problem
   # is that if you keep deleting the oldest member you always have
@@ -980,7 +980,7 @@ sub apply_db_updates {
 
   my $change_num = $METADATA{$tree}{'next_change_num'};
 
-  # We can put more then one change number in a
+  # We can put more than one change number in a
   # request and they will all be answered.  Send multiple
   # requests per call to save the cost of creating a new
   # process.
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_SVN.pm b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_SVN.pm
index dfd679b6359..725b446380f 100755
--- a/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_SVN.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_SVN.pm
@@ -33,8 +33,8 @@
 #
 # Contributor(s): 
 
-# $Revision: 1.1 $ 
-# $Date: 2005-10-19 03:21:58 $ 
+# $Revision: 1.2 $ 
+# $Date: 2006-07-27 16:31:07 $ 
 # $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_SVN.pm,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -82,7 +82,7 @@ use HTMLPopUp;
 use TreeData;
 use VCDisplay;
 
-$VERSION = ( qw $Revision: 1.1 $ )[1];
+$VERSION = ( qw $Revision: 1.2 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -124,7 +124,7 @@ sub parse_svn_time {
   my ($time) = timelocal($sec,$min,$hours,$mday,$mon,$year);    
 
   # This fix is needed every year on Jan 1. On that day $time is
-  # nearly a year in the future so is much bigger then $main::TIME.
+  # nearly a year in the future so is much bigger than $main::TIME.
 
   if ( ($time - $main::TIME) > $main::SECONDS_PER_MONTH) {
     $time = timelocal($sec,$min,$hours,$mday,$mon,$year - 1);    
@@ -135,7 +135,7 @@ sub parse_svn_time {
   if ( (($main::TIME - $main::SECONDS_PER_YEAR) > $time) || 
        (($main::TIME + $main::SECONDS_PER_MONTH) < $time) ) {
     die("SVN reported time: $time ".scalar(localtime($time)).
-        " which is more then a year away from now or in the future.\n");
+        " which is more than a year away from now or in the future.\n");
   }
 
   return $time;
@@ -162,7 +162,7 @@ sub time2svnformat {
 }
 
 sub trim_db_history {
-  # remove all records from the database which are older then last_time.
+  # remove all records from the database which are older than last_time.
 
   my ($self, $tree,) = (@_);
 
@@ -361,7 +361,7 @@ sub apply_db_updates {
   # duplicates.
 
   # If we have three data points in a row, and all of them have the
-  # same state and the oldest is less then an hour old, then we can
+  # same state and the oldest is less than an hour old, then we can
   # delete the middle state.  While writing this code I kept trying to
   # make do with only one older state being remembered.  The problem
   # is that if you keep deleting the oldest member you always have
@@ -578,7 +578,7 @@ sub status_table_start {
   @DB_TIMES = sort {$b <=> $a} keys %{ $DATABASE{$tree} };
 
   # adjust the $NEXT_DB to skip data which came after the first cell
-  # at the top of the page.  We make the first cell bigger then the
+  # at the top of the page.  We make the first cell bigger than the
   # rest to allow for some overlap between pages.
 
   my ($first_cell_seconds) = 2*($row_times->[0] - $row_times->[1]);
@@ -601,7 +601,7 @@ sub status_table_row {
   my (@outrow) = ();
 
   # we assume that tree states only change rarely so there are very
-  # few cells which have more then one state associated with them.
+  # few cells which have more than one state associated with them.
   # It does not matter what we do with those cells.
 
   # find all the authors who changed code at any point in this cell
diff --git a/mozilla/webtools/tinderbox2/src/lib/TinderHeader.pm b/mozilla/webtools/tinderbox2/src/lib/TinderHeader.pm
index f47d5614734..62fc2f0f306 100644
--- a/mozilla/webtools/tinderbox2/src/lib/TinderHeader.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/TinderHeader.pm
@@ -8,9 +8,9 @@
 #	 TreeState, Build, IgnoreBuilds, MOTD, Images, 
 
 
-# $Revision: 1.12 $ 
-# $Date: 2005-11-25 21:57:09 $ 
-# $Author: timeless%mozdev.org $ 
+# $Revision: 1.13 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderHeader.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -319,7 +319,7 @@ The message of the day as set by the administrators.
 =over 4
 
 Headers are Administrative functions and are performed rarely (less
-then once an hour) and no historical data is preserved.  So there is
+than once an hour) and no historical data is preserved.  So there is
 no locking or moving of files for these functions.  An effort is made
 to keep the updates of these files atomic so that the rendering of any
 HTML pages will not be effected by an update.  The data is stored in
diff --git a/mozilla/webtools/tinderbox2/src/lib/Utils.pm b/mozilla/webtools/tinderbox2/src/lib/Utils.pm
index 07098fe8178..e75613b390a 100755
--- a/mozilla/webtools/tinderbox2/src/lib/Utils.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/Utils.pm
@@ -3,9 +3,9 @@
 # Utils.pm - General purpose utility functions.  Every project needs a
 # kludge bucket for common access.
 
-# $Revision: 1.41 $ 
-# $Date: 2004-07-18 17:58:39 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.42 $ 
+# $Date: 2006-07-27 16:31:06 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/Utils.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -101,7 +101,7 @@ sub set_static_vars {
   $SMALLEST_VALID_TIME = (2000 * 1000 * 400);
 
   # It is easier to understand algorithms if you use named constants,
-  # rather then some mysterious constants hard coded into the code.
+  # rather than some mysterious constants hard coded into the code.
 
   $SECONDS_PER_MINUTE = (60);
   $SECONDS_PER_HOUR = (60*$SECONDS_PER_MINUTE);
diff --git a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Bonsai.pm b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Bonsai.pm
index cf586cd87f8..f15be834300 100644
--- a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Bonsai.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Bonsai.pm
@@ -4,9 +4,9 @@
 # installed bonsai and are using cvsblame cvsguess and cvsquery to let
 # your webserver render html pages of your CVS repository.
 
-# $Revision: 1.12 $ 
-# $Date: 2003-08-17 01:29:26 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.13 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Bonsai.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -159,8 +159,8 @@ sub prepare_bonsai_args {
     ($args{'mindate'} && $args{'maxdate'}) && 
     ($args{'mindate'} > $args{'maxdate'}) && 
         (die (
-              "Bonsai mindate is GREATER then maxdate.\n".
-              "Bonsai requires that mindate be an earlier time then maxdate.\n".
+              "Bonsai mindate is GREATER than maxdate.\n".
+              "Bonsai requires that mindate be an earlier time than maxdate.\n".
               "mindate: $args{'mindate'}: ".time2bonsai($args{'mindate'})."\n".
               "maxdate: $args{'maxdate'}: ".time2bonsai($args{'maxdate'})."\n".
               ""));
diff --git a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Perforce_P4DB.pm b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Perforce_P4DB.pm
index 7d0ec988a90..0671563530d 100644
--- a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Perforce_P4DB.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Perforce_P4DB.pm
@@ -4,9 +4,9 @@
 # have installed perforce with P4DB to let your webserver render html
 # pages of your VC repository.
 
-# $Revision: 1.6 $ 
-# $Date: 2004-06-15 01:16:54 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.7 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/VCDisplay/Perforce_P4DB.pm,v $ 
 # $Name: not supported by cvs2svn $ 
 
@@ -174,8 +174,8 @@ sub prepare_perforce_args {
     ($args{'mindate'} && $args{'maxdate'}) && 
     ($args{'mindate'} > $args{'maxdate'}) && 
         (die (
-              "Perforce mindate is GREATER then maxdate.\n".
-              "Perforce requires that mindate be an earlier time then maxdate.\n".
+              "Perforce mindate is GREATER than maxdate.\n".
+              "Perforce requires that mindate be an earlier time than maxdate.\n".
               "mindate: $args{'mindate'}: ".time2p4db($args{'mindate'})."\n".
               "maxdate: $args{'maxdate'}: ".time2p4db($args{'maxdate'})."\n".
               ""));
diff --git a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
index dea73bcd8f3..a0b65ada950 100644
--- a/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
@@ -9,8 +9,8 @@
 # query.  I would add these features into ViewCVS but I can not tell
 # if the project is abandoned or not.
 
-# $Revision: 1.2 $ 
-# $Date: 2005-12-01 07:17:12 $ 
+# $Revision: 1.3 $ 
+# $Date: 2006-07-27 16:31:07 $ 
 # $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -170,8 +170,8 @@ sub prepare_bonsai_args {
     ($args{'mindate'} && $args{'maxdate'}) && 
     ($args{'mindate'} > $args{'maxdate'}) && 
         (die (
-              "Bonsai mindate is GREATER then maxdate.\n".
-              "Bonsai requires that mindate be an earlier time then maxdate.\n".
+              "Bonsai mindate is GREATER than maxdate.\n".
+              "Bonsai requires that mindate be an earlier time than maxdate.\n".
               "mindate: $args{'mindate'}: ".time2bonsai($args{'mindate'})."\n".
               "maxdate: $args{'maxdate'}: ".time2bonsai($args{'maxdate'})."\n".
               ""));
diff --git a/mozilla/webtools/tinderbox2/src/test/genbuilds.tst b/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
index b2a9902a64f..680315bc924 100755
--- a/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
+++ b/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
@@ -8,9 +8,9 @@
 # URL.
 
 
-# $Revision: 1.17 $ 
-# $Date: 2003-08-17 00:57:35 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.18 $ 
+# $Date: 2006-07-27 16:31:07 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/test/genbuilds.tst,v $ 
 # $Name: not supported by cvs2svn $ 
 #
@@ -90,10 +90,10 @@ sub rand_runtime {
 
   if ( (rand 2) > 1 ) {
     # mostly at the grid size boarder
-    # but there will be plenty smaller then gridsize
+    # but there will be plenty smaller than gridsize
     $runtime = (rand 5) + (rand 5);
   } else {
-    # always bigger then grid size. 
+    # always bigger than grid size. 
     $runtime = (rand 15) + 15;
   }
   
@@ -120,10 +120,10 @@ sub rand_gap {
 
   if ( (rand 2) > 1 ) {
     # mostly at the grid size boarder
-    # but there will be plenty smaller then gridsize
+    # but there will be plenty smaller than gridsize
     $gap = (rand 5) + (rand 5);
   } else {
-    # always bigger then grid size. 
+    # always bigger than grid size. 
     $gap = (rand 15) + 15;
   }
   
@@ -203,7 +203,7 @@ sub gen_rnd_build {
   
   my ($runtime) = rand_runtime();
   
-  # If the run was less then six minutes increase the gap between
+  # If the run was less than six minutes increase the gap between
   # start times.
   
   my ($run_gap) = (6*60) - $runtime;