4 files changed, 24 insertions, 29 deletions

diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 1de19e5798b..0d7c2fc33bd 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -71,7 +71,6 @@ yyerror(const char* s)
 %token ICE_GRID_SERVICE
 %token ICE_GRID_ENABLE
 %token ICE_GRID_DISABLE
-%token ICE_GRID_DUMP
 
 %%
 
@@ -291,13 +290,13 @@ command
 {
     parser->listAllNodes();
 }
-| ICE_GRID_NODE ICE_GRID_DUMP strings_and_log_filename ';'
+| ICE_GRID_NODE ICE_GRID_SHOW strings_and_log_filename ';'
 {
-    parser->dumpFile("node", $3);
+    parser->showFile("node", $3);
 }
-| ICE_GRID_NODE ICE_GRID_DUMP ICE_GRID_HELP ';'
+| ICE_GRID_NODE ICE_GRID_SHOW ICE_GRID_HELP ';'
 {
-    parser->usage("node", "dump");
+    parser->usage("node", "show");
 }
 | ICE_GRID_REGISTRY ICE_GRID_DESCRIBE optional_strings ';'
 {
@@ -327,13 +326,13 @@ command
 {
     parser->listAllRegistries();
 }
-| ICE_GRID_REGISTRY ICE_GRID_DUMP strings_and_log_filename ';'
+| ICE_GRID_REGISTRY ICE_GRID_SHOW strings_and_log_filename ';'
 {
-    parser->dumpFile("registry", $3);
+    parser->showFile("registry", $3);
 }
-| ICE_GRID_REGISTRY ICE_GRID_DUMP ICE_GRID_HELP ';'
+| ICE_GRID_REGISTRY ICE_GRID_SHOW ICE_GRID_HELP ';'
 {
-    parser->usage("registry", "dump");
+    parser->usage("registry", "show");
 }
 | ICE_GRID_SERVER ICE_GRID_REMOVE optional_strings ';'
 {
@@ -435,13 +434,13 @@ command
 {
     parser->listAllServers();
 }
-| ICE_GRID_SERVER ICE_GRID_DUMP strings_and_log_filename ';'
+| ICE_GRID_SERVER ICE_GRID_SHOW strings_and_log_filename ';'
 {
-    parser->dumpFile("server", $3);
+    parser->showFile("server", $3);
 }
-| ICE_GRID_SERVER ICE_GRID_DUMP ICE_GRID_HELP ';'
+| ICE_GRID_SERVER ICE_GRID_SHOW ICE_GRID_HELP ';'
 {
-    parser->usage("server", "dump");
+    parser->usage("server", "show");
 }
 | ICE_GRID_ADAPTER ICE_GRID_ENDPOINTS optional_strings ';'
 {
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index fba0141d978..d2c90f05048 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -87,9 +87,9 @@ static const char* _commandsHelp[][3] = {
 { "node", "load",
 "node load NAME            Print the load of the node NAME.\n" 
 },
-{ "node", "dump",
-"node dump [OPTIONS] NAME [stderr | stdout]\n"
-"                          Dump node NAME stderr or stdout.\n"
+{ "node", "show",
+"node show [OPTIONS] NAME [stderr | stdout]\n"
+"                          Show node NAME stderr or stdout.\n"
 "                          Options:\n"
 "                           -f | --follow: Wait for new data to be available\n"
 "                           -t N | --tail N: Print the last N lines\n"
@@ -107,9 +107,9 @@ static const char* _commandsHelp[][3] = {
 { "registry", "ping",
 "registry ping NAME        Ping registry NAME.\n" 
 },
-{ "registry", "dump",
-"registry dump [OPTIONS] NAME [stderr | stdout]\n" 
-"                          Dump registry NAME stderr or stdout.\n" 
+{ "registry", "show",
+"registry show [OPTIONS] NAME [stderr | stdout]\n" 
+"                          Show registry NAME stderr or stdout.\n" 
 "                          Options:\n"
 "                           -f | --follow: Wait for new data to be available\n"
 "                           -t N | --tail N: Print the last N lines\n"
@@ -151,9 +151,9 @@ static const char* _commandsHelp[][3] = {
 { "server", "stderr",
 "server stderr ID MESSAGE  Write MESSAGE on server ID's stderr.\n" 
 },
-{ "server", "dump",
-"server dump [OPTIONS] ID [stderr | stdout | LOGFILE ]\n"
-"                          Dump server ID stderr, stdout or log file LOGFILE.\n"
+{ "server", "show",
+"server show [OPTIONS] ID [stderr | stdout | LOGFILE ]\n"
+"                          Show server ID stderr, stdout or log file LOGFILE.\n"
 "                          Options:\n"
 "                           -f | --follow: Wait for new data to be available\n"
 "                           -t N | --tail N: Print the last N lines\n"
@@ -1423,7 +1423,7 @@ Parser::listObject(const list<string>& args)
 }
 
 void
-Parser::dumpFile(const string& reader, const list<string>& origArgs)
+Parser::showFile(const string& reader, const list<string>& origArgs)
 {
     list<string> copyArgs = origArgs;
     copyArgs.push_front("icegridadmin");
@@ -1450,7 +1450,7 @@ Parser::dumpFile(const string& reader, const list<string>& origArgs)
 
     if(args.size() != 2)
     {
-	invalidCommand(reader + " dump", "requires two arguments");
+	invalidCommand(reader + " show", "requires two arguments");
 	return;
     }
 
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 542f2c17650..acd6b3267e6 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -122,7 +122,7 @@ public:
     void describeObject(const std::list<std::string>&);
     void listObject(const std::list<std::string>&);
 
-    void dumpFile(const std::string&, const std::list<std::string>&);
+    void showFile(const std::string&, const std::list<std::string>&);
 
     void showBanner();
     void showCopying();
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index b32e5f3233c..b75b7e2def1 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -204,10 +204,6 @@ NL	[\n]
     return ICE_GRID_SHOW;
 }
 
-"dump" {
-    return ICE_GRID_DUMP;
-}
-
 "copying" {
     return ICE_GRID_COPYING;
 }