diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 70372662fa41243ac75f6a3981f49b87d7ec5356..297fb2b18a49a9c32651fa5513fe8cfbae3bb89e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -80,7 +80,7 @@ Drupal 6.0, xxxx-xx-xx (development version)
 - Forum improvements:
     * Any node type may now be posted in a forum.
 - Taxonomy improvements:
-    * Descriptions for terms are now shown on taxonomy/term pages as well 
+    * Descriptions for terms are now shown on taxonomy/term pages as well
       as RSS feeds.
     * Added versioning support to categories by associating them with node
       revisions.
diff --git a/install.php b/install.php
index 673b7e44c3d223c6c23a3fff6fbf2c69fd002afd..66ee2d980336ec31d71755d26ce7d440277dd2dd 100644
--- a/install.php
+++ b/install.php
@@ -371,7 +371,7 @@ function _install_settings_form_validate($db_prefix, $db_type, $db_user, $db_pas
 
   // Verify the table prefix
   if (!empty($db_prefix) && is_string($db_prefix) && !preg_match('/^[A-Za-z0-9_.]+$/', $db_prefix)) {
-    form_set_error('db_prefix', st('The database table prefix you have entered, %db_prefix, is invalid. The table prefix can only contain alphanumeric characters, underscores or dots.', array('%db_prefix' => $db_prefix)), 'error');
+    form_set_error('db_prefix', st('The database table prefix you have entered, %db_prefix, is invalid. The table prefix can only contain alphanumeric characters, periods, or underscores.', array('%db_prefix' => $db_prefix)), 'error');
   }
 
   if (!empty($db_port) && !is_numeric($db_port)) {
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index c43de51484665d5ed1158efb2343e9f47976db2d..c13c88e87b82565307997721de8f39787675903f 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -317,7 +317,7 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) {
       '#type' => 'textfield',
       '#title' => t('Menu name'),
       '#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI,
-      '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name may consist of only of lowercase letters, numbers, and hyphens, and must be unique.'),
+      '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name must contain only lowercase letters, numbers, and hyphens, and must be unique.'),
       '#required' => TRUE,
     );
     $form['#insert'] = TRUE;
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index f949925097c5dcd45dc69b4ecb30260e2cc4f2d3..85b1bb1d357bed37746fc2dba89832dbdefc609a 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -73,7 +73,7 @@ function node_type_form(&$form_state, $type = NULL) {
     '#title' => t('Name'),
     '#type' => 'textfield',
     '#default_value' => $type->name,
-    '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>create content</em> page. It is recommended that this name begins with a capital letter and consists only of letters, numbers, and <strong>spaces</strong>. This name must be unique to this content type.'),
+    '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>create content</em> page. This name must begin with a capital letter and contain only letters, numbers, and <strong>spaces</strong>. This name must be unique.'),
     '#required' => TRUE,
   );
 
@@ -84,7 +84,7 @@ function node_type_form(&$form_state, $type = NULL) {
       '#default_value' => $type->type,
       '#maxlength' => 32,
       '#required' => TRUE,
-      '#description' => t('The machine-readable name of this content type. This text will be used for constructing the URL of the <em>create content</em> page for this content type. This name may consist of only of lowercase letters, numbers, and underscores. Hyphens are not allowed. Underscores will be converted into hyphens when constructing the URL of the <em>create content</em> page. This name must be unique to this content type.'),
+      '#description' => t('The machine-readable name of this content type. This text will be used for constructing the URL of the <em>create content</em> page for this content type. This name must contain only lowercase letters, numbers, and underscores. Underscores will be converted into hyphens when constructing the URL of the <em>create content</em> page. This name must be unique.'),
     );
   }
   else {
@@ -232,7 +232,7 @@ function node_type_form_validate($form, &$form_state) {
       form_set_error('type', t('The machine-readable name %type is already taken.', array('%type' => $type->type)));
     }
     if (!preg_match('!^[a-z0-9_]+$!', $type->type)) {
-      form_set_error('type', t('The machine-readable name can only consist of lowercase letters, underscores, and numbers.'));
+      form_set_error('type', t('The machine-readable name must contain only lowercase letters, numbers, and underscores.'));
     }
     // The type cannot be just the character '0', since elsewhere we check it using empty().
     if ($type->type === '0') {
diff --git a/modules/system/system.install b/modules/system/system.install
index 97f32e095414e1634bde9a3ca515088deaf6856d..bd5a20f23e0332a14f1b40eadc196e8119371459 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -952,7 +952,7 @@ function system_schema() {
         'not null' => FALSE)
       ),
     'primary key' => array('filename'),
-    'indexes' => 
+    'indexes' =>
       array(
         'modules' => array(array('type', 12), 'status', 'weight', 'filename'),
         'bootstrap' => array(array('type', 12), 'status', 'bootstrap', 'weight', 'filename'),
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 1f6c1eed091638c62398beea37af6507e4a0172b..9d0c08ade60cc10d412102a6e529085e0f2f59fe 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -347,7 +347,7 @@ function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
   $vocabulary = taxonomy_vocabulary_load($vid);
   $help = ($help) ? $help : $vocabulary->help;
   $blank = 0;
-  
+
   if (!$vocabulary->multiple) {
     $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
   }
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index 4a4b9339ad67310b53f10896ac8f2bde9d17be7f..74f1db504e75ce90660006c0562f1332e20e1932 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -77,7 +77,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
 
 /**
  * Render a taxonomy term page HTML output.
- * 
+ *
  * @param $tids
  *   An array of term ids.
  * @param $result
@@ -85,7 +85,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
  */
 function theme_taxonomy_term_page($tids, $result) {
   $output = '';
-  
+
   // Only display the description if we have a single term, to avoid clutter and confusion.
   if (count($tids) == 1) {
     $term = taxonomy_get_term($tids[0]);
@@ -93,9 +93,9 @@ function theme_taxonomy_term_page($tids, $result) {
     $output .= filter_xss_admin($term->description);
     $output .= '</div>';
   }
-  
+
   $output .= taxonomy_render_nodes($result);
-  
+
   return $output;
 }
 
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index 44036b96951fb8d8c98abaf1a3b84823b0057e5a..e3722e376d8fe77be35635c98ae35d229726b04a 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -51,7 +51,7 @@ function trigger_menu() {
     'page arguments' => array('node'),
     'access arguments' => array('node'),
     'type' => MENU_LOCAL_TASK,
-  	'file' => 'trigger.admin.inc',
+    'file' => 'trigger.admin.inc',
   );
   $items['admin/build/trigger/user'] = array(
     'title' => 'Users',
@@ -59,7 +59,7 @@ function trigger_menu() {
     'page arguments' => array('user'),
     'access arguments' => array('user'),
     'type' => MENU_LOCAL_TASK,
-  	'file' => 'trigger.admin.inc',
+    'file' => 'trigger.admin.inc',
   );
   $items['admin/build/trigger/comment'] = array(
     'title' => 'Comments',
@@ -68,7 +68,7 @@ function trigger_menu() {
     'access callback' => 'trigger_access_check',
     'access arguments' => array('comment'),
     'type' => MENU_LOCAL_TASK,
-  	'file' => 'trigger.admin.inc',
+    'file' => 'trigger.admin.inc',
   );
   $items['admin/build/trigger/taxonomy'] = array(
     'title' => 'Categories',