Help tweaks for users, tools. props jane, see #19020.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19509 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/export.php

@@ -39,8 +39,8 @@ function add_js() {
 add_action( 'admin_head', 'add_js' );
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'export',
+	'id'      => 'overview',
-	'title'   => __('Export'),
+	'title'   => __('Overview'),
 	'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to  limit the export by category, author, date range by month, or publishing status.') . '</p>' .
 		'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
 ) );
@@ -125,7 +125,7 @@ function export_date_options() {
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import this site.'); ?></p>
+<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.'); ?></p>
 
 <h3><?php _e( 'Choose what to export' ); ?></h3>
 <form action="" method="get" id="export-filters">

wp-admin/import.php

@@ -17,8 +17,8 @@ if ( !current_user_can('import') )
 $title = __('Import');
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'import',
+	'id'      => 'overview',
-	'title'   => __('Import'),
+	'title'   => __('Overview'),
 	'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
 		'<p>' . __('In previous versions of WordPress, all importers were built-in.  They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
 ) );
@@ -130,7 +130,7 @@ if ( empty($importers) ) {
 }
 
 if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
 ?>
 
 </div>

wp-admin/tools.php

@@ -18,8 +18,9 @@ get_current_screen()->add_help_tab( array(
 ) );
 get_current_screen()->add_help_tab( array(
 	'id'      => 'converter',
-	'title'   => __('Categories Tags Converter'),
+	'title'   => __('Categories and Tags Converter'),
-	'content' => '<p>' . __('The &#8220;Use This&#8221; link for the Categories and Tags Converter will take you to the Import page, where that Converter is one of the plugins you can download. Once that plugin is installed, the link on this page takes you to a screen where you can choose to convert tags into categories or vice versa.') . '</p>',
+	'content' => '<p>' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierachy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
+	'<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen  and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
 ) );
 
 get_current_screen()->set_help_sidebar(
@@ -57,7 +58,7 @@ $tags = get_taxonomy('post_tag');
 if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
 <div class="tool-box">
     <h3 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h3>
-    <p><?php printf( __('<a href="%s">Use this</a> to convert categories to tags or tags to categories.'), 'import.php' ); ?></p>
+    <p><?php printf( __('If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.'), 'import.php' ); ?></p>
 </div>
 <?php
 endif;

wp-admin/user-edit.php

@@ -44,8 +44,8 @@ $profile_help = '<p>' . __('Your profile contains information about you (your &#
 	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'your-profile',
+	'id'      => 'overview',
-	'title'   => __('Your Profile'),
+	'title'   => __('Overview'),
 	'content' => $profile_help,
 ) );
 

wp-admin/user-new.php

@@ -139,20 +139,35 @@ $do_both = false;
 if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
 	$do_both = true;
 
+$help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
+
+if ( is_multisite() ) {
+	$help .= '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' .
+	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to recieve a welcome email.') . '</p>';
+} else {
+	$help .= '<p>' . __('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.') . '</p>' .
+	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>';
+}
+
+$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+
 get_current_screen()->add_help_tab( array(  
-'id'      => 'add-new-user', 
+	'id'      => 'overview', 
-'title'   => __('Adding New Users'), 
+	'title'   => __('Overview'), 
-'content' => '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
+	'content' => $help,
+) );
+
+get_current_screen()->add_help_tab( array(  
+'id'      => 'user-roles', 
+'title'   => __('User Roles'), 
+'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
 				'<ul>' .
 				'<li>' . __('Administrators have access to all the administration features.') . '</li>' .
 				'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.')  . '</li>' .
-				'<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
+				'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
 				'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
-				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
+				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
-				'</ul>' .
+				'</ul>'
-			( is_multisite() ? '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' : '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' ).
-			( is_multisite() ? '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to recieve a welcome email.') . '</p>' : '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>' ) .
-			 '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(

wp-admin/users.php

@@ -21,15 +21,15 @@ add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (sc
 
 // contextual help - choose Help on the top right of admin panel to preview this.
 get_current_screen()->add_help_tab( array( 
-	'id'      => 'screen-info',
+	'id'      => 'overview',
-	'title'   => __('Users List'), 
+	'title'   => __('Overview'), 
 	'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
 				 '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
 ) ) ;
 
 get_current_screen()->add_help_tab( array( 
-	'id'      => 'customize-display',
+	'id'      => 'screen-display',
-	'title'   => __('Customizing This Display'), 
+	'title'   => __('Screen Display'), 
 	'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' . 
 					'<ul>' . 
 					'<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' . 
@@ -38,15 +38,23 @@ get_current_screen()->add_help_tab( array(
 					'</ul>' 
 ) ); 
 
-get_current_screen()->add_help_tab( array( 
+$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' . 
-	'id'      => 'row-actions', 
-	'title'   => __('Action Links'), 
-	'content' => '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' . 
 	'<ul>' .
-					'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>' .
+	'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
-					( is_multisite() ? '<li>' . __('Remove allows you to remove a user from your site.  It does not delete their posts.') . '</li>' : '<li>' . __('Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts.') . '</li>' ) .
+
-					'</ul>' 
+if ( is_multisite() )
+	$help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their posts. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
+else
+	$help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
+
+$help .= '</ul>';
+
+get_current_screen()->add_help_tab( array( 
+	'id'      => 'actions', 
+	'title'   => __('Actions'), 
+	'content' => $help,
 ) );
+unset( $help );
 
 get_current_screen()->set_help_sidebar(
     '<p><strong>' . __('For more information:') . '</strong></p>' .