From 4a3f63f64149916c36f4d64edfe6edcb30d359a9 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Sat, 6 Aug 2016 18:54:30 +0900
Subject: [PATCH] Update help and error message

---
 command/alloc_status.go                               | 6 +++---
 command/eval_status.go                                | 6 +++---
 command/node_status.go                                | 6 +++---
 website/source/docs/commands/alloc-status.html.md.erb | 4 ++--
 website/source/docs/commands/eval-status.html.md.erb  | 4 ++--
 website/source/docs/commands/node-status.html.md.erb  | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/command/alloc_status.go b/command/alloc_status.go
index ff9af16a3..fb990f6b9 100644
--- a/command/alloc_status.go
+++ b/command/alloc_status.go
@@ -45,10 +45,10 @@ Alloc Status Options:
     Show full information.
 
   -json
-    Display information with json format.
+    Output the allocation in its JSON format.
 
   -t
-    Set golang templates format and display information with it.
+    Format and display allocation using a Go template.
 `
 
 	return strings.TrimSpace(helpText)
@@ -155,7 +155,7 @@ func (c *AllocStatusCommand) Run(args []string) int {
 
 		out, err := f.TransformData(alloc)
 		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error transform the data: %s", err))
+			c.Ui.Error(fmt.Sprintf("Error formatting the data: %s", err))
 			return 1
 		}
 		c.Ui.Output(out)
diff --git a/command/eval_status.go b/command/eval_status.go
index 88799d3fd..ded72454b 100644
--- a/command/eval_status.go
+++ b/command/eval_status.go
@@ -33,10 +33,10 @@ Eval Status Options:
     Show full information.
 
   -json
-    Display information with json format.
+    Output the evaluation in its JSON format.
 
   -t
-    Set golang templates format and display information with it.
+    Format and display evaluation using a Go template.
 `
 
 	return strings.TrimSpace(helpText)
@@ -149,7 +149,7 @@ func (c *EvalStatusCommand) Run(args []string) int {
 
 		out, err := f.TransformData(eval)
 		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error transform the data: %s", err))
+			c.Ui.Error(fmt.Sprintf("Error formatting the data: %s", err))
 			return 1
 		}
 		c.Ui.Output(out)
diff --git a/command/node_status.go b/command/node_status.go
index 13d4a154c..2a5c007b4 100644
--- a/command/node_status.go
+++ b/command/node_status.go
@@ -70,10 +70,10 @@ Node Status Options:
     Display full information.
 
   -json
-    Display information with json format.
+    Output the node in its JSON format.
 
   -t
-    Set golang templates format and display information with it.
+    Format and display node using a Go template.
 `
 	return strings.TrimSpace(helpText)
 }
@@ -242,7 +242,7 @@ func (c *NodeStatusCommand) Run(args []string) int {
 
 		out, err := f.TransformData(node)
 		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error transform the data: %s", err))
+			c.Ui.Error(fmt.Sprintf("Error formatting the data: %s", err))
 			return 1
 		}
 		c.Ui.Output(out)
diff --git a/website/source/docs/commands/alloc-status.html.md.erb b/website/source/docs/commands/alloc-status.html.md.erb
index bd475ca8c..a42a726bd 100644
--- a/website/source/docs/commands/alloc-status.html.md.erb
+++ b/website/source/docs/commands/alloc-status.html.md.erb
@@ -31,8 +31,8 @@ allocations and information will be displayed.
 
 * `-short`: Display short output. Shows only the most recent task event.
 * `-verbose`: Show full information.
-* `-json` : Display information with json format.
-* `-t` : Set golang templates format and display information with it.
+* `-json` : Output the allocation in its JSON format.
+* `-t` : Format and display allocation using a Go template.
 
 ## Examples
 
diff --git a/website/source/docs/commands/eval-status.html.md.erb b/website/source/docs/commands/eval-status.html.md.erb
index e97d45d44..74fa5d11d 100644
--- a/website/source/docs/commands/eval-status.html.md.erb
+++ b/website/source/docs/commands/eval-status.html.md.erb
@@ -48,9 +48,9 @@ indicated by exit code 1.
 
 * `-verbose`: Show full information.
 
-* `-json` : Display information with json format.
+* `-json` : Output the evaluation in its JSON format.
 
-* `-t` : Set golang templates format and display information with it.
+* `-t` : Format and display evaluation using a Go template.
 
 ## Examples
 
diff --git a/website/source/docs/commands/node-status.html.md.erb b/website/source/docs/commands/node-status.html.md.erb
index df2d42033..d55628359 100644
--- a/website/source/docs/commands/node-status.html.md.erb
+++ b/website/source/docs/commands/node-status.html.md.erb
@@ -45,9 +45,9 @@ information will be displayed. If running the command on a Nomad Client, the
 
 * `-verbose`: Show full information.
 
-* `-json` : Display information with json format.
+* `-json` : Output the node in its JSON format.
 
-* `-t` : Set golang templates format and display information with it.
+* `-t` : Format and display node using a Go template.
 
 
 ## Examples