Merge branch 'master' into 118-site-id

Author: schlessera

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "composer/semver": "^1.4",
-        "wp-cli/wp-cli": "^2.2"
+        "wp-cli/wp-cli": "dev-master"
     },
     "require-dev": {
         "wp-cli/checksum-command": "^1 || ^2",

src/Core_Command.php

@@ -432,7 +432,7 @@ public function install( $args, $assoc_args ) {
 	 */
 	public function multisite_convert( $args, $assoc_args ) {
 		if ( is_multisite() ) {
-			WP_CLI::error( 'This already is a multisite install.' );
+			WP_CLI::error( 'This already is a multisite installation.' );
 		}
 
 		$assoc_args = self::set_multisite_defaults( $assoc_args );
@@ -867,7 +867,7 @@ private static function get_wp_details( $abspath = ABSPATH ) {
 
 		if ( ! is_readable( $versions_path ) ) {
 			WP_CLI::error(
-				"This does not seem to be a WordPress install.\n" .
+				"This does not seem to be a WordPress installation.\n" .
 				'Pass --path=`path/to/wordpress` or run `wp core download`.'
 			);
 		}