From 8b97fa9f156c40f2adb277f8ee42479fbb808145 Mon Sep 17 00:00:00 2001
From: scribu <mail@scribu.net>
Date: Sat, 26 Oct 2013 23:28:57 +0300
Subject: [PATCH] replace 'subcommand' with 'command' in doc strings and inline
 comments

see #848
---
 bin/wp                                     | 2 +-
 features/config.feature                    | 2 +-
 php/WP_CLI/Dispatcher/CompositeCommand.php | 4 ++--
 templates/man-params.mustache              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/wp b/bin/wp
index 4974e188..25ea35d2 100755
--- a/bin/wp
+++ b/bin/wp
@@ -40,7 +40,7 @@ else
 fi
 
 # Pass in the path to php so that wp-cli knows which one
-# to use if it re-launches itself to run subcommands
+# to use if it re-launches itself to run other commands.
 export WP_CLI_PHP_USED="$php"
 
 exec "$php" $WP_CLI_PHP_ARGS "$SCRIPT_PATH" "$@"
diff --git a/features/config.feature b/features/config.feature
index 42dfe081..6771d130 100644
--- a/features/config.feature
+++ b/features/config.feature
@@ -67,7 +67,7 @@ Feature: Have a config file
       wp-cli.yml
       """
 
-  Scenario: Disabled subcommands
+  Scenario: Disabled commands
     Given an empty directory
     And a config.yml file:
       """
diff --git a/php/WP_CLI/Dispatcher/CompositeCommand.php b/php/WP_CLI/Dispatcher/CompositeCommand.php
index 98cbbe73..f57d1f92 100644
--- a/php/WP_CLI/Dispatcher/CompositeCommand.php
+++ b/php/WP_CLI/Dispatcher/CompositeCommand.php
@@ -56,7 +56,7 @@ class CompositeCommand {
 	}
 
 	function get_synopsis() {
-		return '<subcommand>';
+		return '<command>';
 	}
 
 	function invoke( $args, $assoc_args ) {
@@ -75,7 +75,7 @@ class CompositeCommand {
 		}
 
 		\WP_CLI::line();
-		\WP_CLI::line( "See 'wp help $this->name <subcommand>' for more information on a specific subcommand." );
+		\WP_CLI::line( "See 'wp help $this->name <command>' for more information on a specific command." );
 	}
 
 	function find_subcommand( &$args ) {
diff --git a/templates/man-params.mustache b/templates/man-params.mustache
index 2d3383f5..990412b7 100644
--- a/templates/man-params.mustache
+++ b/templates/man-params.mustache
@@ -5,4 +5,4 @@
       {{desc}}
 
 {{/parameters}}
-Run 'wp help <subcommand>' to get more information on a specific command.
+Run 'wp help <command>' to get more information on a specific command.
-- 
2.11.0