<!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>[19538] trunk: Standardize some final help strings.</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/19538">19538</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-12-02 04:31:01 +0000 (Fri, 02 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize some final help strings. We're done, aside from typos. props zeo, jane, duck_, fixes <a href="http://core.trac.wordpress.org/ticket/19020">#19020</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (19537 => 19538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2011-12-02 00:15:16 UTC (rev 19537)
+++ trunk/wp-admin/custom-background.php 2011-12-02 04:31:01 UTC (rev 19538)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> 'content' =>
</span><span class="cx"> '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
</span><del>- '<p>' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '</p>' .
</del><ins>+ '<p>' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Background Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '</p>' .
</ins><span class="cx"> '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (19537 => 19538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2011-12-02 00:15:16 UTC (rev 19537)
+++ trunk/wp-admin/index.php 2011-12-02 04:31:01 UTC (rev 19538)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
</span><span class="cx">
</span><span class="cx">
</span><del>-$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.' ) . '</p>';
</del><ins>+$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '</p>';
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (19537 => 19538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2011-12-02 00:15:16 UTC (rev 19537)
+++ trunk/wp-admin/options-general.php 2011-12-02 04:31:01 UTC (rev 19538)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $options_help .= '<p>' . __('UTC means Coordinated Universal Time.') . '</p>' .
</span><del>- '<p>' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
</del><ins>+ '<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">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (19537 => 19538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2011-12-02 00:15:16 UTC (rev 19537)
+++ trunk/wp-admin/options-permalink.php 2011-12-02 04:31:01 UTC (rev 19538)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 'title' => __('Overview'),
</span><span class="cx"> '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>' .
</span><span class="cx"> '<p>' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '</p>' .
</span><del>- '<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>',
</del><ins>+ '<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"> ) );
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (19537 => 19538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-12-02 00:15:16 UTC (rev 19537)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php 2011-12-02 04:31:01 UTC (rev 19538)
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register our settings field group
</span><del>- add_settings_section(
</del><ins>+ add_settings_section(
</ins><span class="cx"> 'general', // Unique identifier for the settings section
</span><span class="cx"> '', // Section title (we don't want one)
</span><del>- '__return_false', // Section callback (we don't want anything)
</del><ins>+ '__return_false', // Section callback (we don't want anything)
</ins><span class="cx"> 'theme_options' // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register our individual settings fields
</span><del>- add_settings_field(
</del><ins>+ add_settings_field(
</ins><span class="cx"> 'color_scheme', // Unique identifier for the field for this section
</span><span class="cx"> __( 'Color Scheme', 'twentyeleven' ), // Setting field label
</span><span class="cx"> 'twentyeleven_settings_field_color_scheme', // Function that renders the settings field
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx"> 'general' // Settings section. Same as the first argument in the add_settings_section() above
</span><span class="cx"> );
</span><span class="cx">
</span><del>- add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
- add_settings_field( 'layout', __( 'Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' );
</del><ins>+ add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
+ add_settings_field( 'layout', __( 'Default Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_init', 'twentyeleven_theme_options_init' );
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'title' => __( 'Overview', 'twentyeleven' ),
</span><span class="cx"> 'id' => 'theme-options-help',
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __( 'Some themes provide customization options that are grouped together on a Theme Options screen. If you change themes, options may change or disappear, as they are theme-specific. Your current theme, Twenty Eleven, provides the following Theme Options:', 'twentyeleven' ) . '</p>' .
</span><span class="cx"> '<ol>' .
</span><span class="cx"> '<li>' . __( '<strong>Color Scheme</strong>: You can choose a color palette of "Light" (light background with dark text) or "Dark" (dark background with light text) for your site.', 'twentyeleven' ) . '</li>' .
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Renders the Color Scheme setting field.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_settings_field_color_scheme() {
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Renders the Link Color setting field.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_settings_field_link_color() {
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Renders the Layout setting field.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_settings_field_layout() {
</span></span></pre>
</div>
</div>
</body>
</html>