Fixup the help text for top level commands; move terminal to set terminal

(cherry picked from commit 2f6c8ec6f68d44503ee20ad655dd89efa55678cd)

15 files changed, 10 insertions, 9 deletions

diff --git a/templates/copy/node.def b/templates/copy/node.def
index 9557b10..eb33037 100644
--- a/templates/copy/node.def
+++ b/templates/copy/node.def
@@ -1 +1 @@
-help: Copy data
+help: Copy an object
diff --git a/templates/delete/node.def b/templates/delete/node.def
index 80b977d..3bccce3 100644
--- a/templates/delete/node.def
+++ b/templates/delete/node.def
@@ -1 +1 @@
-help: Delete a file
+help: Delete an object
diff --git a/templates/rename/node.def b/templates/rename/node.def
index b2270fd..9bbaa03 100644
--- a/templates/rename/node.def
+++ b/templates/rename/node.def
@@ -1 +1 @@
-help:  Re-name something.
+help:  Rename an object
diff --git a/templates/set/node.def b/templates/set/node.def
index fd82b17..e47b893 100644
--- a/templates/set/node.def
+++ b/templates/set/node.def
@@ -1 +1 @@
-help: Set system or shell options
+help: Set operational options
diff --git a/templates/terminal/key/node.def b/templates/set/terminal/key/node.def
index be435af..be435af 100644
--- a/templates/terminal/key/node.def
+++ b/templates/set/terminal/key/node.def
diff --git a/templates/terminal/key/query-help/node.def b/templates/set/terminal/key/query-help/node.def
index c15f556..c15f556 100644
--- a/templates/terminal/key/query-help/node.def
+++ b/templates/set/terminal/key/query-help/node.def
diff --git a/templates/terminal/key/query-help/node.tag/node.def b/templates/set/terminal/key/query-help/node.tag/node.def
index dd27db3..8ea9fbf 100644
--- a/templates/terminal/key/query-help/node.tag/node.def
+++ b/templates/set/terminal/key/query-help/node.tag/node.def
@@ -1,6 +1,6 @@
 help: Enable/disable getting help using question mark (default enabled)
 allowed: echo -n 'enable' 'disable'
-run: if [ "$4" == 'disable' ]; then
+run: if [ "$5" == 'disable' ]; then
        sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
        echo "bind '\"?\": self-insert' # vyatta key binding" >> $HOME/.bashrc
        bind '"?": self-insert'
diff --git a/templates/terminal/length/node.def b/templates/set/terminal/length/node.def
index 3e24898..3e24898 100644
--- a/templates/terminal/length/node.def
+++ b/templates/set/terminal/length/node.def
diff --git a/templates/terminal/length/node.tag/node.def b/templates/set/terminal/length/node.tag/node.def
index 3dfae2b..42a0726 100644
--- a/templates/terminal/length/node.tag/node.def
+++ b/templates/set/terminal/length/node.tag/node.def
@@ -1,7 +1,7 @@
 help: Set terminal to given number of rows (0 disables paging)
 allowed: echo -n '<NUMBER>'
-run: if [ "$3" -eq 0 ] ; then
+run: if [ "$4" -eq 0 ] ; then
 	VYATTA_PAGER=cat
      else
-	stty rows $3
+	stty rows $4
      fi
diff --git a/templates/terminal/node.def b/templates/set/terminal/node.def
index cdc1793..cdc1793 100644
--- a/templates/terminal/node.def
+++ b/templates/set/terminal/node.def
diff --git a/templates/terminal/pager/node.def b/templates/set/terminal/pager/node.def
index d2d414d..d2d414d 100644
--- a/templates/terminal/pager/node.def
+++ b/templates/set/terminal/pager/node.def
diff --git a/templates/terminal/pager/node.tag/node.def b/templates/set/terminal/pager/node.tag/node.def
index fe2226e..dd5a3de 100644
--- a/templates/terminal/pager/node.tag/node.def
+++ b/templates/set/terminal/pager/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Set terminal pager
 allowed: echo -n '<PROGRAM>'
-run: VYATTA_PAGER=$3
+run: VYATTA_PAGER=$4
diff --git a/templates/terminal/width/node.def b/templates/set/terminal/width/node.def
index ddbc07d..ddbc07d 100644
--- a/templates/terminal/width/node.def
+++ b/templates/set/terminal/width/node.def
diff --git a/templates/terminal/width/node.tag/node.def b/templates/set/terminal/width/node.tag/node.def
index c40bfd7..792f34a 100644
--- a/templates/terminal/width/node.tag/node.def
+++ b/templates/set/terminal/width/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Set terminal to given number of columns
 allowed: echo -n '<NUMBER>'
-run: stty columns $3
+run: stty columns $4
diff --git a/templates/update/node.def b/templates/update/node.def
new file mode 100644
index 0000000..fad412c
--- /dev/null
+++ b/templates/update/node.def
@@ -0,0 +1 @@
+help: Update data for a service