#191104 by keith.smith: (usability) change occurances of node to 'post' and 'content' as appropriate

7 files changed, 12 insertions, 12 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 987da8f14..8fd0e1ab4 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -761,8 +761,8 @@ function comment_save($edit) {
     }
   }
   else {
-    watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed node %subject.', array('%subject' => $edit['subject']), WATCHDOG_WARNING);
-    drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed node %subject.', array('%subject' => $edit['subject'])), 'error');
+    watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $edit['subject']), WATCHDOG_WARNING);
+    drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $edit['subject'])), 'error');
     return FALSE;
   }
 }
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 0bab2f47d..138881a34 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -57,8 +57,8 @@ function node_configure_validate($form, &$form_state) {
  * Menu callback: confirm rebuilding of permissions.
  */
 function node_configure_rebuild_confirm() {
-  return confirm_form(array(), t('Are you sure you want to rebuild node permissions on the site?'),
-                  'admin/content/node-settings', t('This will wipe all current node permissions and rebuild them based on current settings. Rebuilding the permissions may take a while so please be patient. This action cannot be undone.'), t('Rebuild permissions'), t('Cancel'));
+  return confirm_form(array(), t('Are you sure you want to rebuild the permissions on site content?'),
+                  'admin/content/node-settings', t('This action rebuilds all permissions on site content, and may be a lengthy process. This action cannot be undone.'), t('Rebuild permissions'), t('Cancel'));
 }
 
 /**
diff --git a/modules/node/node.module b/modules/node/node.module
index fb31befb2..6e048aeba 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2108,7 +2108,7 @@ function node_access_rebuild($batch_mode = FALSE) {
   }
 
   if (!isset($batch)) {
-    drupal_set_message(t('The node access table has been rebuilt.'));
+    drupal_set_message(t('Content permissions have been rebuilt.'));
     node_access_needs_rebuild(FALSE);
     cache_clear_all();
   }
@@ -2498,7 +2498,7 @@ function node_unpublish_by_keyword_action_form($context) {
   $form['keywords'] = array(
     '#title' => t('Keywords'),
     '#type' => 'textarea',
-    '#description' => t('The node will be unpublished if it contains any of the character sequences above. Use a comma-separated list of character sequences. Example: funny, bungee jumping, "Company, Inc.". Character sequences are case-sensitive.'),
+    '#description' => t('The post will be unpublished if it contains any of the character sequences above. Use a comma-separated list of character sequences. Example: funny, bungee jumping, "Company, Inc.". Character sequences are case-sensitive.'),
     '#default_value' => isset($context['keywords']) ? drupal_implode_tags($context['keywords']) : '',
   );
   return $form;
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 0c4541599..fe112af8c 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -407,7 +407,7 @@ function node_form_submit($form, &$form_state) {
   else {
     // In the unlikely case something went wrong on save, the node will be
     // rebuilt and node form redisplayed the same way as in preview.
-    drupal_set_message(t('The node could not be saved.'), 'error');
+    drupal_set_message(t('The post could not be saved.'), 'error');
   }
 }
 
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index c75bf55e2..d2e7a402e 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -95,12 +95,12 @@ function taxonomy_form_vocabulary(&$form_state, $edit = array()) {
   $form['multiple'] = array('#type' => 'checkbox',
     '#title' => t('Multiple select'),
     '#default_value' => $edit['multiple'],
-    '#description' => t('Allows nodes to have more than one term from this vocabulary (always true for free tagging).'),
+    '#description' => t('Allows posts to have more than one term from this vocabulary (always true for free tagging).'),
   );
   $form['required'] = array('#type' => 'checkbox',
     '#title' => t('Required'),
     '#default_value' => $edit['required'],
-    '#description' => t('If enabled, every node <strong>must</strong> have at least one term in this vocabulary.'),
+    '#description' => t('If enabled, every post <strong>must</strong> have at least one term in this vocabulary.'),
   );
   $form['weight'] = array('#type' => 'weight',
     '#title' => t('Weight'),
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc
index 20472d4a6..1d3603d9e 100644
--- a/modules/upload/upload.admin.inc
+++ b/modules/upload/upload.admin.inc
@@ -78,7 +78,7 @@ function upload_admin_settings() {
     '#title' => t('List files by default'),
     '#default_value' => variable_get('upload_list_default', 1),
     '#options' => array(0 => t('No'), 1 => t('Yes')),
-    '#description' => t('Set whether files attached to nodes are listed or not in the node view by default.'),
+    '#description' => t('Display attached files when viewing a post.'),
   );
 
   $form['settings_general']['upload_extensions_default'] = array(
@@ -149,4 +149,4 @@ function upload_admin_settings() {
   $form['#validate'] = array('upload_admin_settings_validate');
 
   return system_settings_form($form);
-}
\ No newline at end of file
+}
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 79eb321b9..1c9733ec7 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -13,7 +13,7 @@
 function upload_help($path, $arg) {
   switch ($path) {
     case 'admin/help#upload':
-      $output = '<p>'. t('The upload module allows users to upload files to the site. The ability to upload files to a site is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to a node or page.') .'</p>';
+      $output = '<p>'. t('The upload module allows users to upload files to the site. The ability to upload files to a site is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to posts.') .'</p>';
       $output .= '<p>'. t('Users with the upload files permission can upload attachments. You can choose which post types can take attachments on the content types settings page. Each user role can be customized for the file size of uploads, and the dimension of image files.') .'</p>';
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@upload">Upload page</a>.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>';
       return $output;