Move some more commands

  'clear ip route' to 'reset ip route'
  'clear ipv6 route' to 'reset ipv6 route'
  'clear ipv6 neighbors' to 'reset ipv6 route'

  Modified some telnet help text
(cherry picked from commit 8d494099bcbeda63eabe8ef268dbc8838a17ffe9)

20 files changed, 10 insertions, 9 deletions

diff --git a/templates/clear/ip/route/node.def b/templates/clear/ip/route/node.def
deleted file mode 100644
index 9b5753b..0000000
--- a/templates/clear/ip/route/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IP route
diff --git a/templates/clear/ipv6/neighbors/address/node.def b/templates/clear/ipv6/neighbors/address/node.def
deleted file mode 100644
index ffb7376..0000000
--- a/templates/clear/ipv6/neighbors/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear ND cache for an IPv6 address
diff --git a/templates/clear/ipv6/neighbors/interface/node.def b/templates/clear/ipv6/neighbors/interface/node.def
deleted file mode 100644
index db4adaf..0000000
--- a/templates/clear/ipv6/neighbors/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 ND cache for interface
diff --git a/templates/clear/ipv6/neighbors/node.def b/templates/clear/ipv6/neighbors/node.def
deleted file mode 100644
index cde35f9..0000000
--- a/templates/clear/ipv6/neighbors/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 Neighbor Discovery (ND) cache
diff --git a/templates/clear/ipv6/route/node.def b/templates/clear/ipv6/route/node.def
deleted file mode 100644
index bb1b049..0000000
--- a/templates/clear/ipv6/route/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 route
diff --git a/templates/clear/ip/route/cache/node.def b/templates/reset/ip/route/cache/node.def
index b97e0c9..b97e0c9 100644
--- a/templates/clear/ip/route/cache/node.def
+++ b/templates/reset/ip/route/cache/node.def
diff --git a/templates/clear/ip/route/cache/node.tag/node.def b/templates/reset/ip/route/cache/node.tag/node.def
index 4af1915..4af1915 100644
--- a/templates/clear/ip/route/cache/node.tag/node.def
+++ b/templates/reset/ip/route/cache/node.tag/node.def
diff --git a/templates/reset/ip/route/node.def b/templates/reset/ip/route/node.def
new file mode 100644
index 0000000..a4336f1
--- /dev/null
+++ b/templates/reset/ip/route/node.def
@@ -0,0 +1 @@
+help: Reset IP route
diff --git a/templates/reset/ipv6/neighbors/address/node.def b/templates/reset/ipv6/neighbors/address/node.def
new file mode 100644
index 0000000..e163359
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/address/node.def
@@ -0,0 +1 @@
+help: Reset ND cache for an IPv6 address
diff --git a/templates/clear/ipv6/neighbors/address/node.tag/node.def b/templates/reset/ipv6/neighbors/address/node.tag/node.def
index 4aaec8a..4aaec8a 100644
--- a/templates/clear/ipv6/neighbors/address/node.tag/node.def
+++ b/templates/reset/ipv6/neighbors/address/node.tag/node.def
diff --git a/templates/reset/ipv6/neighbors/interface/node.def b/templates/reset/ipv6/neighbors/interface/node.def
new file mode 100644
index 0000000..c455aa1
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/interface/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 ND cache for interface
diff --git a/templates/clear/ipv6/neighbors/interface/node.tag/node.def b/templates/reset/ipv6/neighbors/interface/node.tag/node.def
index 20cb549..46a89a9 100644
--- a/templates/clear/ipv6/neighbors/interface/node.tag/node.def
+++ b/templates/reset/ipv6/neighbors/interface/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Clear IPv6 ND cache for interface
+help: Reset IPv6 ND cache for interface
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
 run: sudo /sbin/ip -f inet6 neigh flush dev "$5"
diff --git a/templates/reset/ipv6/neighbors/node.def b/templates/reset/ipv6/neighbors/node.def
new file mode 100644
index 0000000..138725d
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 Neighbor Discovery (ND) cache
diff --git a/templates/reset/ipv6/node.def b/templates/reset/ipv6/node.def
new file mode 100644
index 0000000..5c80950
--- /dev/null
+++ b/templates/reset/ipv6/node.def
@@ -0,0 +1 @@
+help: Reset Internet Protocol version 6 (IPv6) parameters
diff --git a/templates/clear/ipv6/route/cache/node.def b/templates/reset/ipv6/route/cache/node.def
index 7dee140..7dee140 100644
--- a/templates/clear/ipv6/route/cache/node.def
+++ b/templates/reset/ipv6/route/cache/node.def
diff --git a/templates/clear/ipv6/route/cache/node.tag/node.def b/templates/reset/ipv6/route/cache/node.tag/node.def
index af6a3db..af6a3db 100644
--- a/templates/clear/ipv6/route/cache/node.tag/node.def
+++ b/templates/reset/ipv6/route/cache/node.tag/node.def
diff --git a/templates/reset/ipv6/route/node.def b/templates/reset/ipv6/route/node.def
new file mode 100644
index 0000000..72c83a8
--- /dev/null
+++ b/templates/reset/ipv6/route/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 route
diff --git a/templates/telnet/node.def b/templates/telnet/node.def
index 99b1f46..e3ec3e0 100644
--- a/templates/telnet/node.def
+++ b/templates/telnet/node.def
@@ -1 +1 @@
-help: Telnet to <hostname|IPv4 address>
+help: Telnet to a node
diff --git a/templates/telnet/node.tag/node.def b/templates/telnet/node.tag/node.def
index 0b1ecf0..76e9b0a 100644
--- a/templates/telnet/node.tag/node.def
+++ b/templates/telnet/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Telnet to host
-allowed: echo -n '<hostname> <x.x.x.x> <y:y:y:y:y>'
+allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
 
 run: if [ -x /usr/bin/telnet ] ; then
      	/usr/bin/$*
diff --git a/templates/telnet/node.tag/node.tag/node.def b/templates/telnet/node.tag/node.tag/node.def
index 70a6402..21b78c4 100644
--- a/templates/telnet/node.tag/node.tag/node.def
+++ b/templates/telnet/node.tag/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Telnet to <hostname|IPv4 address> <port|service>
+help: Telnet to <address> <port>
 allowed: echo -n '<0-65535>'
 run: if [ -x /usr/bin/telnet ] ; then
      	/usr/bin/$*