- Patch #163246 by keith smith, freso, O Govinda, catch, webchick et al: fixed minor spelling issues and fixed spacing issues.

23 files changed, 56 insertions, 56 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bd9b591a5..6463e4844 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -695,7 +695,7 @@ Drupal 3.0.0, 2001-09-15
     * Drupal tries to locate a configuration file that matches your domain name or uses conf.php if the former failed. Note also that the configuration files got renamed from .conf to .php for security's sake on mal-configured Drupal sites.
 - Added caching support which makes Drupal extremely scalable.
 - Added access.module:
-    * Allows you to setup 'roles' (groups) and to bind a set of permissions to each group.
+    * Allows you to set up 'roles' (groups) and to bind a set of permissions to each group.
 - Added blog.module.
 - Added poll.module.
 - Added system.module:
@@ -750,13 +750,13 @@ Drupal 2.0.0, 2001-03-15
     * Story sections can be maintained from the administration pages.
     * Story sections make the open submission more adaptive in that you can set individual post, dump and expiration thresholds for each section according to the story type and urgency level: stories in certain sections do not "expire" and might stay interesting and active as time passes by, whereas news-related stories are only considered "hot" over a short period of time.
 - Multiple vhosts + multiple directories:
-    * You can setup multiple Drupal sites on top of the same physical source tree either by using vhosts or sub-directories.
+    * You can set up multiple Drupal sites on top of the same physical source tree either by using vhosts or sub-directories.
 - Added "user ratings" similar to SlashCode's Karma or Scoop's Mojo:
     * All rating logic is packed into a module to ease experimenting with different rating heuristics/algorithms.
 - Added "search infrastructure":
     * Improved search page and integrated search functionality in the administration pages.
 - Added translation / localization / internationalization support:
-    * Because many people would love to see their website showing a lot less of English, and far more of their own language, Drupal provides a framework to setup a multi-lingual website or to overwrite the default English text in English.
+    * Because many people would love to see their website showing a lot less of English, and far more of their own language, Drupal provides a framework to set up a multi-lingual website or to overwrite the default English text in English.
 - Added fine-grained user permission (or group) system:
     * Users can be granted access to specific administration sections. Example: a FAQ maintainer can be given access to maintain the FAQ and translators can be given access to the translation pages.
 - Added FAQ module
diff --git a/INSTALL.pgsql.txt b/INSTALL.pgsql.txt
index 64847763f..20705478f 100644
--- a/INSTALL.pgsql.txt
+++ b/INSTALL.pgsql.txt
@@ -7,7 +7,7 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
 
 1. CREATE DATABASE USER
 
-   This step is only necessary if you don't already have a user setup (e.g.
+   This step is only necessary if you don't already have a user set up (e.g.
    by your host) or you want to create new user for use with Drupal only. The
    following command creates a new user named "username" and asks for a
    password for that user:
@@ -18,7 +18,7 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
 
 2. CREATE THE DRUPAL DATABASE
 
-   This step is only necessary if you don't already have a database setup (e.g.
+   This step is only necessary if you don't already have a database set up (e.g.
    by your host) or you want to create new database for use with Drupal only.
    The following command creates a new database named "databasename", which is
    owned by previously created "username":
diff --git a/includes/common.inc b/includes/common.inc
index b1c542207..e678ab281 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1604,7 +1604,7 @@ function drupal_add_css($path = NULL, $type = 'module', $media = 'all', $preproc
           unset($css[$media]['module'][$old_path]);
 
           // If the current language is RTL and the CSS file had an RTL variant,
-          // pull out the original. The theme must provide it's own RTL style.
+          // pull out the original. The theme must provide its own RTL style.
           if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
             $rtl_old_path = str_replace('.css', '-rtl.css', $old_path);
             if (isset($css[$media]['module'][$rtl_old_path])) {
@@ -1939,7 +1939,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL) {
  * needs to be arranged by an end-user. Draggable tables are very flexible and
  * can manipulate the value of form elements placed within individual columns.
  *
- * To setup a table to use drag and drop in place of weight select-lists or
+ * To set up a table to use drag and drop in place of weight select-lists or
  * in place of a form that contains parent relationships, the form must be
  * themed into a table. The table must have an id attribute set. If using
  * theme_table(), the id may be set as such:
diff --git a/includes/file.inc b/includes/file.inc
index b1b488d76..40510783f 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -456,7 +456,7 @@ function file_space_used($uid = NULL) {
  *
  * 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.
+ * file_set_status() to change its status.
  *
  * @param $source
  *   A string specifying the name of the upload field to save.
diff --git a/includes/form.inc b/includes/form.inc
index a374963fb..011137758 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2269,8 +2269,8 @@ function form_clean_id($id = NULL, $flush = FALSE) {
  * 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
- * of operations and results, and triggers it's own 'finished' callback.
+ * batch set gets to specify his own UI messages, operates on its own set
+ * of operations and results, and triggers its own 'finished' callback.
  * Batch sets are processed sequentially, with the progress bar starting
  * fresh for every new set.
  */
diff --git a/includes/locale.inc b/includes/locale.inc
index 06b67e4f5..fd81a499a 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -488,7 +488,7 @@ function locale_translate_overview_screen() {
     $groupsums[$group->textgroup] = $group->strings;
   }
 
-  // Setup overview table with default values, ensuring common order for values.
+  // Set up overview table with default values, ensuring common order for values.
   $rows = array();
   foreach ($languages as $langcode => $language) {
     $rows[$langcode] = array('name' => ($langcode == 'en' ? t('English (built-in)') : t($language->name)));
diff --git a/includes/theme.inc b/includes/theme.inc
index d1e0b0d86..89825dba5 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -515,9 +515,9 @@ function list_theme_engines($refresh = FALSE) {
  *   provided so that the preprocessor is not locked into a specific theme.
  *   This makes it easy to share and transport code but theme authors must be
  *   careful to prevent fatal re-declaration errors when using sub-themes that
- *   have their own preprocessor named exactly the same as it's base theme. In
+ *   have their own preprocessor named exactly the same as its base theme. In
  *   the default theme engine (PHPTemplate), sub-themes will load their own
- *   template.php file in addition to the one used for it's parent theme. This
+ *   template.php file in addition to the one used for its parent theme. This
  *   increases the risk for these errors. A good practice is to use the engine
  *   name for the base theme and the theme name for the sub-themes to minimize
  *   this possibility.
@@ -1778,7 +1778,7 @@ function template_preprocess_page(&$variables) {
     isset($variables[$region]) ? $variables[$region] .= $blocks : $variables[$region] = $blocks;
   }
 
-  // Setup layout variable.
+  // Set up layout variable.
   $variables['layout'] = 'none';
   if (!empty($variables['left'])) {
     $variables['layout'] = 'left';
diff --git a/install.php b/install.php
index 7bdc17e41..1716ffed9 100644
--- a/install.php
+++ b/install.php
@@ -932,7 +932,7 @@ function install_configure_form(&$form_state, $url) {
     '#type' => 'textfield',
     '#title' => st('Site e-mail address'),
     '#default_value' => ini_get('sendmail_from'),
-    '#description' => st('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc.  To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'),
+    '#description' => st('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'),
     '#required' => TRUE,
     '#weight' => -15,
   );
@@ -1000,7 +1000,7 @@ function install_configure_form(&$form_state, $url) {
     '#title' => st('Update notifications'),
     '#options' => array(1 => st('Check for updates automatically')),
     '#default_value' => array(1),
-    '#description' => st('With this option enabled, Drupal will notify you when new releases are available. This will significantly enhance your site\'s security and is <strong>highly recommended</strong>. This requires your site to periodically send anonymous information on its installed components to <a href="@drupal">drupal.org</a>.  For more information please see the <a href="@update">update notification information</a>.', array('@drupal' => 'http://drupal.org', '@update' => 'http://drupal.org/handbook/modules/update')),
+    '#description' => st('With this option enabled, Drupal will notify you when new releases are available. This will significantly enhance your site\'s security and is <strong>highly recommended</strong>. This requires your site to periodically send anonymous information on its installed components to <a href="@drupal">drupal.org</a>. For more information please see the <a href="@update">update notification information</a>.', array('@drupal' => 'http://drupal.org', '@update' => 'http://drupal.org/handbook/modules/update')),
     '#weight' => 15,
   );
 
diff --git a/misc/tabledrag.js b/misc/tabledrag.js
index 3608c28c1..1d80b2020 100644
--- a/misc/tabledrag.js
+++ b/misc/tabledrag.js
@@ -188,7 +188,7 @@ Drupal.tableDrag.prototype.makeDraggable = function(item) {
       self.dragObject.indentMousePos = self.dragObject.initMouseCoords;
     }
 
-    // If there's a lingering row object from the keyboard, remove it's focus.
+    // If there's a lingering row object from the keyboard, remove its focus.
     if (self.rowObject) {
       $('a.tabledrag-handle', self.rowObject.element).blur();
     }
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 30fdfd590..8f0c902c2 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -767,7 +767,7 @@ function aggregator_parse_feed(&$data, $feed) {
     /*
     ** Save this item. Try to avoid duplicate entries as much as
     ** possible. If we find a duplicate entry, we resolve it and
-    ** pass along it's ID such that we can update it if needed.
+    ** pass along its ID is such that we can update it if needed.
     */
 
     if (!empty($guid)) {
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index a90264075..32e64fe38 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -367,7 +367,7 @@ function template_preprocess_block_admin_display_form(&$variables) {
   // Initialize disabled blocks array.
   $variables['block_listing'][BLOCK_REGION_NONE] = array();
 
-  // Setup to track previous region in loop.
+  // Set up to track previous region in loop.
   $last_region = '';
   foreach (element_children($variables['form']) as $i) {
     $block = &$variables['form'][$i];
diff --git a/modules/block/block.module b/modules/block/block.module
index aa44be98c..002a890a4 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -89,7 +89,7 @@ function block_help($path, $arg) {
       return $output;
     case 'admin/build/block':
       return t('<p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p>
-<p>Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar).  Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.</p>
+<p>Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.</p>
 <p>If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
 <p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle')));
     case 'admin/build/block/add':
@@ -518,4 +518,4 @@ function _block_get_cache_id($block) {
 
     return implode(':', $cid_parts);
   }
-}
\ No newline at end of file
+}
diff --git a/modules/book/book.install b/modules/book/book.install
index e6f016bb8..90ec1da93 100644
--- a/modules/book/book.install
+++ b/modules/book/book.install
@@ -78,7 +78,7 @@ function book_update_6000() {
     _book_install_type_create();
 
     // Fix role permissions to account for the changed names
-    // Setup the array holding strings to match and the corresponding
+    // Set up the array holding strings to match and the corresponding
     // strings to replace them with.
     $replace = array(
       'outline posts in books' => 'administer book outlines',
diff --git a/modules/book/book.module b/modules/book/book.module
index 8fc271c2f..1abaeec16 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -229,7 +229,7 @@ function book_block($op = 'list', $delta = 0, $edit = array()) {
         '#title' => t('Book navigation block display'),
         '#options' => $options,
         '#default_value' => variable_get('book_block_mode', 'all pages'),
-        '#description' => t("If <em>Show block on all pages</em> is selected, the block will contain the automatically generated menus for all of the site's books. If <em>Show block only on book pages</em> is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed.  The <em>Page specific visibility settings</em> or other visibility settings can be used in addition to selectively display this block."),
+        '#description' => t("If <em>Show block on all pages</em> is selected, the block will contain the automatically generated menus for all of the site's books. If <em>Show block only on book pages</em> is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The <em>Page specific visibility settings</em> or other visibility settings can be used in addition to selectively display this block."),
         );
       return $form;
     case 'save':
@@ -349,7 +349,7 @@ function _book_parent_select($book_link) {
       '#type' => 'select',
       '#title' => t('Parent item'),
       '#default_value' => $book_link['plid'],
-      '#description' => t('The parent page in the book. The maximum depth for a book and all child pages is !maxdepth.  Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
+      '#description' => t('The parent page in the book. The maximum depth for a book and all child pages is !maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
       '#options' => book_toc($book_link['bid'], array($book_link['mlid']), $book_link['parent_depth_limit']),
       '#attributes' => array('class' => 'book-title-select'),
     );
@@ -1001,10 +1001,10 @@ function book_help($path, $arg) {
   switch ($path) {
     case 'admin/help#book':
       $output = '<p>'. t('The <em>book</em> module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book,  placing them into the existing document by adding them to a table of contents menu.') .'</p>';
-      $output .= '<p>'. t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text.  These link to the previous and next pages in the book, as well as a link labeled <em>up</em>, leading to the level above in the structure.  More comprehensive navigation may be provided by enabling the <em>book navigation block</em> on the <a href="@admin-block">block administration page</a>.', array('@admin-block' => url('admin/build/block'))) .'</p>';
+      $output .= '<p>'. t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These link to the previous and next pages in the book, as well as a link labeled <em>up</em>, leading to the level above in the structure. More comprehensive navigation may be provided by enabling the <em>book navigation block</em> on the <a href="@admin-block">block administration page</a>.', array('@admin-block' => url('admin/build/block'))) .'</p>';
       $output .= '<p>'. t('Users can select the <em>printer-friendly version</em> link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') .'</p>';
       $output .= '<p>'. t("Users with the <em>administer book outlines</em> permission can add content of any type to a book, placing it into the existing book structure through the edit form or through the interface that's available by clicking on the <em>outline</em> tab while viewing that post.", array('%book' => node_get_types('name', 'book'))) .'</p>';
-      $output .= '<p>'. t('Administrators can view a list of all books on the <a href="@admin-node-book">book administration page</a>.  In this list there is a link to an outline page for each book, from which is it possible to change the titles of sections, or to change their weight, thus reordering sections.', array('@admin-node-book' => url('admin/content/book'))) .'</p>';
+      $output .= '<p>'. t('Administrators can view a list of all books on the <a href="@admin-node-book">book administration page</a>. In this list there is a link to an outline page for each book, from which is it possible to change the titles of sections, or to change their weight, thus reordering sections.', array('@admin-node-book' => url('admin/content/book'))) .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@book">Book page</a>.', array('@book' => 'http://drupal.org/handbook/modules/book/')) .'</p>';
       return $output;
     case 'admin/content/book':
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 0a9151e5f..0d41d2a1c 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -19,7 +19,7 @@ function contact_help($path, $arg) {
       $output .= '<p>'. t('For more information, please read the configuration and customization handbook page for the <a href="@contact">contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'</p>';
       return $output;
     case 'admin/build/contact':
-      $output = '<p>'. t('This page lets you setup <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'</p>';
+      $output = '<p>'. t('This page lets you set up <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'</p>';
       if (!module_exists('menu')) {
         $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules')));
       }
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 383a70376..779399b05 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -304,7 +304,7 @@ function menu_edit_item(&$form_state, $type, $item, $menu) {
     '#title' => t('Parent item'),
     '#default_value' => $default,
     '#options' => $options,
-    '#description' => t('The maximum depth for an item and all its children is fixed at !maxdepth.  Some menu items may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
+    '#description' => t('The maximum depth for an item and all its children is fixed at !maxdepth. Some menu items may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
     '#attributes' => array('class' => 'menu-title-select'),
   );
   $form['menu']['weight'] = array(
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 884b4faed..633125d61 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -403,7 +403,7 @@ function menu_form_alter(&$form, $form_state, $form_id) {
       '#title' => t('Parent item'),
       '#default_value' => $default,
       '#options' => $options,
-      '#description' => t('The maximum depth for an item and all its children is fixed at !maxdepth.  Some menu items may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
+      '#description' => t('The maximum depth for an item and all its children is fixed at !maxdepth. Some menu items may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
       '#attributes' => array('class' => 'menu-title-select'),
     );
     $form['#submit'][] = 'menu_node_form_submit';
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 084783245..98b795189 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -51,7 +51,7 @@ function openid_help($path, $arg) {
     case 'admin/help#openid':
       $output = '<p>'. t('OpenID is a secure method for logging into many websites with a single username and password. It does not require special software, and it does not share passwords with any site to which it is associated; including your site.') .'</p>';
       $output .= '<p>'. t('Users can create accounts using their OpenID, assign one or more OpenIDs to an existing account, and log in using an OpenID. This lowers the barrier to registration, which is good for the site, and offers convenience and security to the users. OpenID is not a trust system, so email verification is still necessary. The benefit stems from the fact that users can have a single password that they can use on many websites. This means they can easily update their single password from a centralized location, rather than having to change dozens of passwords individually.') .'</p>';
-      $output .= '<p>'. t('The basic concept is as follows: A user has an account on an OpenID server. This account provides them with a unique URL (such as myusername.openidprovider.com). When the user comes to your site, they are presented with the option of entering this URL. Your site then communicates with the OpenID server, asking it to verify the identity of the user.  If the user is logged into their OpenID server, the server communicates back to your site, verifying the user. If they are not logged in, the OpenID server will ask the user for their password. At no point does your site record, or need to record the user\'s password.') .'</p>';
+      $output .= '<p>'. t('The basic concept is as follows: A user has an account on an OpenID server. This account provides them with a unique URL (such as myusername.openidprovider.com). When the user comes to your site, they are presented with the option of entering this URL. Your site then communicates with the OpenID server, asking it to verify the identity of the user. If the user is logged into their OpenID server, the server communicates back to your site, verifying the user. If they are not logged in, the OpenID server will ask the user for their password. At no point does your site record, or need to record the user\'s password.') .'</p>';
       $output .= '<p>'. t('More information on OpenID is available at <a href="@openid-net">OpenID.net</a>.', array('@openid-net' => url('http://openid.net'))) .'</p>';
       return $output;
   }
diff --git a/modules/poll/poll.pages.inc b/modules/poll/poll.pages.inc
index 7ac47d102..45c76e95f 100644
--- a/modules/poll/poll.pages.inc
+++ b/modules/poll/poll.pages.inc
@@ -30,7 +30,7 @@ function poll_page() {
  */
 function poll_votes($node) {
   drupal_set_title(check_plain($node->title));
-  $output = t('This table lists all the recorded votes for this poll.  If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.');
+  $output = t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.');
 
   $header[] = array('data' => t('Visitor'), 'field' => 'u.name');
   $header[] = array('data' => t('Vote'), 'field' => 'pv.chorder');
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 230183aae..ce139cde6 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -448,7 +448,7 @@ function system_theme_settings(&$form_state, $key = '') {
     $form['favicon'] = array(
       '#type' => 'fieldset',
       '#title' => t('Shortcut icon settings'),
-      '#description' => t("Your shortcut icon or 'favicon' is displayed in the address bar and bookmarks of most browsers.")
+      '#description' => t("Your shortcut icon, or 'favicon', is displayed in the address bar and bookmarks of most browsers.")
     );
     $form['favicon']['default_favicon'] = array(
       '#type' => 'checkbox',
@@ -1072,7 +1072,7 @@ function system_site_information_settings() {
     '#type' => 'textfield',
     '#title' => t('E-mail address'),
     '#default_value' => variable_get('site_mail', ini_get('sendmail_from')),
-    '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc.  To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'),
+    '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'),
     '#required' => TRUE,
   );
   $form['site_slogan'] = array(
@@ -1238,7 +1238,7 @@ function system_performance_settings() {
     '#default_value' => variable_get('preprocess_css', 0) && $is_writable,
     '#disabled' => !$is_writable,
     '#options' => array(t('Disabled'), t('Enabled')),
-    '#description' => t("This option can interfere with theme development. It is recommended to only turn this on when your site is complete."),
+    '#description' => t('This option can interfere with theme development and should only be enabled in a production environment.'),
   );
   $form['bandwidth_optimizations']['preprocess_js'] = array(
     '#type' => 'radios',
@@ -1246,7 +1246,7 @@ function system_performance_settings() {
     '#default_value' => variable_get('preprocess_js', 0) && $is_writable,
     '#disabled' => !$is_writable,
     '#options' => array(t('Disabled'), t('Enabled')),
-    '#description' => t("This option can interfere with module development. It is recommended to only turn this on when your site is complete."),
+    '#description' => t('This option can interfere with module development and should only be enabled in a production environment.'),
   );
 
   $form['clear_cache'] = array(
@@ -1678,12 +1678,12 @@ function system_sql() {
   ));
 
   $output .= '<h2>'. t('Query cache information') .'</h2>';
-  $output .= '<p>'. t('The MySQL query cache can improve performance of your site by storing the result of queries.  Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'</p>';
+  $output .= '<p>'. t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'</p>';
   $output .= _system_sql($data, array(
    'Qcache_queries_in_cache' => t('The number of queries in the query cache.'),
-   'Qcache_hits' => t('The number of times that MySQL found previous results in the cache.'),
-   'Qcache_inserts' => t('The number of times that MySQL added a query to the cache (misses).'),
-   'Qcache_lowmem_prunes' => t('The number of times that MySQL had to remove queries from the cache because it ran out of memory.  Ideally should be zero.')
+   'Qcache_hits' => t('The number of times MySQL found previous results in the cache.'),
+   'Qcache_inserts' => t('The number of times MySQL added a query to the cache (misses).'),
+   'Qcache_lowmem_prunes' => t('The number of times MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.')
   ));
 
   return $output;
@@ -1800,10 +1800,10 @@ function theme_admin_page($blocks) {
   $output = '<div class="admin clear-block">';
   $output .= '<div class="compact-link">';
   if (system_admin_compact_mode()) {
-    $output .= l(t('Show descriptions'), 'admin/compact/off', array('title' => t('Produce a less compact layout that includes descriptions.')));
+    $output .= l(t('Show descriptions'), 'admin/compact/off', array('title' => t('Expand layout to include descriptions.')));
   }
   else {
-    $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t("Produce a more compact layout that doesn't include descriptions.")));
+    $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t('Compress layout by hiding descriptions.')));
   }
   $output .= '</div>';
 
diff --git a/modules/system/system.install b/modules/system/system.install
index c489eb862..1f036b28f 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -362,7 +362,7 @@ function system_schema() {
   // some database drivers, e.g. Oracle and DB2, will require variable_get()
   // and variable_set() for overcoming some database specific limitations.
   $schema['variable'] = array(
-    'description' => t('Named variable/value pairs created by Drupal core or any other module or theme.  All variables are cached in memory at the start of every Drupal request so developers should not be careless about what is stored here.'),
+    'description' => t('Named variable/value pairs created by Drupal core or any other module or theme. All variables are cached in memory at the start of every Drupal request so developers should not be careless about what is stored here.'),
     'fields' => array(
       'name' => array(
         'description' => t('The name of the variable.'),
@@ -666,7 +666,7 @@ function system_schema() {
         'not null' => TRUE,
         'default' => ''),
       'tab_root' => array(
-        'description' => t('Router path of the closest non-tab parent page.  For pages that are not local tasks, this will be the same as the path.'),
+        'description' => t('Router path of the closest non-tab parent page. For pages that are not local tasks, this will be the same as the path.'),
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
@@ -684,7 +684,7 @@ function system_schema() {
         'not null' => TRUE,
         'default' => ''),
       'title_arguments' => array(
-        'description' => t('A serialized array of arguments for the title callback.  If empty, the title will be used as the sole argument for the title callback.'),
+        'description' => t('A serialized array of arguments for the title callback. If empty, the title will be used as the sole argument for the title callback.'),
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
@@ -817,7 +817,7 @@ function system_schema() {
         'default' => 0,
         'size' => 'small'),
       'p1' => array(
-        'description' => t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid.  If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
+        'description' => t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -919,7 +919,7 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0),
       'session' => array(
-        'description' => t('The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID.  Drupal loads $_SESSION from here at the start of each request and saves it at the end.'),
+        'description' => t('The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID. Drupal loads $_SESSION from here at the start of each request and saves it at the end.'),
         'type' => 'text',
         'not null' => FALSE,
         'size' => 'big')
@@ -975,13 +975,13 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0),
       'schema_version' => array(
-        'description' => t("The module's database schema version number.  -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."),
+        'description' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."),
         'type' => 'int',
         'not null' => TRUE,
         'default' => -1,
         'size' => 'small'),
       'weight' => array(
-        'description' => t("The order in which this module's hooks should be invoked relative to other modules.  Equal-weighted modules are ordered by name."),
+        'description' => t("The order in which this module's hooks should be invoked relative to other modules. Equal-weighted modules are ordered by name."),
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0),
@@ -1019,7 +1019,7 @@ function system_schema() {
         'not null' => TRUE,
         'default' => ''),
       'language' => array(
-        'description' => t('The language this alias is for; if blank, the alias will be used for unknown languages.  Each Drupal path can have an alias for each supported language.'),
+        'description' => t('The language this alias is for; if blank, the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.'),
         'type' => 'varchar',
         'length' => 12,
         'not null' => TRUE,
@@ -1969,7 +1969,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 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'))));
+          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'))));
         }
       }
     }
diff --git a/modules/system/system.module b/modules/system/system.module
index 8d83f361a..d6997c2f1 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -35,7 +35,7 @@ function system_help($path, $arg) {
     case 'admin/by-module':
       return '<p>'. t('This page shows you all available administration tasks for each module.') .'</p>';
     case 'admin/build/themes':
-      $output = '<p>'. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'</p>';
+      $output = '<p>'. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for that theme. Note that different themes may have different regions available for displaying content; for consistency in presentation, you may wish to enable only one theme.') .'</p>';
       $output .= '<p>'. t('To change the appearance of your site, a number of <a href="@themes">contributed themes</a> are available.', array('@themes' => 'http://drupal.org/project/themes')) .'</p>';
       return $output;
     case 'admin/build/themes/settings/'. $arg[4]:
@@ -45,7 +45,7 @@ function system_help($path, $arg) {
     case 'admin/build/themes/settings':
       return '<p>'. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'</p>';
     case 'admin/build/modules':
-      $output = '<p>'. t('Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Once a module is enabled, new <a href="@permissions">permissions</a> might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle.', array('@permissions' => url('admin/user/permissions')));
+      $output = '<p>'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the <em>Enabled</em> checkboxes below and clicking the <em>Save configuration</em> button. Once a module is enabled, new <a href="@permissions">permissions</a> may be available. To reduce server load, modules with their <em>Throttle</em> checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the <em>Throttle</em> checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/user/permissions')));
       if (module_exists('throttle')) {
         $output .= ' '. t('The auto-throttle functionality must be enabled on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle')));
       }
@@ -72,7 +72,7 @@ function system_help($path, $arg) {
     case 'admin/settings/actions/configure':
       return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended, in order to better identify the precise action taking place. This description will be displayed in modules such as the trigger module when assigning actions to system events, so it is best if it is as descriptive as possible (for example, "Send e-mail to Moderation Team" rather than simply "Send e-mail").');
     case 'admin/reports/status':
-      return '<p>'. t("Here you can find a short overview of your Drupal site's parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.") .'</p>';
+      return '<p>'. t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") .'</p>';
   }
 }
 
@@ -1597,7 +1597,7 @@ function system_message_action_form($context) {
     '#default_value' => isset($context['message']) ? $context['message'] : '',
     '#required' => TRUE,
     '#rows' => '8',
-    '#description' => t('The message to be displayed to the current user.  You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body. Not all variables will be available in all contexts.'),
+    '#description' => t('The message to be displayed to the current user. You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body. Not all variables will be available in all contexts.'),
   );
   return $form;
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index c56f92693..8154c02c0 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1214,7 +1214,7 @@ function user_login(&$form_state, $msg = '') {
 }
 
 /**
- * Setup a series for validators which check for blocked/denied users,
+ * Set up a series for validators which check for blocked/denied users,
  * then authenticate against local database, then return an error if
  * authentication fails. Distributed authentication modules (e.g.
  * drupal.module) are welcome to use hook_form_alter() to change this
@@ -1749,7 +1749,7 @@ function user_help($path, $arg) {
 
   switch ($path) {
     case 'admin/help#user':
-      $output = '<p>'. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which can setup fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles <em>anonymous</em> - a user who has not logged in, and <em>authenticated</em> a user who has signed up and who has been authorized.') .'</p>';
+      $output = '<p>'. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles <em>anonymous</em> - a user who has not logged in, and <em>authenticated</em> a user who has signed up and who has been authorized.') .'</p>';
       $output .= '<p>'. t('Users can use their own name or handle and can fine tune some personal configuration settings through their individual my account page. Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as DelphiForums ID, or one from a Drupal powered website. A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security\'s sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server.') .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@user">User page</a>.', array('@user' => 'http://drupal.org/handbook/modules/user/')) .'</p>';
       return $output;