From f80b6092f89c6f9d496dec8535f09a7b517d8527 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 2 Jun 2010 05:53:24 +0000 Subject: [PATCH] MS help fixes. props dougwrites, see #13467. git-svn-id: http://svn.automattic.com/wordpress/trunk@15102 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/ms-options.php | 2 +- wp-admin/ms-users.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index eb27ed23ed..8d11b9bdd6 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -24,7 +24,7 @@ add_contextual_help($current_screen, '

' . __('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.') . '

' . '

' . __('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.') . '

' . '

' . __('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᾿s put in the first post, page, comment, comment author, and comment URL.') . '

' . - '

' . __('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).') . '

' . + '

' . __('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).') . '

' . '

' . __('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.') . '

' . '

' . __('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.') . '

' . '

' . __('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.') . '

' . diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php index 1edf2c381a..d422f1e99a 100644 --- a/wp-admin/ms-users.php +++ b/wp-admin/ms-users.php @@ -21,9 +21,9 @@ $parent_file = 'ms-admin.php'; add_contextual_help($current_screen, '

' . __('This table shows all users across the network and the sites to which they are assigned.') . '

' . '

' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '

' . - '

' . __('You can also go to the user’s profile page for by clicking on the individual Username.') . '

' . + '

' . __('You can also go to the user’s profile page by clicking on the individual username.') . '

' . '

' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '

' . - '

' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same emails.') . '

' . + '

' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '

' . '

' . __('Add User will add that person to this table and send them an email.') . '

' . '

' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '

' . '

' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '

' .