diff --git a/includes/ajax.inc b/includes/ajax.inc
index 8a55adb58c6..1568e582f5c 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -168,7 +168,7 @@
  *   $commands[] = ajax_command_changed('#object-1');
  *   // Menu 'page callback' and #ajax['callback'] functions are supposed to
  *   // return render arrays. If returning an AJAX commands array, it must be
- *   // encapsulated in a render array structure. 
+ *   // encapsulated in a render array structure.
  *   return array('#type' => 'ajax', '#commands' => $commands);
  * @endcode
  *
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index f1d103329d2..f05172bbe37 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1464,7 +1464,7 @@ function check_plain($text) {
   // drupal_validate_utf8() here. This avoids the overhead of an additional
   // function call, since check_plain() may be called hundreds of times during
   // a request. For PHP 5.2.5+, this check for valid UTF-8 should be handled
-  // internally by PHP in htmlspecialchars(). 
+  // internally by PHP in htmlspecialchars().
   // See http://www.php.net/releases/5_2_5.php.
   // @todo remove this when support for either IE6 or PHP < 5.2.5 is dropped.
 
diff --git a/includes/common.inc b/includes/common.inc
index c09aa3a98d4..a065b1c1c04 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -4848,7 +4848,7 @@ function drupal_render_page($page) {
  * using uasort(). Since this is expensive, when passing already sorted
  * elements to drupal_render(), for example from a database query, set
  * $elements['#sorted'] = TRUE to avoid sorting them a second time.
- * 
+ *
  * drupal_render() flags each element with a '#printed' status to indicate that
  * the element has been rendered, which allows individual elements of a given
  * array to be rendered independently and prevents them from being rendered
diff --git a/includes/database/prefetch.inc b/includes/database/prefetch.inc
index 9d02dcfc2ed..9edb0309d29 100644
--- a/includes/database/prefetch.inc
+++ b/includes/database/prefetch.inc
@@ -175,7 +175,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
     // as soon as possible.
     $this->rowCount = $statement->rowCount();
     $this->data = $statement->fetchAll(PDO::FETCH_ASSOC);
-    // Destroy the statement as soon as possible. See 
+    // Destroy the statement as soon as possible. See
     // DatabaseConnection_sqlite::PDOPrepare() for explanation.
     unset($statement);
 
diff --git a/includes/database/schema.inc b/includes/database/schema.inc
index 5302a6d228b..91503002f40 100644
--- a/includes/database/schema.inc
+++ b/includes/database/schema.inc
@@ -604,9 +604,9 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface {
     if ($this->tableExists($name)) {
       throw new DatabaseSchemaObjectExistsException(t('Table %name already exists.', array('%name' => $name)));
     }
-  	$statements = $this->createTableSql($name, $table);
+    $statements = $this->createTableSql($name, $table);
     foreach ($statements as $statement) {
-    	$this->connection->query($statement);
+      $this->connection->query($statement);
     }
   }
 
diff --git a/includes/database/sqlite/schema.inc b/includes/database/sqlite/schema.inc
index f8f18eb7428..ade02198791 100644
--- a/includes/database/sqlite/schema.inc
+++ b/includes/database/sqlite/schema.inc
@@ -14,7 +14,7 @@
 
 class DatabaseSchema_sqlite extends DatabaseSchema {
 
-	/**
+  /**
    * Override DatabaseSchema::$defaultSchema
    */
   protected $defaultSchema = 'main';
diff --git a/includes/locale.inc b/includes/locale.inc
index a4ca4169166..fab8356bff2 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -683,7 +683,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL
         $languages = language_list();
         if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
           // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing 
+          // plural formula, only run this if we don't need to keep existing
           // data untouched or if we don't have an existing plural formula.
           $header = _locale_import_parse_header($value['msgstr']);
 
diff --git a/includes/update.inc b/includes/update.inc
index bfc026ec9a5..424054584b4 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -223,11 +223,11 @@ function update_fix_d7_block_deltas(&$sandbox, $renamed_deltas) {
           ))
           ->fetchField();
           if ($block_exists) {
-          	db_update($table)
-          	  ->fields(array('delta' => $new_delta))
-          	  ->condition('module', $module)
-          	  ->condition('delta', $old_delta)
-          	  ->execute();
+            db_update($table)
+              ->fields(array('delta' => $new_delta))
+              ->condition('module', $module)
+              ->condition('delta', $old_delta)
+              ->execute();
           }
         }
       }
diff --git a/misc/vertical-tabs.js b/misc/vertical-tabs.js
index 3aab4f01967..fb4b91a6f5e 100644
--- a/misc/vertical-tabs.js
+++ b/misc/vertical-tabs.js
@@ -129,7 +129,7 @@ Drupal.verticalTab.prototype = {
    * Updates the tab's summary.
    */
   updateSummary: function () {
-	  this.summary.html(this.fieldset.drupalGetSummary());
+    this.summary.html(this.fieldset.drupalGetSummary());
   },
 
   /**
diff --git a/modules/color/preview.js b/modules/color/preview.js
index 814a2d20d9c..719b9b8597b 100644
--- a/modules/color/preview.js
+++ b/modules/color/preview.js
@@ -2,14 +2,14 @@
 
 (function ($) {
   Drupal.color = {
-    callback: function(context, settings, form, farb, height, width) {  
+    callback: function(context, settings, form, farb, height, width) {
       // Solid background.
       $('#preview', form).css('backgroundColor', $('#palette input[name="palette[base]"]', form).val());
-      
+
       // Text preview
       $('#text', form).css('color', $('#palette input[name="palette[text]"]', form).val());
       $('#text a, #text h2', form).css('color', $('#palette input[name="palette[link]"]', form).val());
-      
+
       // Set up gradients if there are some.
       var color_start, color_end;
       for (i in settings.gradients) {
@@ -32,4 +32,4 @@
       }
     }
   };
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/modules/forum/forum-topic-list.tpl.php b/modules/forum/forum-topic-list.tpl.php
index e290b4f391d..c223686a969 100644
--- a/modules/forum/forum-topic-list.tpl.php
+++ b/modules/forum/forum-topic-list.tpl.php
@@ -7,7 +7,7 @@
  *
  * Available variables:
  * - $header: The table header. This is pre-generated with click-sorting
- *   information. If you need to change this, see 
+ *   information. If you need to change this, see
  *   template_preprocess_forum_topic_list().
  * - $pager: The pager to display beneath the table.
  * - $topics: An array of topics to be displayed.
diff --git a/modules/simpletest/files/README.txt b/modules/simpletest/files/README.txt
index d808510dad7..1ada14e2955 100644
--- a/modules/simpletest/files/README.txt
+++ b/modules/simpletest/files/README.txt
@@ -2,4 +2,4 @@ $Id$
 
 These files are use in some tests that upload files or other operations were
 a file is useful. These files are copied to the files directory as specified
-in the site settings. Other tests files are generated in order to save space.
\ No newline at end of file
+in the site settings. Other tests files are generated in order to save space.
diff --git a/modules/simpletest/files/javascript-1.txt b/modules/simpletest/files/javascript-1.txt
index e0206ba8319..efd44fd9360 100644
--- a/modules/simpletest/files/javascript-1.txt
+++ b/modules/simpletest/files/javascript-1.txt
@@ -1,3 +1,3 @@
 <script>
 alert('SimpleTest PHP was executed!');
-</script>
\ No newline at end of file
+</script>
diff --git a/modules/simpletest/files/php-1.txt b/modules/simpletest/files/php-1.txt
index dc8e64213f0..52788b6feac 100644
--- a/modules/simpletest/files/php-1.txt
+++ b/modules/simpletest/files/php-1.txt
@@ -1,3 +1,3 @@
 <?php
 print 'SimpleTest PHP was executed!';
-?>
\ No newline at end of file
+?>