From bc0f0de8a0a21f21c5a03ce855826ab881c7342b Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 1 Dec 2011 01:33:26 +0000
Subject: [PATCH] Help tweaks for comments, media, edit.php, update-core.php.
 props jane, see #19020.

git-svn-id: https://develop.svn.wordpress.org/trunk@19511 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-comments.php |  8 ++++----
 wp-admin/edit.php          | 22 ++++++++++++++--------
 wp-admin/media-upload.php  | 12 +++---------
 wp-admin/update-core.php   | 10 +++++++++-
 wp-admin/upload.php        |  6 +++---
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index ec0b020c03..bd37f7f887 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -112,14 +112,14 @@ else
 add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
 
 get_current_screen()->add_help_tab( array(
-'id'		=> 'managing-comments',
-'title'		=> __('Managing Comments'),
+'id'		=> 'overview',
+'title'		=> __('Overview'),
 'content'	=> 
 	'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
-'id'		=> 'comments-table',
-'title'		=> __('Comments Table'),
+'id'		=> 'moderating-comments',
+'title'		=> __('Moderating Comments'),
 'content'	=> 
 	'<ul>' .
 		'<li>' . __( 'A yellow row means the comment is waiting for you to moderate it.' ) . '</li>' .
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index f5237e3542..8171b04f10 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -149,12 +149,17 @@ wp_enqueue_script('inline-edit-post');
 $title = $post_type_object->labels->name;
 
 if ( 'post' == $post_type ) {
-
 	get_current_screen()->add_help_tab( array(
-	'id'		=> 'layout',
-	'title'		=> __('Layout'),
+	'id'		=> 'overview',
+	'title'		=> __('Overview'),
 	'content'	=> 
-		'<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
+		'<p>' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '</p>'
+	) );
+	get_current_screen()->add_help_tab( array(
+	'id'		=> 'screen-content',
+	'title'		=> __('Screen Content'),
+	'content'	=> 
+		'<p>' . __('You can customize the display of this screen&#8217;s contents in a number of ways:') . '</p>' .
 		'<ul>' .
 			'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
 			'<li>' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '</li>' .
@@ -164,7 +169,7 @@ if ( 'post' == $post_type ) {
 	) );
 	get_current_screen()->add_help_tab( array(
 	'id'		=> 'action-links',
-	'title'		=> __('Action Links'),
+	'title'		=> __('Available Actions'),
 	'content'	=> 	
 		'<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
 		'<ul>' .
@@ -175,10 +180,11 @@ if ( 'post' == $post_type ) {
 		'</ul>' 
 	) );
 	get_current_screen()->add_help_tab( array(
-	'id'		=> 'edit-multiple-posts',
-	'title'		=> __('Edit Multiple Posts'),
+	'id'		=> 'bulk-actions',
+	'title'		=> __('Bulk Actions'),
 	'content'	=> 
-		'<p>' . __('You can also edit multiple posts at once. Select the posts you want to edit using the checkboxes, select Edit from the Bulk Actions menu and click Apply. You will be able to change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
+		'<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
+				'<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
 	) );
 
 	get_current_screen()->set_help_sidebar(
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 68f7588d51..fb1eda5536 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -61,16 +61,10 @@ if ( isset($_GET['inline']) ) {
 	$title = __('Upload New Media');
 	$parent_file = 'upload.php';
 	get_current_screen()->add_help_tab( array(
-	'id'		=> 'adding-media',
-	'title'		=> __('Adding Media'),
+	'id'		=> 'overview',
+	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'editing-new-media',
-	'title'		=> __('Editing New Media'),
-	'content'	=>
-		'<p>' . __('There are three options for uploading files:') .  
+		'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
 		'<ul>' .
 			'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
 			'<li>' . __('<strong>Select Files</strong> will open the multi-file uploader, or you can use the <strong>Browser Uploader</strong>.') . '</li>' .
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index d4b0e31e9a..fb2dde0be2 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -427,11 +427,19 @@ get_current_screen()->add_help_tab( array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=> 	
-	'<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' .
+	'<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification.') . '</p>' .
+	'<p>' . __('It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>'
+) );
+
+get_current_screen()->add_help_tab( array(
+'id'		=> 'how-to-update',
+'title'		=> __('How to Update'),
+'content'	=> 	
 	'<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '</p>' .
 	'<p>' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>'
 ) );
 
+
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __('For more information:') . '</strong></p>' .
 	'<p>' . __('<a href="http://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>') . '</p>' .
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 867450b385..20d3e30aa2 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -154,13 +154,13 @@ get_current_screen()->add_help_tab( array(
 ) );
 get_current_screen()->add_help_tab( array(
 'id'		=> 'actions-links',
-'title'		=> __('Action Links'),
+'title'		=> __('Available Actions'),
 'content'	=>
 	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
-'id'		=> 'attach-media-files',
-'title'		=> __('Attach Media Files'),
+'id'		=> 'attaching-files',
+'title'		=> __('Attaching Files'),
 'content'	=>
 	'<p>' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '</p>'
 ) );