diff --git a/webtools/tinderbox2/src/default_conf/BuildStatus.pm b/webtools/tinderbox2/src/default_conf/BuildStatus.pm
index 25950c586dbe..cf7fa5631672 100644
--- a/webtools/tinderbox2/src/default_conf/BuildStatus.pm
+++ b/webtools/tinderbox2/src/default_conf/BuildStatus.pm
@@ -1,9 +1,9 @@
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 
 
-# $Revision: 1.19 $ 
-# $Date: 2002/05/02 23:43:24 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.20 $ 
+# $Date: 2002/05/03 02:05:12 $ 
+# $Author: mcafee%netscape.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/BuildStatus.pm,v $ 
 # $Name:  $ 
 
@@ -59,17 +59,17 @@ package BuildStatus;
 # case we need to add more types later.
 
 # possible new types include: unit-test-failed,
-# perforance-test-failed, coverage-failed, lint-failed
+# performance-test-failed, coverage-failed, lint-failed
 
-# The Tinderbox code only hardcodes the values of: 'not_running',
+# The Tinderbox code only hard-codes the values of: 'not_running',
 # 'building' to determine if the build in question has completed and
-# 'success' to dertermine if the build finished all that it was
+# 'success' to determine if the build finished all that it was
 # intended to do.  The various gradations of failure are not tracked
-# inside tinerbox but are useful for project managment.
+# inside tinderbox but are useful for project management.
 
 
 # If new types are added, try and keep to a small set of colors or the
-# display will get confusing.  You may find it convienent to keep a
+# display will get confusing.  You may find it convenient to keep a
 # distinction between different kinds of warnings or different kinds
 # of tests but we suggest keeping all warnings and all tests get the
 # same color.
@@ -82,7 +82,7 @@ package BuildStatus;
 # build fails.  There could be a new web page where developers could
 # request notification (email, page) when the next build is done.
 # This would allow developers to not watch the tinderbox webpage so
-# intently but be informed when an interesting change has occured.
+# intently but be informed when an interesting change has occurred.
 
 # Please send us interesting uses for the handler.  We would like to
 # make examples available.
@@ -134,7 +134,7 @@ package BuildStatus;
                             'html_color' => '#ffaa00',
                             'hdml_char'=> '~',
                             'handler' => \&main::null,
-                            'description' => 'Build succeded but tests failed',
+                            'description' => 'Build succeeded but tests failed',
                             'order' => 3,
                            },
 
@@ -214,7 +214,7 @@ sub is_status_final {
     return 1;
 }
 
-# rerturn true if and only if the status is valid (known the the
+# return true if and only if the status is valid (known the the
 # library).
 
 sub is_status_valid {
diff --git a/webtools/tinderbox2/src/default_conf/TinderConfig.pm b/webtools/tinderbox2/src/default_conf/TinderConfig.pm
index c45d465ebb81..106f6872292c 100644
--- a/webtools/tinderbox2/src/default_conf/TinderConfig.pm
+++ b/webtools/tinderbox2/src/default_conf/TinderConfig.pm
@@ -5,9 +5,9 @@
 # customizable settings.
 
 
-# $Revision: 1.34 $ 
-# $Date: 2002/05/03 00:10:18 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.35 $ 
+# $Date: 2002/05/03 02:05:11 $ 
+# $Author: mcafee%netscape.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/default_conf/TinderConfig.pm,v $ 
 # $Name:  $ 
 
@@ -63,7 +63,7 @@ package TinderConfig;
 
 # 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 then 25 is recommended.).
+# then 100 is ideal but bigger than 25 is recommended.).
 
 $TINDERBOX_UID=3310;
 $TINDERBOX_GID=3310;
@@ -103,7 +103,7 @@ $TINDERBOX_DATA_DIR = "/export2/tbox2-data";
 $TINDERBOX_CGIBIN_DIR = "/opt/tbox/public_html/cgi-bin/";
 
 # The top level tinderbox index file. Change this if you wish to
-# provide your own index file for tinderboxs web pages.
+# provide your own index file for tinderboxes web pages.
 
 $GLOBAL_INDEX_FILE = "index.html";
 
@@ -165,8 +165,8 @@ $EMPTY_TABLE_CELL = "";
 	   'TinderDB::Time',
 	  );
 
-# What border should the status legends use?  new browers allow us to
-# frame the parts of the legend without putting a border arround the
+# What border should the status legends use?  new browsers allow us to
+# frame the parts of the legend without putting a border around the
 # individual cells.
 
 #$DB_LEGEND_BORDER = "border rules=none";
@@ -179,7 +179,7 @@ $DB_LEGEND_BORDER = "";
 
 $UNIFORM_ROW_SPACING = 0;
 
-# Spacing on html page (in minutes), this resticts the
+# Spacing on html page (in minutes), this restricts the
 # minimum time between builds (to this value plus 5 minutes).
 # I suggest 5 minutes.
 
@@ -276,12 +276,12 @@ $VC_NAME = "Guilty";
 
 $VC_BUGNUM_REGEXP = '(\d\d\d+)';
 
-# Pick one method for storting data, Data::Dumper is slow but text
+# Pick one method for storing data, Data::Dumper is slow but text
 # files allows great debugging capabilities and Storable, available
 # from CPAN, which is a much faster binary format.
 
 # If you are worried about security you should use Storable because
-# Dumper uses and Eval to load the new code it is concievable that the
+# Dumper uses and Eval to load the new code it is conceivable that the
 # code could be forced to perform unwanted actions.
 
 $PersistenceImpl = (