- Patch #155986 by Uwe: fixed typos.

10 files changed, 39 insertions, 39 deletions

diff --git a/includes/batch.inc b/includes/batch.inc
index 95f4f56a5..2fcd232fc 100644
--- a/includes/batch.inc
+++ b/includes/batch.inc
@@ -183,7 +183,7 @@ function _batch_process() {
     $total = $current_set['total'];
 
     // If the batch set is completed, browse through the remaining sets
-    // until we find one that acually has operations.
+    // until we find one that actually has operations.
     while (empty($current_set['operations']) && ($current_set['success'] = TRUE) && _batch_next_set()) {
       $current_set =& _batch_current_set();
     }
@@ -292,7 +292,7 @@ function _batch_finished() {
 }
 
 /**
- * Store tha batch data for next request, or clear the table if the batch is finished.
+ * Store the batch data for next request, or clear the table if the batch is finished.
  */
 function _batch_shutdown() {
   if ($batch = batch_get()) {
diff --git a/includes/common.inc b/includes/common.inc
index b20da7e74..c848059f1 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -935,7 +935,7 @@ function format_xml_elements($array) {
  * @param $singular
  *   The string for the singular case. Please make sure it is clear this is
  *   singular, to ease translation (e.g. use "1 new comment" instead of "1 new").
- *   Do not use @count in the singluar string.
+ *   Do not use @count in the singular string.
  * @param $plural
  *   The string for the plural case. Please make sure it is clear this is plural,
  *   to ease translation. Use @count in place of the item count, as in "@count
@@ -2266,7 +2266,7 @@ function _drupal_bootstrap_full() {
   fix_gpc_magic();
   // Load all enabled modules
   module_load_all();
-  // Let all modules take action before menu system handles the reqest
+  // Let all modules take action before menu system handles the request
   module_invoke_all('init');
 
 }
@@ -2494,7 +2494,7 @@ function drupal_render(&$elements) {
   }
 
   // Make any final changes to the element before it is rendered. This means
-  // that the $element or the chilren can be altered or corrected before the
+  // that the $element or the children can be altered or corrected before the
   // element is rendered into the final text.
   if (isset($elements['#pre_render'])) {
     foreach ($elements['#pre_render'] as $function) {
@@ -2555,7 +2555,7 @@ function drupal_render(&$elements) {
   }
 
   if (isset($content) && $content !== '') {
-    // Filter the outputed content and make any last changes before the
+    // Filter the outputted content and make any last changes before the
     // content is sent to the browser. The changes are made on $content
     // which allows the output'ed text to be filtered.
     if (isset($elements['#post_render'])) {
@@ -3047,14 +3047,14 @@ function drupal_redirect($goto) {
  */
 
 /**
- * Get the schema defintion of a table, or the whole database schema.
+ * Get the schema definition of a table, or the whole database schema.
  * The returned schema will include any modifications made by any
  * module that implements hook_schema_alter().
  *
  * @param $name
  *   The name of the table. If not given, the schema of all tables is returned.
  * @param $rebuild
- *   If true, the schema will be rebuilt instead of retreived from the cache.
+ *   If true, the schema will be rebuilt instead of retrieved from the cache.
  */
 function drupal_get_schema($name = NULL, $rebuild = FALSE) {
   static $schema = array();
diff --git a/includes/database.inc b/includes/database.inc
index b4bda22b4..2b09d9c8e 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -307,7 +307,7 @@ function db_escape_table($string) {
  * more tables and their related keys and indexes. A schema is defined by
  * hook_schema(), which usually lives in a modulename.schema file.
  *
- * By implenting hook_schema() and specifying the tables your module
+ * By implementing hook_schema() and specifying the tables your module
  * declares, you can easily create and drop these tables on all
  * supported database engines. You don't have to deal with the
  * different SQL dialects for table creation and alteration of the
@@ -357,7 +357,7 @@ function db_escape_table($string) {
  *     All parameters apart from 'type' are optional except that type
  *     'numeric' columns must specify 'precision' and 'scale'.
  *
- *  - 'primary key': An array of one or more key column specifers (see below)
+ *  - 'primary key': An array of one or more key column specifiers (see below)
  *    that form the primary key.
  *  - 'unique key': An associative array of unique keys ('keyname' =>
  *    specification).  Each specification is an array of one or more
diff --git a/includes/file.inc b/includes/file.inc
index 32f331b5a..f1206b513 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -21,7 +21,7 @@ define('FILE_EXISTS_REPLACE', 1);
 define('FILE_EXISTS_ERROR', 2);
 
 /**
- * A files status can be one of two values: temorary or permanent. The status
+ * A files status can be one of two values: temporary or permanent. The status
  * for each file Drupal manages is stored in the {files} tables. If the status
  * is temporary Drupal's file garbage collection will delete the file and
  * remove it from the files table after a set period of time.
@@ -262,7 +262,7 @@ function file_copy(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
 
     // Give everyone read access so that FTP'd users or
     // non-webserver users can see/read these files,
-    // and give group write permissions so group memebers
+    // and give group write permissions so group members
     // can alter files uploaded by the webserver.
     @chmod($dest, 0664);
   }
@@ -454,7 +454,7 @@ function file_space_used($uid = NULL) {
  * Saves a file upload to a new location. The source file is validated as a
  * proper upload and handled as such.
  *
- * The file will be added to the files table as a temporary file. Temorary files
+ * The file will be added to the files table as a temporary file. Temporary files
  * are periodically cleaned. To make the file permanent file call
  * file_set_status() to change it's status.
  *
diff --git a/includes/form.inc b/includes/form.inc
index f29d95e7d..b15e8ed15 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -268,7 +268,7 @@ function drupal_retrieve_form($form_id, &$form_state) {
  *   An associative array containing the structure of the form.
  * @param $form_state
  *   A keyed array containing the current state of the form. This
- *   includes the current persistant storage data for the form, and
+ *   includes the current persistent storage data for the form, and
  *   any data passed along by earlier steps when displaying a
  *   multi-step form. Additional information, like the sanitized $_POST
  *   data, is also accumulated here.
@@ -759,7 +759,7 @@ function form_builder($form_id, $form, &$form_state) {
   }
 
   // Now that we've processed everything, we can go back to handle the funky
-  // Internet Explorer button-click scenerio.
+  // Internet Explorer button-click scenario.
   _form_builder_ie_cleanup($form, $form_state);
 
   return $form;
@@ -902,7 +902,7 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state) {
 
 /**
  * Handle the special Internet Explorer one-button-form hit-enter-
- * instead-of-clicking scenerio.
+ * instead-of-clicking scenario.
  */
 function _form_builder_ie_cleanup($form, &$form_state) {
   if (!empty($form['#type']) && $form['#type'] == 'form') {
@@ -1761,7 +1761,7 @@ function form_clean_id($id = NULL) {
  *   // as well as 'return values' for the current operation (write)
  *   // The following keys are provided :
  *   // 'results' (read / write): The array of results gathered so far by
- *   //   the batch processing, for the curent operation to append its own.
+ *   //   the batch processing, for the current operation to append its own.
  *   // 'message' (write): A text message displayed in the progress page.
  *   // The following keys allow for multi-step operations :
  *   // 'sandbox' (read / write): An array that can be freely used to
@@ -1778,7 +1778,7 @@ function form_clean_id($id = NULL) {
  *   $context['message'] = $node->title;
  * }
  *
- * // More advanced example: mutli-step operation - load all nodes, five by five
+ * // More advanced example: multi-step operation - load all nodes, five by five
  * function my_function_2(&$context) {
  *   if (empty($context['sandbox'])) {
  *     $context['sandbox']['progress'] = 0;
@@ -1810,7 +1810,7 @@ function form_clean_id($id = NULL) {
  *     $message = t('Finished with an error.');
  *   }
  *   drupal_set_message($message);
- *   // Provinding data for the redirected page is done through $_SESSION.
+ *   // Providing data for the redirected page is done through $_SESSION.
  *   foreach ($results as $result) {
  *     $items[] = t('Loaded node %title.', array('%title' => $result));
  *   }
@@ -1848,7 +1848,7 @@ function form_clean_id($id = NULL) {
  *       and possibly save data in $_SESSION for display after final page redirection.
  *
  * Operations are added as new batch sets. Batch sets are used to ensure
- * clean code independency, ensuring that several batches submitted by
+ * clean code independence, ensuring that several batches submitted by
  * different parts of the code (core / contrib modules) can be processed
  * correctly while not interfering or having to cope with each other. Each
  * batch set gets to specify his own UI messages, operates on it's own set
@@ -1902,7 +1902,7 @@ function batch_set($batch_definition) {
 /**
  * Process the batch.
  *
- * Unless the batch has been markes with 'progressive' = FALSE, the function
+ * Unless the batch has been marked with 'progressive' = FALSE, the function
  * isses a drupal_goto and thus ends page execution.
  *
  * This function is not needed in form submit handlers; Form API takes care
@@ -1911,7 +1911,7 @@ function batch_set($batch_definition) {
  * @param $redirect
  *   (optional) Path to redirect to when the batch has finished processing.
  * @param $url
- *   (optional - should ony be used for separate scripts like update.php)
+ *   (optional - should only be used for separate scripts like update.php)
  *   URL of the batch processing page.
  */
 function batch_process($redirect = NULL, $url = NULL) {
@@ -1957,7 +1957,7 @@ function batch_process($redirect = NULL, $url = NULL) {
 }
 
 /**
- * Retrive the current batch.
+ * Retrieve the current batch.
  */
 function &batch_get() {
   static $batch = array();
diff --git a/includes/language.inc b/includes/language.inc
index 8dcebcc91..a9c84eb2c 100644
--- a/includes/language.inc
+++ b/includes/language.inc
@@ -58,7 +58,7 @@ function language_initialize() {
 }
 
 /**
- * Indetify language from the Accept-language HTTP header we got.
+ * Identify language from the Accept-language HTTP header we got.
  */
 function language_from_browser() {
   // Specified by the user via the browser's Accept Language setting
diff --git a/includes/locale.inc b/includes/locale.inc
index 5dd97f730..1fc920087 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -62,7 +62,7 @@ function locale_languages_overview_form() {
 }
 
 /**
- * Theme the langauge overview form.
+ * Theme the language overview form.
  */
 function theme_locale_languages_overview_form($form) {
   $default = language_default();
@@ -892,7 +892,7 @@ function locale_translate_delete($lid) {
  * @param $enabled
  *   Optionally TRUE to enable the language when created or FALSE to disable.
  * @param $default
- *   Optionall set this language to be the default.
+ *   Optionally set this language to be the default.
  */
 function locale_add_language($langcode, $name = NULL, $native = NULL, $direction = LANGUAGE_LTR, $domain = '', $prefix = '', $enabled = TRUE, $default = FALSE) {
   // Default prefix on language code.
@@ -1266,7 +1266,7 @@ function _locale_import_one_string_db(&$report, $langcode, $source, $translation
         $report[0]++;
       }
       else if ($mode == LOCALE_IMPORT_OVERWRITE) {
-        // Translation exists, only overvwrite if instructed.
+        // Translation exists, only overwrite if instructed.
         db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
         $report[1]++;
       }
@@ -2130,7 +2130,7 @@ function _locale_rebuild_js($langcode = NULL) {
         }
       }
       else {
-        watchdog('locale', 'An error occured during creation of the JavaScript translation file for the language %language.', array('%language' => t($language->name)));
+        watchdog('locale', 'An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => t($language->name)));
       }
     }
   }
diff --git a/includes/mail.inc b/includes/mail.inc
index dcbebd660..06714fe21 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -38,7 +38,7 @@
  *       drupal_mail('example', 'notify', $account->mail, user_preferred_language($account), $params);
  *     }
  *   }
- *   
+ *
  *   function example_mail($key, &$message, $params) {
  *     $language = $message['language'];
  *     $variables = user_mail_tokens($params['account'], $language);
@@ -80,11 +80,11 @@
  */
 function drupal_mail($module, $key, $to, $language, $params = array(), $from = NULL, $send = TRUE) {
   $default_from = variable_get('site_mail', ini_get('sendmail_from'));
-  
+
   // Bundle up the variables into a structured array for altering.
   $message = array(
     'id'       => $module .'_'. $key,
-    'to'       => $to, 
+    'to'       => $to,
     'from'     => isset($from) ? $from : $default_from,
     'language' => $language,
     'params'   => $params,
@@ -109,14 +109,14 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
     $headers['From'] = $headers['Reply-To'] = $from;
   }
   $message['headers'] = $headers;
-    
+
   // Build the e-mail (get subject and body, allow additional headers) by
   // invoking hook_mail() on this module. We cannot use module_invoke() as
   // we need to have $message by reference in hook_mail().
   if (function_exists($function = $module .'_mail')) {
     $function($key, $message, $params);
   }
-  
+
   // Invoke hook_mail_alter() to allow all modules to alter the resulting e-mail.
   drupal_alter('mail', $message);
 
diff --git a/includes/menu.inc b/includes/menu.inc
index 74ef71c7c..f96641273 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -67,7 +67,7 @@
  *
  * Everything described so far is stored in the menu_router table. The
  * menu_links table holds the visible menu links. By default these are
- * derived from the same hook_menu definitons, however you are free to
+ * derived from the same hook_menu definitions, however you are free to
  * add more with menu_link_save().
  */
 
@@ -522,7 +522,7 @@ function _menu_link_translate(&$item) {
     // TODO: menu_tree_data may set this ahead of time for links to nodes
     if (!isset($item['access'])) {
       if (!_menu_load_objects($item, $map)) {
-        // An error occured loading an object
+        // An error occurred loading an object
         $item['access'] = FALSE;
         return FALSE;
       }
@@ -651,7 +651,7 @@ function menu_tree_all_data($menu_name = 'navigation', $item = NULL, $show_hidde
 
 /**
  * Get the data structure representing a named menu tree, based on the current
- * page. The tree order is maintained by storing each parent in an invidual
+ * page. The tree order is maintained by storing each parent in an individual
  * field, see http://drupal.org/node/141866 for more.
  *
  * @param $menu_name
diff --git a/includes/theme.inc b/includes/theme.inc
index 7bc2d309d..e8c0a8832 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -797,7 +797,7 @@ function theme_placeholder($text) {
 /**
  * Generate a themed maintenance page.
  *
- * Note: this function is not themable.
+ * Note: this function is not themeable.
  *
  * @param $content
  *   The page content to show.
@@ -838,7 +838,7 @@ function theme_maintenance_page($content, $show_messages = TRUE) {
 /**
  * Generate a themed installation page.
  *
- * Note: this function is not themable.
+ * Note: this function is not themeable.
  *
  * @param $content
  *   The page content to show.
@@ -885,7 +885,7 @@ function theme_install_page($content) {
 /**
  * Return a themed list of maintenance tasks to perform.
  *
- * Note: this function is not themable.
+ * Note: this function is not themeable.
  */
 function theme_task_list($items, $active = NULL) {
   $done = isset($items[$active]) || $active == NULL;