diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php index e6c3edfba..5f5190d8d 100644 --- a/wp-admin/includes/admin.php +++ b/wp-admin/includes/admin.php @@ -58,7 +58,7 @@ require_once(ABSPATH . 'wp-admin/includes/update.php'); /** WordPress Deprecated Administration API */ require_once(ABSPATH . 'wp-admin/includes/deprecated.php'); -/** WordPress Multi-Site support API */ +/** WordPress Multisite support API */ if ( is_multisite() ) { require_once(ABSPATH . 'wp-admin/includes/ms.php'); require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php'); diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php index 6f4396b72..8411387a6 100644 --- a/wp-admin/my-sites.php +++ b/wp-admin/my-sites.php @@ -37,7 +37,7 @@ $parent_file = 'index.php'; add_contextual_help($current_screen, '

' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '

' . - '

' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '

' + '

' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '

' ); get_current_screen()->set_help_sidebar( diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 0fac69fd5..13a440530 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -48,7 +48,7 @@ get_current_screen()->add_help_tab( array( if ( current_user_can( 'install_themes' ) ) { if ( is_multisite() ) { - $help_install = '

' . __('Installing themes on MultiSite can only be done from the Network Admin section.') . '

'; + $help_install = '

' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '

'; } else { $help_install = '

' . sprintf( __('If you would like to see more themes to choose from, click on the “Install Themes” tab and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'http://wordpress.org/extend/themes/' ) . '

'; } diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 1c7c69193..17e0e670b 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1,6 +1,6 @@