From 3e7d4c801207965e976fb60817ab6cc00aea4b89 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 3 Jun 2010 18:55:52 +0000 Subject: [PATCH] Some MS help string cleanup and standardization. fixes #13467. git-svn-id: http://svn.automattic.com/wordpress/trunk@15129 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/ms-options.php | 2 +- wp-admin/ms-sites.php | 21 ++++++++++----------- wp-admin/ms-themes.php | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index 886695fc6..36ca4fe15 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -27,7 +27,7 @@ add_contextual_help($current_screen, '

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

' . + '

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

' . '

' . __('For more information:') . '

' . '

' . __('Network Options Documentation') . '

' . '

' . __('Support Forums') . '

' diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index 5918071eb..a938818b6 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -20,30 +20,29 @@ $parent_file = 'ms-admin.php'; if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) { add_contextual_help($current_screen, - '

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

' . - '

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

' . + '

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

' . '

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

' . '

' . __('For more information:') . '

' . - '

' . __('Site Editing Documentation') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Site Editing Documentation') . '

' . + '

' . __('Support Forums') . '

' ); } else { add_contextual_help($current_screen, '

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

' . '

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

' . - '

' . __('Hovering over each site reveals seven options (only three for the primary or originating site for the network):') . '

' . + '

' . __('Hovering over each site reveals seven options (three for the primary site):') . '

' . '' . - '

' . __('The site ID is used internally, and not shown on the front end of the site or to users/viewers.') . '

' . + '

' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '

' . '

' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '

' . - '

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

' . - '

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

' . + '

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

' . + '

' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '

' . '

' . __('For more information:') . '

' . - '

' . __('Sites Documentation') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Sites Documentation') . '

' . + '

' . __('Support Forums') . '

' ); } diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php index 02eb5f61c..c47edfbf6 100644 --- a/wp-admin/ms-themes.php +++ b/wp-admin/ms-themes.php @@ -18,7 +18,7 @@ $parent_file = 'ms-admin.php'; add_contextual_help($current_screen, '

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

' . '

' . __('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’s Appearance > Themes screen.') . '

' . - '

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

' . + '

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

' . '

' . __('For more information:') . '

' . '

' . __('Network Themes Documentation') . '

' . '

' . __('Support Forums') . '

'