- Patch #155986 by Uwe: fixed typos.

2 files changed, 10 insertions, 10 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index d78e12bec..02ec53c80 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -976,7 +976,7 @@ function system_update_145() {
       break;
   }
 
-  // Intialize block data for default theme
+  // Initialize block data for default theme
   $ret[] = update_sql("UPDATE {blocks} SET region = 'left' WHERE region = '0'");
   $ret[] = update_sql("UPDATE {blocks} SET region = 'right' WHERE region = '1'");
   db_query("UPDATE {blocks} SET theme = '%s'", $default_theme);
@@ -3121,7 +3121,7 @@ function system_update_6017() {
         $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)");
         $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)");
         if ($old_name == 'user_mail_approval_body') {
-          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login infomation when their accounts are approved.  See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
+          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved.  See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
         }
       }
     }
@@ -3160,7 +3160,7 @@ function system_update_6018() {
  *
  * Note that the mysql and pgsql cases make different changes.  This
  * is because each schema needs to be tweaked in different ways to
- * comform to the new schema structure.  Also, since they operate on
+ * conform to the new schema structure.  Also, since they operate on
  * tables defined by many optional core modules which may not ever
  * have been installed, they must test each table for existence.  If
  * the modules are first installed after this update exists the tables
@@ -3392,7 +3392,7 @@ function system_update_6022() {
 
   // Rename the file_revisions table to upload then add nid column. Since we're
   // changing the table name we need to drop and re-add the vid index so both
-  // pgsql ends up with the corect index name.
+  // pgsql ends up with the correct index name.
   db_drop_index($ret, 'file_revisions', 'vid');
   db_rename_table($ret, 'file_revisions', 'upload');
   db_add_field($ret, 'upload', 'nid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
diff --git a/modules/system/system.module b/modules/system/system.module
index b58c79fb0..8d01bd14b 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1114,7 +1114,7 @@ function system_theme_data() {
       }
     }
     $themes[$key]->info['stylesheets'] = $pathed_stylesheets;
-    
+
     // Give the scripts proper path information.
     $scripts = array();
     foreach ($themes[$key]->info['scripts'] as $script) {
@@ -1147,7 +1147,7 @@ function system_theme_data() {
       }
     }
     // Add any stylesheets from the base theme, unless the names match in which case
-    // the sub-theme wins. Note that we slip the base theme's stylesheets in at the 
+    // the sub-theme wins. Note that we slip the base theme's stylesheets in at the
     // beginning of the array so that they get added to the page in the correct order.
     foreach ($themes[$base_key]->info['stylesheets'] as $media => $stylesheets) {
       foreach ($stylesheets as $stylesheet => $path) {
@@ -1161,7 +1161,7 @@ function system_theme_data() {
       }
     }
     // Add any scripts from the base theme, unless the names match in which case
-    // the sub-theme wins. Note that we slip the base theme's scripts in at the 
+    // the sub-theme wins. Note that we slip the base theme's scripts in at the
     // beginning of the array so that they get added to the page in the correct order.
     foreach ($themes[$base_key]->info['scripts'] as $script => $path) {
       if (!isset($themes[$key]->info['scripts'][$script])) {
@@ -2308,7 +2308,7 @@ function system_theme_settings(&$form_state, $key = '') {
     $filename = ($key) ? str_replace('/', '_', $key) .'_logo.'. $parts['extension'] : 'logo.'. $parts['extension'];
 
     // The image was saved using file_save_upload() and was added to the
-    // files table as a temorary file. We'll make a copy and let the garbage
+    // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.
     if (file_copy($file, $filename, FILE_EXISTS_REPLACE)) {
       $_POST['default_logo'] = 0;
@@ -2323,7 +2323,7 @@ function system_theme_settings(&$form_state, $key = '') {
     $filename = ($key) ? str_replace('/', '_', $key) .'_favicon.'. $parts['extension'] : 'favicon.'. $parts['extension'];
 
     // The image was saved using file_save_upload() and was added to the
-    // files table as a temorary file. We'll make a copy and let the garbage
+    // files table as a temporary file. We'll make a copy and let the garbage
     // collector delete the original upload.
     if (file_copy($file, $filename)) {
       $_POST['default_favicon'] = 0;
@@ -2784,7 +2784,7 @@ function system_cron() {
   while ($file = db_fetch_object($result)) {
     if (file_exists($file->filepath)) {
       // If files that exist cannot be deleted, continue so the database remains
-      // consistant.
+      // consistent.
       if (!file_delete($file->filepath)) {
         watchdog('file system', t('Could not delete temporary file "%path" during garbage collection', array('%path' => $file->filepath)), 'error');
         continue;