Ticket #19020: 19020-call-me-multisite.diff

wp-includes/ms-functions.php

@@ -1 +1 @@
 <?php
 /**
- * Multi-site WordPress API
+ * Multisite WordPress API
  *
  * @package WordPress
  * @subpackage Multisite

wp-admin/includes/admin.php

@@ -58 +58 @@
 /** 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');

wp-admin/my-sites.php

@@ -37 +37 @@
 
 add_contextual_help($current_screen,
         '<p>' . __('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.') . '</p>' .
-        '<p>' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
+        '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
 );
 
 get_current_screen()->set_help_sidebar(

wp-admin/themes.php

@@ -48 +48 @@
 
 if ( current_user_can( 'install_themes' ) ) {
         if ( is_multisite() ) {
-                $help_install = '<p>' . __('Installing themes on MultiSite can only be done from the Network Admin section.') . '</p>';
+                $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
         } else {
                 $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. 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&#8217;re free!'), 'http://wordpress.org/extend/themes/' ) . '</p>';
         }