- Patch #19739 by Uwe: corrected many typo's in the documentation and code comments

18 files changed, 28 insertions, 28 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 531a1ae43..ebf6f66f2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -10,7 +10,7 @@ Drupal x.x.x, xxxx-xx-xx
     * added search block.
 - syndication:
     * made the ping module ping pingomatic.com which, in turn, will ping all the major ping services.
-    * made Drupal generete RSS 2.0 feeds.
+    * made Drupal generate RSS 2.0 feeds.
     * made RSS feeds extensible.
     * added categories to RSS feeds.
     * added enclosures to RSS feeds.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 3ec573846..75972dc1f 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -23,7 +23,7 @@ define('WATCHDOG_ERROR', 2);
  * remaining will ignored.  If no configuration file is found,
  * return a default value '$confdir/default'.
  *
- * Example for a ficticious site installed at
+ * Example for a fictitious site installed at
  * http://www.drupal.org/mysite/test/ the 'settings.php' is
  * searched in the following directories:
  *
diff --git a/includes/file.inc b/includes/file.inc
index 18ce0f9d9..c074b632a 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -491,7 +491,7 @@ function file_download() {
  * @param $min_depth
  *   Minimum depth of directories to return files from.
  * @param $depth
- *   Current depth of recursion. This parameter is only used interally and should not be passed.
+ *   Current depth of recursion. This parameter is only used internally and should not be passed.
  *
  * @return
  *   An associative array (keyed on the provided key) of objects with
diff --git a/includes/locale.inc b/includes/locale.inc
index 77bae2b81..d45ffedf0 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -1006,7 +1006,7 @@ function _locale_string_seek_query() {
  * Perform a string search and display results in a table
  */
 function _locale_string_seek() {
-  // We have at least one criterium to match
+  // We have at least one criterion to match
   if ($query = _locale_string_seek_query()) {
     $join = "SELECT s.source, s.location, s.lid, t.translation, t.locale FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid ";
 
diff --git a/includes/theme.inc b/includes/theme.inc
index 789841152..7e86c9273 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -348,7 +348,7 @@ function theme_get_styles() {
  *
  * The theme system is described and defined in theme.inc.
  */
- 
+
 /**
  * Format a dynamic text string for emphasised display in a placeholder.
  *
@@ -876,7 +876,7 @@ function theme_blocks($region) {
  * his/her mind.
  *
  * You should use $_POST['edit'][$name] (where $name is usually 'confirm') to
- * check if the confirmation was succesful.
+ * check if the confirmation was successful.
  *
  * @param $question
  *   The question to ask the user (e.g. "Are you sure you want to delete the
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index b55ce425b..dce2ddcf2 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -911,7 +911,7 @@ class xmlrpcval {
     list($a,$b)=each($this->me);
     // contributed by I Sofer, 2001-03-24
     // add support for nested arrays to scalarval
-    // i've created a new method here, so as to
+    // I've created a new method here, so as to
     // preserve back compatibility
 
     if (is_array($b))    {
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 2374afd9c..d7bfbf3b3 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -413,7 +413,7 @@ function aggregator_refresh($feed) {
  * Parse the W3C date/time format, a subset of ISO 8601. PHP date parsing
  * functions do not handle this format.
  * See http://www.w3.org/TR/NOTE-datetime for more information.
- * Origionally from MagpieRSS (http://magpierss.sourceforge.net/).
+ * Originally from MagpieRSS (http://magpierss.sourceforge.net/).
  *
  * @param $date_str A string with a potentially W3C DTF date.
  * @return A timestamp if parsed successfully or -1 if not.
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 2374afd9c..d7bfbf3b3 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -413,7 +413,7 @@ function aggregator_refresh($feed) {
  * Parse the W3C date/time format, a subset of ISO 8601. PHP date parsing
  * functions do not handle this format.
  * See http://www.w3.org/TR/NOTE-datetime for more information.
- * Origionally from MagpieRSS (http://magpierss.sourceforge.net/).
+ * Originally from MagpieRSS (http://magpierss.sourceforge.net/).
  *
  * @param $date_str A string with a potentially W3C DTF date.
  * @return A timestamp if parsed successfully or -1 if not.
diff --git a/modules/forum.module b/modules/forum.module
index dae76244f..1d95115d3 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -56,7 +56,7 @@ function forum_perm() {
 }
 
 /**
- * Admiinstration page which allows maintaining forums
+ * Administration page which allows maintaining forums
  */
 function forum_admin() {
   $op = $_POST['op'];
@@ -219,7 +219,7 @@ function _forum_parent_select($tid, $title, $name) {
 }
 
 /**
- * Returns an overview list of existing forums and contianers
+ * Returns an overview list of existing forums and containers
  */
 function forum_overview() {
   $header = array(t('Name'), t('Operations'));
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index dae76244f..1d95115d3 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -56,7 +56,7 @@ function forum_perm() {
 }
 
 /**
- * Admiinstration page which allows maintaining forums
+ * Administration page which allows maintaining forums
  */
 function forum_admin() {
   $op = $_POST['op'];
@@ -219,7 +219,7 @@ function _forum_parent_select($tid, $title, $name) {
 }
 
 /**
- * Returns an overview list of existing forums and contianers
+ * Returns an overview list of existing forums and containers
  */
 function forum_overview() {
   $header = array(t('Name'), t('Operations'));
diff --git a/modules/menu.module b/modules/menu.module
index 28e207f92..26ac4e127 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -202,7 +202,7 @@ function menu_delete_item($mid) {
       }
       else {
         $message = t('Are you sure you want to delete the custom menu item %item?', array('%item' => theme('placeholder', $menu->title)));
-      }     
+      }
       $output = theme('confirm', $message, 'admin/menu', t('This action cannot be undone.'), t('Delete'));
       print theme('page', $output);
   }
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 28e207f92..26ac4e127 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -202,7 +202,7 @@ function menu_delete_item($mid) {
       }
       else {
         $message = t('Are you sure you want to delete the custom menu item %item?', array('%item' => theme('placeholder', $menu->title)));
-      }     
+      }
       $output = theme('confirm', $message, 'admin/menu', t('This action cannot be undone.'), t('Delete'));
       print theme('page', $output);
   }
diff --git a/modules/node.module b/modules/node.module
index adf40d94c..c69c1bc53 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1204,7 +1204,7 @@ function node_validate($node) {
     }
   }
 
-  // Make sure the body has the minimim number of words.
+  // Make sure the body has the minimum number of words.
   // todo use a better word counting algorithm that will work in other languages
   if (isset($node->body) && count(explode(' ', $node->body)) < variable_get('minimum_'. $node->type .'_size', 0)) {
     form_set_error('body', t('The body of your %type is too short. You need at least %words words.', array('%words' => variable_get('minimum_'. $node->type .'_size', 0), '%type' => node_invoke($node->type, 'node_name'))));
diff --git a/modules/node/node.module b/modules/node/node.module
index adf40d94c..c69c1bc53 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1204,7 +1204,7 @@ function node_validate($node) {
     }
   }
 
-  // Make sure the body has the minimim number of words.
+  // Make sure the body has the minimum number of words.
   // todo use a better word counting algorithm that will work in other languages
   if (isset($node->body) && count(explode(' ', $node->body)) < variable_get('minimum_'. $node->type .'_size', 0)) {
     form_set_error('body', t('The body of your %type is too short. You need at least %words words.', array('%words' => variable_get('minimum_'. $node->type .'_size', 0), '%type' => node_invoke($node->type, 'node_name'))));
diff --git a/modules/search.module b/modules/search.module
index 8fa3f1e5d..2b461726a 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -285,7 +285,7 @@ function _search_keywords_truncate(&$text) {
 
 /**
  * Loosens up a set of search keywords by adding wildcards, if possible.
- * 
+ *
  * @param $text
  *   The keywords as entered by the user.
  * @return
@@ -563,7 +563,7 @@ function search_view() {
   }
   else if ($type == '') {
     // Note: search/node can not be a default tab because it would take on the
-    // path of its parent (search). It would prevent remembing keywords when
+    // path of its parent (search). It would prevent remembering keywords when
     // switching tabs. This is why we drupal_goto to it from the parent instead.
     drupal_goto('search/node');
   }
@@ -719,7 +719,7 @@ function search_excerpt($keys, $text) {
   // Extract a fragment per keyword for at most 4 keywords.
   // First we collect ranges of text around each keyword, starting/ending
   // at spaces.
-  // If the sum of all fragments is too short, we look for second occurences.
+  // If the sum of all fragments is too short, we look for second occurrences.
   $ranges = array();
   $included = array();
   $length = 0;
@@ -732,7 +732,7 @@ function search_excerpt($keys, $text) {
       if ($length >= 256) {
         break;
       }
-      // Remember occurence of key so we can skip over it if more occurences
+      // Remember occurrence of key so we can skip over it if more occurrences
       // are desired.
       if (!isset($included[$key])) {
         $included[$key] = 0;
diff --git a/modules/search/search.module b/modules/search/search.module
index 8fa3f1e5d..2b461726a 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -285,7 +285,7 @@ function _search_keywords_truncate(&$text) {
 
 /**
  * Loosens up a set of search keywords by adding wildcards, if possible.
- * 
+ *
  * @param $text
  *   The keywords as entered by the user.
  * @return
@@ -563,7 +563,7 @@ function search_view() {
   }
   else if ($type == '') {
     // Note: search/node can not be a default tab because it would take on the
-    // path of its parent (search). It would prevent remembing keywords when
+    // path of its parent (search). It would prevent remembering keywords when
     // switching tabs. This is why we drupal_goto to it from the parent instead.
     drupal_goto('search/node');
   }
@@ -719,7 +719,7 @@ function search_excerpt($keys, $text) {
   // Extract a fragment per keyword for at most 4 keywords.
   // First we collect ranges of text around each keyword, starting/ending
   // at spaces.
-  // If the sum of all fragments is too short, we look for second occurences.
+  // If the sum of all fragments is too short, we look for second occurrences.
   $ranges = array();
   $included = array();
   $length = 0;
@@ -732,7 +732,7 @@ function search_excerpt($keys, $text) {
       if ($length >= 256) {
         break;
       }
-      // Remember occurence of key so we can skip over it if more occurences
+      // Remember occurrence of key so we can skip over it if more occurrences
       // are desired.
       if (!isset($included[$key])) {
         $included[$key] = 0;
diff --git a/scripts/code-style.pl b/scripts/code-style.pl
index a5d0103cf..2ae2e1a13 100644
--- a/scripts/code-style.pl
+++ b/scripts/code-style.pl
@@ -51,14 +51,14 @@ while (<>) {
     $program = 0;
   }
 
-  # enfoce "bar". foo() ."bar" syntax
+  # enforce "bar". foo() ."bar" syntax
   if (/^("[^"]*"|[^"])*("[^"]*")\.[^ ]/ && $program) {
     $msg = "'\".' -> '\". '";
   }
   elsif (/^("[^"]*"|[^"])*("[^"]*")\s+\./ && $program) {
     $msg = "'\" .' -> '\".'";
   }
-  # enfoce "bar". foo() ."bar" syntax
+  # enforce "bar". foo() ."bar" syntax
   elsif (/^("[^"]*"|[^"])*[^ "]\.("[^"]*")/ && $program) {
     $msg = "'.\"' -> '.\"'";
   }
diff --git a/sites/default/settings.php b/sites/default/settings.php
index cec1fe3f4..a89f11303 100644
--- a/sites/default/settings.php
+++ b/sites/default/settings.php
@@ -13,7 +13,7 @@
  * others will be ignored. If no other configuration file is found
  * then the default configuration file at 'sites/default' will be used.
  *
- * For example, for a ficticious site installed at
+ * For example, for a fictitious site installed at
  * http://www.drupal.org/mysite/test/, the 'settings.php'
  * is searched in the following directories:
  *