diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 0be9f92faf4acef3bc04ff327d04df8a0ecd0b4c..0d2fc1f9e17a3d6bfab0fcaa0d59aeeca091eb92 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -284,7 +284,7 @@ function cache_get($key) {
       $cache->data = db_decode_blob($cache->data);
     }
     // If enforcing a minimum cache lifetime, validate that the data is
-    // currenly valid for this user before we return it by making sure the
+    // currently valid for this user before we return it by making sure the
     // cache entry was created before the timestamp in the current session's
     // cache timer.  The cache variable is loaded into the $user object by
     // sess_read() in session.inc.
@@ -735,7 +735,7 @@ function _drupal_bootstrap($phase) {
 /**
  * Enables use of the theme system without requiring database access. Since
  * there is not database access no theme will be enabled and the default
- * themable fuctions will be called. Some themable functions can not be used
+ * themeable functions will be called. Some themeable functions can not be used
  * without the full Drupal API loaded. For example, theme_page() is
  * unavailable and theme_maintenance_page() must be used in its place.
  */
diff --git a/includes/common.inc b/includes/common.inc
index 5ffaa444477a9841b30c3d59984d2dddbc82c3e4..f02911b44024d8cfaa1a74a7a31fe288a29eeaba 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -266,7 +266,7 @@ function drupal_not_found() {
     $return = menu_execute_active_handler();
   }
   else {
-    // Redirect to a non-existant menu item to make possible tabs disappear.
+    // Redirect to a non-existent menu item to make possible tabs disappear.
     menu_set_active_item('');
   }
 
@@ -294,7 +294,7 @@ function drupal_access_denied() {
     $return = menu_execute_active_handler();
   }
   else {
-    // Redirect to a non-existant menu item to make possible tabs disappear.
+    // Redirect to a non-existent menu item to make possible tabs disappear.
     menu_set_active_item('');
   }
 
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index cf3d05dfb51fca99effc82a0db2ee7714e71622f..007d825a06949e37ff79211a84fa3264f9236387 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -336,7 +336,7 @@ function db_lock_table($table) {
 
 /**
  * Unlock all locked tables.
- * This function automatically commits a transation.
+ * This function automatically commits a transaction.
  */
 function db_unlock_tables() {
   db_query('COMMIT');
diff --git a/includes/file.inc b/includes/file.inc
index 35eb8fb2c365db16bbc9a40e7801644f95de14a1..6ce6ac50314b741adb6bdc38816bb259fa5ff194 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -79,7 +79,7 @@ function file_create_path($dest = 0) {
  *   if it does not exist or made writable if it is read-only.
  * @param $form_item An optional string containing the name of a form item that
  *   any errors will be attached to. This is useful for settings forms that
- *   require the user to specify a writeable directory. If it can't be made to
+ *   require the user to specify a writable directory. If it can't be made to
  *   work, a form error will be set preventing them from saving the settings.
  * @return False when directory not found, or true when directory exists.
  */
@@ -120,7 +120,7 @@ function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
  *
  * @param $path A string containing a file path. This will be set to the
  *   directory's path.
- * @return If the directory is not in a Drupal writeable directory, FALSE is
+ * @return If the directory is not in a Drupal writable directory, FALSE is
  *   returned. Otherwise, the base name of the path is returned.
  */
 function file_check_path(&$path) {
@@ -481,7 +481,7 @@ function file_save_upload($source, $dest = false, $replace = FILE_EXISTS_RENAME)
   if ($file = file_check_upload($source)) {
 
     // This should be refactored, file_check_upload has already
-    // moved the file to the temprary folder.
+    // moved the file to the temporary folder.
     if (!$dest) {
       $dest = file_directory_temp();
       $temporary = 1;
@@ -578,7 +578,7 @@ function file_download() {
   $args = func_get_args();
   $filepath = implode('/', $args);
 
-  // Maintain compatability with old ?file=paths saved in node bodies.
+  // Maintain compatibility with old ?file=paths saved in node bodies.
   if (isset($_GET['file'])) {
     $filepath =  $_GET['file'];
   }
diff --git a/includes/form.inc b/includes/form.inc
index f22d065264a32dbb59cd81de7e27c897826ac374..7937b860d1ecece651adecd1cc72736a942964c3 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -573,7 +573,7 @@ function form_select_options($element, $choices = NULL) {
   if (!isset($choices)) {
     $choices = $element['#options'];
   }
-  // array_key_exists() accomodates the rare event where $element['#value'] is NULL.
+  // array_key_exists() accommodates the rare event where $element['#value'] is NULL.
   // isset() fails in this situation.
   $value_valid = isset($element['#value']) || array_key_exists('#value', $element);
   $value_is_array = is_array($element['#value']);
@@ -937,7 +937,7 @@ function theme_textfield($element) {
  *   A themed HTML string representing the form.
  */
 function theme_form($element) {
-  // Anonymous div to satisfy XHTML compliancy.
+  // Anonymous div to satisfy XHTML compliance.
   $action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : '';
   return '<form '. $action . ' method="'. $element['#method'] .'" '. 'id="'. $element['#id'] .'"'.  drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
 }
diff --git a/includes/install.inc b/includes/install.inc
index b9db13c970563fd3f7081503d5fe04cc2e092701..cff01f798cc480d4aaa0ce9aea8f9b0959ff181a 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -18,7 +18,7 @@
 
 
 /**
- * Returns an array of availiable schema versions for a module.
+ * Returns an array of available schema versions for a module.
  *
  * @param $module
  *   A module name.
diff --git a/includes/session.inc b/includes/session.inc
index 73b103082733c4fdd4ab11591285395b6da6f685..bd25ed69bb8842421242124c82bb550ec0117fbd 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -56,7 +56,7 @@ function sess_write($key, $value) {
     // Only save session data when when the browser sends a cookie.  This keeps
     // crawlers out of session table. This improves speed up queries, reduces
     // memory, and gives more useful statistics. We can't eliminate anonymous
-    // session table rows without breaking throttle modulee and "Who's Online"
+    // session table rows without breaking throttle module and "Who's Online"
     // block.
     if ($user->uid || $value || count($_COOKIE)) {
       db_query("INSERT INTO {sessions} (sid, uid, cache, hostname, session, timestamp) VALUES ('%s', %d, %d, '%s', '%s', %d)", $key, $user->uid, $user->cache, $_SERVER["REMOTE_ADDR"], $value, time());
diff --git a/includes/theme.inc b/includes/theme.inc
index 356018c7aba3ce28a976a3e67860dd1b41c9d880..610865a601a6ddee6d94cd2e6a2f2213359fd208 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -365,7 +365,7 @@ function theme_get_styles() {
  */
 
 /**
- * Format a dynamic text string for emphasised display in a placeholder.
+ * Format a dynamic text string for emphasized display in a placeholder.
  *
  * E.g. t('Added term %term', array('%term' => theme('placeholder', $term)))
  *
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index fae8b1c1f3f9a34e5634c4562eeedfafad775c60..c1cf22d3059cbed1c352c888ecbdf9afa847513e 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -257,7 +257,7 @@ function xmlrpc_message_tag_close($parser, $tag) {
       }
     }
     else {
-      // Just add as a paramater
+      // Just add as a parameter
       $xmlrpc_message->params[] = $value;
     }
   }
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index e6851a30b9d5ba6cc8ed19521576df32504c14da..a2e2176b3a0bbe2112f2bdd13d796f040c11a470 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -231,7 +231,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
   // Perform the callback and send the response
 /*
   if (count($args) == 1) {
-    // If only one paramater just send that instead of the whole array
+    // If only one parameter just send that instead of the whole array
     $args = $args[0];
   }
 */
diff --git a/misc/upload.js b/misc/upload.js
index 47189d591bfebe4e11a723afa55a39dd7ef6df68..b14b2a2450114bab48a018ed41648715142a39ee 100644
--- a/misc/upload.js
+++ b/misc/upload.js
@@ -14,7 +14,7 @@ function uploadAutoAttach() {
   for (i = 0; input = inputs[i]; i++) {
     if (input && hasClass(input, 'upload')) {
       var uri = input.value;
-      // Extract the button ID based on a subtring of the input name: edit[foo][bar] -> foo-bar
+      // Extract the button ID based on a substring of the input name: edit[foo][bar] -> foo-bar
       var button = input.name.substr(5, input.name.length - 6).replace('][', '-');
       var wrapper = button + '-wrapper';
       var hide = button + '-hide';
diff --git a/modules/blogapi.module b/modules/blogapi.module
index ce025f913fc89e88cbe662c2adc8453e38b8de79..dc4b54894684ff332b051cff4b79d55d1105ed2d 100644
--- a/modules/blogapi.module
+++ b/modules/blogapi.module
@@ -12,7 +12,7 @@
 function blogapi_help($section) {
   switch ($section) {
     case 'admin/help#blogapi':
-      $output = '<p>'. t('The blog API module enables a post to be posted to a site via external GUI applications.  Many users perfer to use external tools to improve their ability to read and post responses in a customized way.   The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'</p>';
+      $output = '<p>'. t('The blog API module enables a post to be posted to a site via external GUI applications.  Many users prefer to use external tools to improve their ability to read and post responses in a customized way.   The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'</p>';
       $output .= '<p>'. t('When this module is enabled and configured you can use programs like <a href="%external-http-ecto-kung-foo-tv">Ecto</a> to create and publish posts from your desktop. Blog API module supports several XML-RPC based blogging APIs such as the <a href="%-">Blogger API</a>, <a href="%external-http-www-xmlrpc-com-metaWeblogApi">MetaWeblog API</a>, and most of the <a href="%external-http-www-movabletype-org-docs-mtmanual_programmatic-html">Movable Type API</a>. Any desktop blogging tools or other services (e.g. <a href="%external-http-www-flickr-com">Flickr\'s</a> "post to blog") that support these APIs should work with this site.', array('%external-http-ecto-kung-foo-tv' => 'http://ecto.kung-foo.tv/', '%-' => url('http://www.blogger.com/developers/api/1_docs/'), '%external-http-www-xmlrpc-com-metaWeblogApi' => 'http://www.xmlrpc.com/metaWeblogApi', '%external-http-www-movabletype-org-docs-mtmanual_programmatic-html' => 'http://www.movabletype.org/docs/mtmanual_programmatic.html', '%external-http-www-flickr-com' => 'http://www.flickr.com')) .'</p>';
       $output .= '<p>'. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".<!--break-->') .'</p>';
       $output .= t('<p>You can</p>
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index ce025f913fc89e88cbe662c2adc8453e38b8de79..dc4b54894684ff332b051cff4b79d55d1105ed2d 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -12,7 +12,7 @@
 function blogapi_help($section) {
   switch ($section) {
     case 'admin/help#blogapi':
-      $output = '<p>'. t('The blog API module enables a post to be posted to a site via external GUI applications.  Many users perfer to use external tools to improve their ability to read and post responses in a customized way.   The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'</p>';
+      $output = '<p>'. t('The blog API module enables a post to be posted to a site via external GUI applications.  Many users prefer to use external tools to improve their ability to read and post responses in a customized way.   The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'</p>';
       $output .= '<p>'. t('When this module is enabled and configured you can use programs like <a href="%external-http-ecto-kung-foo-tv">Ecto</a> to create and publish posts from your desktop. Blog API module supports several XML-RPC based blogging APIs such as the <a href="%-">Blogger API</a>, <a href="%external-http-www-xmlrpc-com-metaWeblogApi">MetaWeblog API</a>, and most of the <a href="%external-http-www-movabletype-org-docs-mtmanual_programmatic-html">Movable Type API</a>. Any desktop blogging tools or other services (e.g. <a href="%external-http-www-flickr-com">Flickr\'s</a> "post to blog") that support these APIs should work with this site.', array('%external-http-ecto-kung-foo-tv' => 'http://ecto.kung-foo.tv/', '%-' => url('http://www.blogger.com/developers/api/1_docs/'), '%external-http-www-xmlrpc-com-metaWeblogApi' => 'http://www.xmlrpc.com/metaWeblogApi', '%external-http-www-movabletype-org-docs-mtmanual_programmatic-html' => 'http://www.movabletype.org/docs/mtmanual_programmatic.html', '%external-http-www-flickr-com' => 'http://www.flickr.com')) .'</p>';
       $output .= '<p>'. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".<!--break-->') .'</p>';
       $output .= t('<p>You can</p>
diff --git a/modules/comment.module b/modules/comment.module
index 494492bb9bf10654c4499b472ee59b635a106a08..2d9877a961d7078ffa0f57f880300bd47cc293e0 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -70,7 +70,7 @@
 function comment_help($section) {
   switch ($section) {
     case 'admin/help#comment':
-      $output = '<p>'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a communtiy dialogue.') .'</p>';
+      $output = '<p>'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'</p>';
       $output .= '<p>'. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since.  Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page.  Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 494492bb9bf10654c4499b472ee59b635a106a08..2d9877a961d7078ffa0f57f880300bd47cc293e0 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -70,7 +70,7 @@
 function comment_help($section) {
   switch ($section) {
     case 'admin/help#comment':
-      $output = '<p>'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a communtiy dialogue.') .'</p>';
+      $output = '<p>'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'</p>';
       $output .= '<p>'. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since.  Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page.  Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
diff --git a/modules/node.module b/modules/node.module
index fb5f7f08a13b1009581f55ac91652b46684469c8..0e63a81d8812f3fa878d1a44f9f9eeb4af4ec9aa 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1062,7 +1062,7 @@ function node_filter_form_submit() {
       if (isset($form_values['filter'])) {
         $filter = $form_values['filter'];
 
-        // Flatten the options array to accomodate hierarchical/nested options.
+        // Flatten the options array to accommodate hierarchical/nested options.
         $flat_options = form_options_flatten($filters[$filter]['options']);
 
         if (isset($flat_options[$form_values[$filter]])) {
diff --git a/modules/node/node.module b/modules/node/node.module
index fb5f7f08a13b1009581f55ac91652b46684469c8..0e63a81d8812f3fa878d1a44f9f9eeb4af4ec9aa 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1062,7 +1062,7 @@ function node_filter_form_submit() {
       if (isset($form_values['filter'])) {
         $filter = $form_values['filter'];
 
-        // Flatten the options array to accomodate hierarchical/nested options.
+        // Flatten the options array to accommodate hierarchical/nested options.
         $flat_options = form_options_flatten($filters[$filter]['options']);
 
         if (isset($flat_options[$form_values[$filter]])) {
diff --git a/modules/poll.module b/modules/poll.module
index 1087f742fb57debe537678c94236be53fdaf5d4a..2d6c90750bcbf82ff4b88d65062359d0149ea6c1 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -13,7 +13,7 @@
 function poll_help($section) {
   switch ($section) {
     case 'admin/help#poll':
-      $output = '<p>'. t('The poll module can be used to create simple polls for site users.  A poll is a simple multiple choice questionnaire which displays the cummulative results of the answers to the poll.  Having polls on the site is a good way to get instant feedback from community members.') .'</p>';
+      $output = '<p>'. t('The poll module can be used to create simple polls for site users.  A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll.  Having polls on the site is a good way to get instant feedback from community members.') .'</p>';
       $output .= '<p>'. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The <a href="%poll">poll</a> item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('%poll' => url('poll'))) .'</p>';
       $output .= t('<p>You can</p>
 <ul>
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 1087f742fb57debe537678c94236be53fdaf5d4a..2d6c90750bcbf82ff4b88d65062359d0149ea6c1 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -13,7 +13,7 @@
 function poll_help($section) {
   switch ($section) {
     case 'admin/help#poll':
-      $output = '<p>'. t('The poll module can be used to create simple polls for site users.  A poll is a simple multiple choice questionnaire which displays the cummulative results of the answers to the poll.  Having polls on the site is a good way to get instant feedback from community members.') .'</p>';
+      $output = '<p>'. t('The poll module can be used to create simple polls for site users.  A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll.  Having polls on the site is a good way to get instant feedback from community members.') .'</p>';
       $output .= '<p>'. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The <a href="%poll">poll</a> item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('%poll' => url('poll'))) .'</p>';
       $output .= t('<p>You can</p>
 <ul>
diff --git a/modules/search.module b/modules/search.module
index 97897c0cae4771e6650d8d01e22973b57bb3455e..4cc487e4104bf32c0a67630797a221485bd6ebd2 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -1243,7 +1243,7 @@ function theme_search_item($item, $type) {
  *
  * Modules may implement hook_search_page() in order to override this default
  * function to display search results. In that case it is expected they provide
- * their own themable functions.
+ * their own themeable functions.
  *
  * @param $results
  *   All search result as returned by hook_search().
diff --git a/modules/search/search.module b/modules/search/search.module
index 97897c0cae4771e6650d8d01e22973b57bb3455e..4cc487e4104bf32c0a67630797a221485bd6ebd2 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -1243,7 +1243,7 @@ function theme_search_item($item, $type) {
  *
  * Modules may implement hook_search_page() in order to override this default
  * function to display search results. In that case it is expected they provide
- * their own themable functions.
+ * their own themeable functions.
  *
  * @param $results
  *   All search result as returned by hook_search().
diff --git a/modules/statistics.module b/modules/statistics.module
index 47b42be8bd8563903fbd7b42d6bbbf835ee9b1dd..a4d8bc62838219e9543cc83c6897491f57016be8 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -33,7 +33,7 @@ function statistics_help($section) {
 ');
       $output .= t('<p>You can</p>
 <ul>
-<li>administer statistics <a href="%admin-settings-statistics">administer &gt;&gt; setttings &gt;&gt; statistics</a>.</li>
+<li>administer statistics <a href="%admin-settings-statistics">administer &gt;&gt; settings &gt;&gt; statistics</a>.</li>
 <li>access statistics logs <a href="%admin-logs">administer &gt;&gt; logs</a>.</li>
 <li>view recent hits <a href="%admin-logs-hits">administer &gt;&gt; logs &gt;&gt; recent hits</a>.</li>
 <li>enable \'popular content\' block in block administration <a href="%admin-block">administer &gt;&gt; blocks </a> but only after you have enabled \'Count content views\' in settings.</li>
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 47b42be8bd8563903fbd7b42d6bbbf835ee9b1dd..a4d8bc62838219e9543cc83c6897491f57016be8 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -33,7 +33,7 @@ function statistics_help($section) {
 ');
       $output .= t('<p>You can</p>
 <ul>
-<li>administer statistics <a href="%admin-settings-statistics">administer &gt;&gt; setttings &gt;&gt; statistics</a>.</li>
+<li>administer statistics <a href="%admin-settings-statistics">administer &gt;&gt; settings &gt;&gt; statistics</a>.</li>
 <li>access statistics logs <a href="%admin-logs">administer &gt;&gt; logs</a>.</li>
 <li>view recent hits <a href="%admin-logs-hits">administer &gt;&gt; logs &gt;&gt; recent hits</a>.</li>
 <li>enable \'popular content\' block in block administration <a href="%admin-block">administer &gt;&gt; blocks </a> but only after you have enabled \'Count content views\' in settings.</li>
diff --git a/modules/upload.module b/modules/upload.module
index d84fc2dece33f55d13c1d8dac1096a6f0dcee47f..5c7c36edf7ce8c1e097b005818024f22a938c6de 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -257,7 +257,7 @@ function _upload_validate(&$node) {
   if (is_array($node->files)) {
     // Update existing files with form data.
     foreach($node->files as $fid => $file) {
-      // Convert file to object for compatability
+      // Convert file to object for compatibility
       $file = (object)$file;
 
       // Validate new uploads.
@@ -449,7 +449,7 @@ function upload_save($node) {
   }
 
   foreach ($node->files as $fid => $file) {
-    // Convert file to object for compatability
+    // Convert file to object for compatibility
     $file = (object)$file;
 
     // Remove file. Process removals first since no further processing
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index d84fc2dece33f55d13c1d8dac1096a6f0dcee47f..5c7c36edf7ce8c1e097b005818024f22a938c6de 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -257,7 +257,7 @@ function _upload_validate(&$node) {
   if (is_array($node->files)) {
     // Update existing files with form data.
     foreach($node->files as $fid => $file) {
-      // Convert file to object for compatability
+      // Convert file to object for compatibility
       $file = (object)$file;
 
       // Validate new uploads.
@@ -449,7 +449,7 @@ function upload_save($node) {
   }
 
   foreach ($node->files as $fid => $file) {
-    // Convert file to object for compatability
+    // Convert file to object for compatibility
     $file = (object)$file;
 
     // Remove file. Process removals first since no further processing
diff --git a/update.php b/update.php
index 63e8f4dc1e46873290d74123a44c8bb99403b02e..8dcbf6a139347cc5596cff91cdb8bcab676a5e7b 100644
--- a/update.php
+++ b/update.php
@@ -458,7 +458,7 @@ function update_progress_page_nojs() {
     // Error handling: if PHP dies, it will output whatever is in the output
     // buffer, followed by the error message.
     ob_start();
-    $fallback = '<p class="error">An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>.</p><p class="error">';
+    $fallback = '<p class="error">An unrecoverable error has occurred. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>.</p><p class="error">';
     print theme('maintenance_page', $fallback, FALSE, TRUE);
 
     list($percentage, $message) = update_do_updates();
@@ -466,7 +466,7 @@ function update_progress_page_nojs() {
       $new_op = 'finished';
     }
 
-    // Updates succesful; remove fallback
+    // Updates successful; remove fallback
     ob_end_clean();
   }
   else {
@@ -609,7 +609,7 @@ function update_fix_access_table() {
 /**
  * Convert a single MySQL table to UTF-8.
  *
- * We change all text columns to their correspending binary type,
+ * We change all text columns to their corresponding binary type,
  * then back to text, but with a UTF-8 character set.
  * See: http://dev.mysql.com/doc/refman/4.1/en/charset-conversion.html
  */
@@ -654,7 +654,7 @@ function update_convert_table_utf8($table) {
 }
 
 // Some unavoidable errors happen because the database is not yet up-to-date.
-// Our custom error handler is not yet installed, so we just surpress them.
+// Our custom error handler is not yet installed, so we just suppress them.
 ini_set('display_errors', FALSE);
 
 include_once './includes/bootstrap.inc';