diff --git a/build/buildbot/config/buildbot.css b/build/buildbot/config/buildbot.css
index 84e89ba511..d87cba456e 100644
--- a/build/buildbot/config/buildbot.css
+++ b/build/buildbot/config/buildbot.css
@@ -14,16 +14,16 @@ td {
 }
 
 /* Activity states */
-.offline { 
+.offline {
         background-color: red;
 }
 .idle {
 	background-color: white;
 }
-.waiting { 
+.waiting {
         background-color: yellow;
 }
-.building { 
+.building {
         background-color: yellow;
 }
 
diff --git a/build/buildbot/config/include/push.xml b/build/buildbot/config/include/push.xml
index 4d7041135b..86fc8b58e5 100644
--- a/build/buildbot/config/include/push.xml
+++ b/build/buildbot/config/include/push.xml
@@ -15,7 +15,7 @@
 <xi:include href="defs.xml"/>
 
 <!--
-    Usage: <show log="filename" [ name="title" ]/> 
+    Usage: <show log="filename" [ name="title" ]/>
 
     A build step displayed as 'title' in the waterfall display, the output
     comes from 'filename.log' in the uploaded log tarball, and the exit code
diff --git a/build/buildbot/config/include/testdrive.xml b/build/buildbot/config/include/testdrive.xml
index 9bcbfc15ea..eb51369880 100644
--- a/build/buildbot/config/include/testdrive.xml
+++ b/build/buildbot/config/include/testdrive.xml
@@ -68,7 +68,7 @@
 
     Usage:
         <fetch branch="Daily_HEAD/wxX11.tar.gz"/>
-    
+
     Fetches the URL given by <baseURL>/$branch, where the current default
     for <baseURL> is "http://biolpc22.york.ac.uk/pub".
 
diff --git a/build/buildbot/config/push.xml b/build/buildbot/config/push.xml
index 266c4de068..3a0e20760a 100644
--- a/build/buildbot/config/push.xml
+++ b/build/buildbot/config/push.xml
@@ -18,10 +18,9 @@
 
 <xi:include href="include/push.xml"/>
 
-<!-- e.g.:
 <build>
-    <name>wxOS2 Stable gcc</name>
-    <builddir>psh_os2_stable</builddir>
+    <name>wxOS2 Stable GCC</name>
+    <builddir>psh_os2_stable_gcc</builddir>
 
     <steps>
         <extractlogs/>
@@ -33,67 +32,51 @@
         <show log="samples"/>
     </steps>
 </build>
--->
 
-<build>                                      
-    <name>wxOS2 Stable GCC</name>            
-    <builddir>psh_os2_stable_gcc</builddir>  
-                                             
-    <steps>                                  
-        <extractlogs/>                       
-        <show log="compiler"/>               
-        <show log="update"/>                 
-        <show log="configure"/>              
-        <show log="compile"/>                
-        <show log="demos"/>                  
-        <show log="samples"/>                
-    </steps>                                 
-</build>                                     
-                                             
-<build>                                      
-    <name>wxOS2 Stable OpenWatcom</name>     
-    <builddir>psh_os2_stable_ow</builddir>   
-                                             
-    <steps>                                  
-        <extractlogs/>                       
-        <show log="compiler"/>               
-        <show log="update"/>                 
-        <show log="configure"/>              
-        <show log="compile"/>                
-        <show log="demos"/>                  
-        <show log="samples"/>                
-    </steps>                                 
-</build>                                     
-                                             
-<build>                                      
-    <name>wxOS2 Trunk GCC</name>             
-    <builddir>psh_os2_trunk_gcc</builddir>   
-                                             
-    <steps>                                  
-        <extractlogs/>                       
-        <show log="compiler"/>               
-        <show log="update"/>                 
-        <show log="configure"/>              
-        <show log="compile"/>                
-        <show log="demos"/>                  
-        <show log="samples"/>                
-    </steps>                                 
-</build>                                     
-                                             
-<build>                                      
-    <name>wxOS2 Trunk OpenWatcom</name>      
-    <builddir>psh_os2_trunk_ow</builddir>    
-                                             
-    <steps>                                  
-        <extractlogs/>                       
-        <show log="compiler"/>               
-        <show log="update"/>                 
-        <show log="configure"/>              
-        <show log="compile"/>                
-        <show log="demos"/>                  
-        <show log="samples"/>                
-    </steps>                                 
-</build>                                     
+<build>
+    <name>wxOS2 Stable OpenWatcom</name>
+    <builddir>psh_os2_stable_ow</builddir>
+
+    <steps>
+        <extractlogs/>
+        <show log="compiler"/>
+        <show log="update"/>
+        <show log="configure"/>
+        <show log="compile"/>
+        <show log="demos"/>
+        <show log="samples"/>
+    </steps>
+</build>
+
+<build>
+    <name>wxOS2 Trunk GCC</name>
+    <builddir>psh_os2_trunk_gcc</builddir>
+
+    <steps>
+        <extractlogs/>
+        <show log="compiler"/>
+        <show log="update"/>
+        <show log="configure"/>
+        <show log="compile"/>
+        <show log="demos"/>
+        <show log="samples"/>
+    </steps>
+</build>
+
+<build>
+    <name>wxOS2 Trunk OpenWatcom</name>
+    <builddir>psh_os2_trunk_ow</builddir>
+
+    <steps>
+        <extractlogs/>
+        <show log="compiler"/>
+        <show log="update"/>
+        <show log="configure"/>
+        <show log="compile"/>
+        <show log="demos"/>
+        <show log="samples"/>
+    </steps>
+</build>
 
 <build>
     <name>Solaris-HEAD-GTK1</name>
diff --git a/build/buildbot/tools/check.sh b/build/buildbot/tools/check.sh
index 8fb70e4ddd..4dd91096b1 100755
--- a/build/buildbot/tools/check.sh
+++ b/build/buildbot/tools/check.sh
@@ -145,7 +145,7 @@ preprocess()
         return 1
     fi
 }
-        
+
 validate()
 {
     NAME="$1"
@@ -174,7 +174,7 @@ while [ $# -gt 0 ]; do
         errout "$NAME" >&2
         ERR=1
     }
-            
+
     rm -f "$XSLT" "$PREP" "$STDERR"
 
     shift