<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15129] trunk/wp-admin: Some MS help string cleanup and standardization.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15129">15129</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-03 18:55:52 +0000 (Thu, 03 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some MS help string cleanup and standardization. fixes <a href="http://trac.wordpress.org/ticket/13467">#13467</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (15128 => 15129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-06-03 17:28:27 UTC (rev 15128)
+++ trunk/wp-admin/ms-options.php 2010-06-03 18:55:52 UTC (rev 15129)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
</span><span class="cx"> '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
</span><span class="cx"> '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
</span><del>- '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Super Admin > Users and click on Username or the Edit hover link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>' .
</del><ins>+ '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Super Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Options_SubPanel">Network Options Documentation</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (15128 => 15129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-06-03 17:28:27 UTC (rev 15128)
+++ trunk/wp-admin/ms-sites.php 2010-06-03 18:55:52 UTC (rev 15129)
</span><span class="lines">@@ -20,30 +20,29 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
</span><span class="cx"> add_contextual_help($current_screen,
</span><del>- '<p>' . __('The network admin arrives at this screen to make choices for a given site by clicking on the Edit link on the Sites screen available to them in the Super Admin navigation menu.') . '</p>' .
- '<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing the Site User(s) roles and passwords for that site, Adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
</del><ins>+ '<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing user roles and passwords for that site, adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
</ins><span class="cx"> '<p>' . __('Note that some fields in Site Options are grayed out and say Serialized Data. These are stored values in the database which you cannot change from here.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Sites_Edit_Site">Site Editing Documentation</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins>+ '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_Edit_Site">Site Editing Documentation</a>') . '</p>' .
+ '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> } else {
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
</span><span class="cx"> '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
</span><del>- '<p>' . __('Hovering over each site reveals seven options (only three for the primary or originating site for the network):') . '</p>' .
</del><ins>+ '<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
</ins><span class="cx"> '<ul><li>' . __('an Edit link to a separate Edit Site screen.') . '</li>' .
</span><span class="cx"> '<li>' . __('Backend means the Dashboard for that site.') . '</li>' .
</span><del>- '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later by hover links attached to those sites in this table.') . '</li>' .
</del><ins>+ '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
</ins><span class="cx"> '<li>' . __('Delete which is a permanent action after the confirmations screen.') . '</li>' .
</span><span class="cx"> '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
</span><del>- '<p>' . __('The site ID is used internally, and not shown on the front end of the site or to users/viewers.') . '</p>' .
</del><ins>+ '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '</p>' .
</span><del>- '<p>' . __('Clicking on Add Site after filling out the address, title, and email adds that new site instantly to the network and this table. You may want to then click on the hover link to edit options for that site.') . '</p>' .
- '<p>' . __('Make sure you do not add slashes or dots when you fill in the new site name. If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>' .
</del><ins>+ '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's email address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' .
+ '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Sites Documentation</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins>+ '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Sites Documentation</a>') . '</p>' .
+ '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (15128 => 15129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-06-03 17:28:27 UTC (rev 15128)
+++ trunk/wp-admin/ms-themes.php 2010-06-03 18:55:52 UTC (rev 15129)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
</span><span class="cx"> '<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
</span><del>- '<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen you go to via the Edit hover link on the Sites screen.') . '</p>' .
</del><ins>+ '<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen you go to via the Edit action link on the Sites screen.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Themes_SubPanel">Network Themes Documentation</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span></span></pre>
</div>
</div>
</body>
</html>