From 24ba903cb2953183d32703e53daa68b59dd976d8 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 17 Aug 2011 19:46:21 -0500
Subject: Fixup the help text for top level commands; move terminal to set
 terminal (cherry picked from commit 2f6c8ec6f68d44503ee20ad655dd89efa55678cd)

---
 templates/copy/node.def                                 |  2 +-
 templates/delete/node.def                               |  2 +-
 templates/rename/node.def                               |  2 +-
 templates/set/node.def                                  |  2 +-
 templates/set/terminal/key/node.def                     |  1 +
 templates/set/terminal/key/query-help/node.def          |  1 +
 templates/set/terminal/key/query-help/node.tag/node.def | 10 ++++++++++
 templates/set/terminal/length/node.def                  |  1 +
 templates/set/terminal/length/node.tag/node.def         |  7 +++++++
 templates/set/terminal/node.def                         |  1 +
 templates/set/terminal/pager/node.def                   |  2 ++
 templates/set/terminal/pager/node.tag/node.def          |  3 +++
 templates/set/terminal/width/node.def                   |  1 +
 templates/set/terminal/width/node.tag/node.def          |  3 +++
 templates/terminal/key/node.def                         |  1 -
 templates/terminal/key/query-help/node.def              |  1 -
 templates/terminal/key/query-help/node.tag/node.def     | 10 ----------
 templates/terminal/length/node.def                      |  1 -
 templates/terminal/length/node.tag/node.def             |  7 -------
 templates/terminal/node.def                             |  1 -
 templates/terminal/pager/node.def                       |  2 --
 templates/terminal/pager/node.tag/node.def              |  3 ---
 templates/terminal/width/node.def                       |  1 -
 templates/terminal/width/node.tag/node.def              |  3 ---
 templates/update/node.def                               |  1 +
 25 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 templates/set/terminal/key/node.def
 create mode 100644 templates/set/terminal/key/query-help/node.def
 create mode 100644 templates/set/terminal/key/query-help/node.tag/node.def
 create mode 100644 templates/set/terminal/length/node.def
 create mode 100644 templates/set/terminal/length/node.tag/node.def
 create mode 100644 templates/set/terminal/node.def
 create mode 100644 templates/set/terminal/pager/node.def
 create mode 100644 templates/set/terminal/pager/node.tag/node.def
 create mode 100644 templates/set/terminal/width/node.def
 create mode 100644 templates/set/terminal/width/node.tag/node.def
 delete mode 100644 templates/terminal/key/node.def
 delete mode 100644 templates/terminal/key/query-help/node.def
 delete mode 100644 templates/terminal/key/query-help/node.tag/node.def
 delete mode 100644 templates/terminal/length/node.def
 delete mode 100644 templates/terminal/length/node.tag/node.def
 delete mode 100644 templates/terminal/node.def
 delete mode 100644 templates/terminal/pager/node.def
 delete mode 100644 templates/terminal/pager/node.tag/node.def
 delete mode 100644 templates/terminal/width/node.def
 delete mode 100644 templates/terminal/width/node.tag/node.def
 create mode 100644 templates/update/node.def

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/set/terminal/key/node.def b/templates/set/terminal/key/node.def
new file mode 100644
index 0000000..be435af
--- /dev/null
+++ b/templates/set/terminal/key/node.def
@@ -0,0 +1 @@
+help: Set key behaviors
diff --git a/templates/set/terminal/key/query-help/node.def b/templates/set/terminal/key/query-help/node.def
new file mode 100644
index 0000000..c15f556
--- /dev/null
+++ b/templates/set/terminal/key/query-help/node.def
@@ -0,0 +1 @@
+help: Enable/disable getting help using question mark
diff --git a/templates/set/terminal/key/query-help/node.tag/node.def b/templates/set/terminal/key/query-help/node.tag/node.def
new file mode 100644
index 0000000..8ea9fbf
--- /dev/null
+++ b/templates/set/terminal/key/query-help/node.tag/node.def
@@ -0,0 +1,10 @@
+help: Enable/disable getting help using question mark (default enabled)
+allowed: echo -n 'enable' 'disable'
+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'
+     else
+       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
+       bind '"?": possible-completions'
+     fi
diff --git a/templates/set/terminal/length/node.def b/templates/set/terminal/length/node.def
new file mode 100644
index 0000000..3e24898
--- /dev/null
+++ b/templates/set/terminal/length/node.def
@@ -0,0 +1 @@
+help: Set terminal rows
diff --git a/templates/set/terminal/length/node.tag/node.def b/templates/set/terminal/length/node.tag/node.def
new file mode 100644
index 0000000..42a0726
--- /dev/null
+++ b/templates/set/terminal/length/node.tag/node.def
@@ -0,0 +1,7 @@
+help: Set terminal to given number of rows (0 disables paging)
+allowed: echo -n '<NUMBER>'
+run: if [ "$4" -eq 0 ] ; then
+	VYATTA_PAGER=cat
+     else
+	stty rows $4
+     fi
diff --git a/templates/set/terminal/node.def b/templates/set/terminal/node.def
new file mode 100644
index 0000000..cdc1793
--- /dev/null
+++ b/templates/set/terminal/node.def
@@ -0,0 +1 @@
+help: Control terminal behaviors
diff --git a/templates/set/terminal/pager/node.def b/templates/set/terminal/pager/node.def
new file mode 100644
index 0000000..d2d414d
--- /dev/null
+++ b/templates/set/terminal/pager/node.def
@@ -0,0 +1,2 @@
+help: Set to use default pager (less)
+run:  VYATTA_PAGER=$_vyatta_default_pager
diff --git a/templates/set/terminal/pager/node.tag/node.def b/templates/set/terminal/pager/node.tag/node.def
new file mode 100644
index 0000000..dd5a3de
--- /dev/null
+++ b/templates/set/terminal/pager/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Set terminal pager
+allowed: echo -n '<PROGRAM>'
+run: VYATTA_PAGER=$4
diff --git a/templates/set/terminal/width/node.def b/templates/set/terminal/width/node.def
new file mode 100644
index 0000000..ddbc07d
--- /dev/null
+++ b/templates/set/terminal/width/node.def
@@ -0,0 +1 @@
+help: Set terminal columns
diff --git a/templates/set/terminal/width/node.tag/node.def b/templates/set/terminal/width/node.tag/node.def
new file mode 100644
index 0000000..792f34a
--- /dev/null
+++ b/templates/set/terminal/width/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Set terminal to given number of columns
+allowed: echo -n '<NUMBER>'
+run: stty columns $4
diff --git a/templates/terminal/key/node.def b/templates/terminal/key/node.def
deleted file mode 100644
index be435af..0000000
--- a/templates/terminal/key/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set key behaviors
diff --git a/templates/terminal/key/query-help/node.def b/templates/terminal/key/query-help/node.def
deleted file mode 100644
index c15f556..0000000
--- a/templates/terminal/key/query-help/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable/disable getting help using question mark
diff --git a/templates/terminal/key/query-help/node.tag/node.def b/templates/terminal/key/query-help/node.tag/node.def
deleted file mode 100644
index dd27db3..0000000
--- a/templates/terminal/key/query-help/node.tag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Enable/disable getting help using question mark (default enabled)
-allowed: echo -n 'enable' 'disable'
-run: if [ "$4" == 'disable' ]; then
-       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
-       echo "bind '\"?\": self-insert' # vyatta key binding" >> $HOME/.bashrc
-       bind '"?": self-insert'
-     else
-       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
-       bind '"?": possible-completions'
-     fi
diff --git a/templates/terminal/length/node.def b/templates/terminal/length/node.def
deleted file mode 100644
index 3e24898..0000000
--- a/templates/terminal/length/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set terminal rows
diff --git a/templates/terminal/length/node.tag/node.def b/templates/terminal/length/node.tag/node.def
deleted file mode 100644
index 3dfae2b..0000000
--- a/templates/terminal/length/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Set terminal to given number of rows (0 disables paging)
-allowed: echo -n '<NUMBER>'
-run: if [ "$3" -eq 0 ] ; then
-	VYATTA_PAGER=cat
-     else
-	stty rows $3
-     fi
diff --git a/templates/terminal/node.def b/templates/terminal/node.def
deleted file mode 100644
index cdc1793..0000000
--- a/templates/terminal/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Control terminal behaviors
diff --git a/templates/terminal/pager/node.def b/templates/terminal/pager/node.def
deleted file mode 100644
index d2d414d..0000000
--- a/templates/terminal/pager/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to use default pager (less)
-run:  VYATTA_PAGER=$_vyatta_default_pager
diff --git a/templates/terminal/pager/node.tag/node.def b/templates/terminal/pager/node.tag/node.def
deleted file mode 100644
index fe2226e..0000000
--- a/templates/terminal/pager/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set terminal pager
-allowed: echo -n '<PROGRAM>'
-run: VYATTA_PAGER=$3
diff --git a/templates/terminal/width/node.def b/templates/terminal/width/node.def
deleted file mode 100644
index ddbc07d..0000000
--- a/templates/terminal/width/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set terminal columns
diff --git a/templates/terminal/width/node.tag/node.def b/templates/terminal/width/node.tag/node.def
deleted file mode 100644
index c40bfd7..0000000
--- a/templates/terminal/width/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set terminal to given number of columns
-allowed: echo -n '<NUMBER>'
-run: stty columns $3
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
-- 
cgit v1.2.3