<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19507] trunk/wp-admin: Help text tweaks for the Settings screens.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19507">19507</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-12-01 00:52:31 +0000 (Thu, 01 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Help text tweaks for the Settings screens. props jane. see <a href="http://core.trac.wordpress.org/ticket/19020">#19020</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsprivacyphp">trunk/wp-admin/options-privacy.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-discussion.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options-discussion',
- 'title' => __('Discussion Options'),
</del><ins>+ 'id' => 'overview',
+ 'title' => __('Overview'),
</ins><span class="cx"> '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>' .
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-general.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> '<p>' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options',
- 'title' => __('Options'),
</del><ins>+ 'id' => 'overview',
+ 'title' => __('Overview'),
</ins><span class="cx"> 'content' => $options_help,
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-media.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -16,17 +16,22 @@
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><span class="cx"> $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>' .
</span><del>- '<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>';
</del><ins>+ '<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.');
</ins><span class="cx">
</span><ins>+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>';
+
</ins><span class="cx"> if ( ! is_multisite() ) {
</span><del>- $media_options_help .= '<p>' . __('Uploading Options gives you folder and path choices for storing your files in your installation&#8217;s directory.') . '</p>';
</del><ins>+ $media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $media_options_help .= '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options-media',
- 'title' => __('Media Options'),
</del><ins>+ 'id' => 'overview',
+ 'title' => __('Overview'),
</ins><span class="cx"> 'content' => $media_options_help,
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-permalink.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -16,15 +16,29 @@
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options-permalinks',
- 'title' => __('Permalink Options'),
- 'content' => '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
</del><ins>+ '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>' .
</ins><span class="cx"> '<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>' .
</span><span class="cx"> '<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>' .
</span><del>- '<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>' .
</del><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+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>',
+) );
+
</ins><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Settings_Permalinks_Screen" target="_blank">Documentation on Permalinks Settings</a>') . '</p>' .
</span><span class="lines">@@ -176,7 +190,7 @@
</span><span class="cx"> 4 => $prefix . '/%postname%/',
</span><span class="cx"> );
</span><span class="cx"> ?>
</span><del>-<h3><?php _e('Common settings'); ?></h3>
</del><ins>+<h3><?php _e('Common Settings'); ?></h3>
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>
</span></span></pre></div>
<a id="trunkwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-privacy.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-privacy.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-privacy.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -16,11 +16,10 @@
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- '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>',
</del><ins>+ '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>',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-reading.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> add_action('admin_head', 'add_js');
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options-reading',
- 'title' => __('Reading Options'),
</del><ins>+ 'id' => 'overview',
+ 'title' => __('Overview'),
</ins><span class="cx"> 'content' => '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
</span><span class="cx"> '<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>' .
</span><span class="cx"> '<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>' .
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (19506 => 19507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2011-12-01 00:47:08 UTC (rev 19506)
+++ trunk/wp-admin/options-writing.php 2011-12-01 00:52:31 UTC (rev 19507)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- '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>' .
</del><ins>+ '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>' .
</ins><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>