<!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>[15131] trunk/wp-admin: Help fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15131">15131</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-03 19:52:54 +0000 (Thu, 03 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Help fixes. props kpdesign, fixes <a href="http://trac.wordpress.org/ticket/13467">#13467</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<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="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (15130 => 15131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-06-03 18:58:41 UTC (rev 15130)
+++ trunk/wp-admin/ms-admin.php 2010-06-03 19:52:54 UTC (rev 15131)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> '<li>' . __('Blogs are now called Sites; Site is now called Network.') . '</li></ul>' .
</span><span class="cx"> '<p>' . __('This screen provides the network administrator with links to the screens for Sites and Users to either create a new site or user, or to search existing users and sites. Those screens are also accessible through the left-hand navigation in the Super Admin section.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Super_Admin_Menu">Network Admin 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_Super_Admin_Menu">Documentation on Super Admin Menu</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"> require_once( './admin-header.php' );
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (15130 => 15131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-06-03 18:58:41 UTC (rev 15130)
+++ trunk/wp-admin/ms-options.php 2010-06-03 19:52:54 UTC (rev 15131)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'manage_network_options' ) )
</span><del>- wp_die( __( 'You do not have permission to access this page.' ) );
</del><ins>+ wp_die( __( 'You do not have permission to access this page.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __( 'Network Options' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
</span><span class="cx"> '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
</span><del>- '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is subscribed but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
</del><ins>+ '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
</span><span class="cx"> '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
</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="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" />
</span><span class="cx"> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" />
</span><span class="cx"> <br />
</span><del>- <?php _e( 'Site path (&#8220;dashboard&#8221;, &#8220;control&#8221;, &#8220;manager&#8221;, etc.) or blog ID.<br />New users are added to this site as the user role defined below if they don&#8217;t have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?>
</del><ins>+ <?php _e( 'Site path (&#8220;dashboard&#8221;, &#8220;control&#8221;, &#8220;manager&#8221;, etc.) or blog ID.<br />New users are added to this site as the user role defined below if they don&#8217;t have a site. Leave blank for the main site. Users with the Subscriber role on the old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
</span><span class="cx"> <td>
</span><del>- <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
</del><ins>+ <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
</ins><span class="cx"> <?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea>
</span><span class="cx"> <br />
</span><span class="cx"> <?php _e( 'The welcome email sent to new users.' ) ?>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (15130 => 15131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-06-03 18:58:41 UTC (rev 15130)
+++ trunk/wp-admin/ms-sites.php 2010-06-03 19:52:54 UTC (rev 15131)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> '<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>' .
</span><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 target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_Edit_Site">Site Editing Documentation</a>') . '</p>' .
</del><ins>+ '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_Edit_Site">Documentation on Editing Sites</a>') . '</p>' .
</ins><span class="cx"> '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx"> } else {
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> '<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>' .
</span><span class="cx"> '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Sites Documentation</a>') . '</p>' .
</del><ins>+ '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Documentation on Sites</a>') . '</p>' .
</ins><span class="cx"> '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</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 (15130 => 15131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-06-03 18:58:41 UTC (rev 15130)
+++ trunk/wp-admin/ms-themes.php 2010-06-03 19:52:54 UTC (rev 15131)
</span><span class="lines">@@ -20,8 +20,8 @@
</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><span class="cx"> '<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>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Themes_SubPanel">Network Themes 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_Themes_SubPanel">Documentation on Network Themes</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"> require_once( './admin-header.php' );
</span></span></pre>
</div>
</div>
</body>
</html>