Help text tweaks for the Settings screens. props jane. see #19020.

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

wp-admin/options-discussion.php

@@ -16,8 +16,8 @@ $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-discussion',
-	'title'   => __('Discussion Options'),
+	'id'      => 'overview',
+	'title'   => __('Overview'),
 	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
 		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );

wp-admin/options-general.php

@@ -70,8 +70,8 @@ $options_help .= '<p>' . __('UTC means Coordinated Universal Time.') . '</p>' .
 	'<p>' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options',
-	'title'   => __('Options'),
+	'id'      => 'overview',
+	'title'   => __('Overview'),
 	'content' => $options_help,
 ) );
 

wp-admin/options-media.php

@@ -16,17 +16,22 @@ $title = __('Media Settings');
 $parent_file = 'options-general.php';
 
 $media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>' .
-	'<p>' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '</p>';
+	'<p>' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.');
+
+if ( ! empty( $content_width ) )
+	$media_options_help .= ' ' . __( 'If you do not set the maximum embed size, it will be automatically sized to fit into your content area.' );
+
+$media_options_help .= '</p>';
 
 if ( ! is_multisite() ) {
-	$media_options_help .= '<p>' . __('Uploading Options gives you folder and path choices for storing your files in your installation&#8217;s directory.') . '</p>';
+	$media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
 }
 
 $media_options_help .= '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-media',
-	'title'   => __('Media Options'),
+	'id'      => 'overview',
+	'title'   => __('Overview'),
 	'content' => $media_options_help,
 ) );
 

wp-admin/options-permalink.php

@@ -16,12 +16,26 @@ $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-permalinks',
-	'title'   => __('Permalink Options'),
-	'content' => '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
+	'id'      => 'overview',
+	'title'   => __('Overview'),
+	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
+		'<p>' . __('This screen provides allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '</p>' .
+		'<p>' . __('When making changes, you must click the Save Changes button at the bottom of the screen for the new settings to take effect.') . '</p>',
+) );
+
+get_current_screen()->add_help_tab( array(
+	'id'      => 'common-settings',
+	'title'   => __('Common Settings'),
+	'content' => '<p>' . __('Many people choose to use &#8220;pretty permalinks,&#8221; URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure.') . '</p>' .
 		'<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by <code>%</code>, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
 		'<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
-		'<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
+		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
+) );
+
+get_current_screen()->add_help_tab( array(
+	'id'      => 'custom-structures',
+	'title'   => __('Custom Structures'),
+	'content' => '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
 		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );
 
@@ -176,7 +190,7 @@ $structures = array(
 	4 => $prefix . '/%postname%/',
 );
 ?>
-<h3><?php _e('Common settings'); ?></h3>
+<h3><?php _e('Common Settings'); ?></h3>
 <table class="form-table">
 	<tr>
 		<th><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>

wp-admin/options-privacy.php

@@ -16,11 +16,10 @@ $title = __('Privacy Settings');
 $parent_file = 'options-general.php';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-privacy',
-	'title'   => __('Privacy Options'),
-	'content' => '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the second option here. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
-		'<p>' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
+	'id'      => 'overview',
+	'title'   => __('Overview'),
+	'content' => '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the radio button next to &#8220;Ask search engines not to index this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
+		'<p>' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>',
 ) );
 
 get_current_screen()->set_help_sidebar(

wp-admin/options-reading.php

@@ -42,8 +42,8 @@ function add_js() {
 add_action('admin_head', 'add_js');
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-reading',
-	'title'   => __('Reading Options'),
+	'id'      => 'overview',
+	'title'   => __('Overview'),
 	'content' => '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
 		'<p>' . sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '</p>' .
 		'<p>' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display, whether to show full text or a summary, and the character set encoding.') . '</p>' .

wp-admin/options-writing.php

@@ -16,9 +16,9 @@ $title = __('Writing Settings');
 $parent_file = 'options-general.php';
 
 get_current_screen()->add_help_tab( array(
-	'id'      => 'options-writing',
-	'title'   => __('Writing Options'),
-	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within these administration screens, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
+	'id'      => 'overview',
+	'title'   => __('Overview'),
+	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
 		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );