Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Help fixes. props kpdesign, fixes #13467. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-06-03 19:52:54 +00:00
parent 3ba9fc235c
commit cce031d05f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/ms-admin.php
View File

@ -24,8 +24,8 @@ add_contextual_help($current_screen,
'<li>' . __('Blogs are now called Sites; Site is now called Network.') . '</li></ul>' .
'<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>' .
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<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>'
'<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>'
);
require_once( './admin-header.php' );

8
wp-admin/ms-options.php
View File

@ -13,7 +13,7 @@ if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_network_options' ) )
wp_die( __( 'You do not have permission to access this page.' ) );
wp_die( __( 'You do not have permission to access this page.' ) );
$title = __( 'Network Options' );
$parent_file = 'ms-admin.php';
@ -21,7 +21,7 @@ $parent_file = 'ms-admin.php';
add_contextual_help($current_screen,
'<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>' .
'<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
'<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>' .
'<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>' .
'<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>' .
'<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>' .
'<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>' .
@ -82,7 +82,7 @@ if (isset($_GET['updated'])) {
<input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" />
<input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" />
<br />
<?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.' ); ?>
<?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.' ); ?>
</td>
</tr>
<tr valign="top">
@ -191,7 +191,7 @@ if (isset($_GET['updated'])) {
<tr valign="top">
<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
<td>
<textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
<textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea>
<br />
<?php _e( 'The welcome email sent to new users.' ) ?>

4
wp-admin/ms-sites.php
View File

@ -23,7 +23,7 @@ if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
'<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>' .
'<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>' .
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<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://codex.wordpress.org/Super_Admin_Sites_Edit_Site">Documentation on Editing Sites</a>') . '</p>' .
'<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
);
} else {
@ -41,7 +41,7 @@ if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
'<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>' .
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Sites Documentation</a>') . '</p>' .
'<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel">Documentation on Sites</a>') . '</p>' .
'<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
);
}

4
wp-admin/ms-themes.php
View File

@ -20,8 +20,8 @@ add_contextual_help($current_screen,
'<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>' .
'<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>' .
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<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>'
'<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>'
);
require_once( './admin-header.php' );