summaryrefslogtreecommitdiff
path: root/templates/show
diff options
context:
space:
mode:
Diffstat (limited to 'templates/show')
-rw-r--r--templates/show/arp/node.def2
-rw-r--r--templates/show/bridge/node.def2
-rw-r--r--templates/show/bridge/node.tag/macs/node.def2
-rw-r--r--templates/show/bridge/node.tag/node.def2
-rw-r--r--templates/show/dhcp/client/leases/interface/node.def2
-rw-r--r--templates/show/dhcp/client/leases/interface/node.tag/node.def2
-rw-r--r--templates/show/dhcp/client/leases/node.def2
-rw-r--r--templates/show/dhcp/client/node.def2
-rw-r--r--templates/show/files/node.tag/node.def2
-rw-r--r--templates/show/hardware/cpu/node.def4
-rw-r--r--templates/show/hardware/mem/node.def4
-rw-r--r--templates/show/host/lookup/node.def2
-rw-r--r--templates/show/host/lookup/node.tag/node.def2
-rw-r--r--templates/show/interfaces/bridge/node.tag/brief/node.def2
-rw-r--r--templates/show/interfaces/bridge/node.tag/node.def2
-rw-r--r--templates/show/interfaces/detail/node.def2
-rw-r--r--templates/show/interfaces/ethernet/detail/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/brief/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/not/node.def1
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def1
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def3
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/port/node.def1
-rw-r--r--templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def3
-rw-r--r--templates/show/interfaces/ethernet/node.tag/identify/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/physical/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/vif/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def2
-rw-r--r--templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def2
-rw-r--r--templates/show/interfaces/loopback/detail/node.def2
-rw-r--r--templates/show/interfaces/loopback/node.tag/brief/node.def2
-rw-r--r--templates/show/interfaces/loopback/node.tag/node.def2
-rw-r--r--templates/show/interfaces/tunnel/detail/node.def4
-rw-r--r--templates/show/interfaces/tunnel/node.tag/brief/node.def2
-rw-r--r--templates/show/interfaces/tunnel/node.tag/node.def2
-rw-r--r--templates/show/ip/route/cache/node.tag/node.def2
-rw-r--r--templates/show/ip/route/forward/node.tag/node.def2
-rw-r--r--templates/show/license/node.def4
-rw-r--r--templates/show/log/all/node.def4
-rw-r--r--templates/show/log/file/node.tag/node.def8
-rw-r--r--templates/show/log/node.def4
-rw-r--r--templates/show/ntp/node.tag/node.def2
-rw-r--r--templates/show/system/boot-messages/all/node.def4
-rw-r--r--templates/show/system/boot-messages/node.def4
-rw-r--r--templates/show/vrrp/interface/node.def3
-rw-r--r--templates/show/vrrp/interface/node.tag/group/node.def2
-rw-r--r--templates/show/vrrp/interface/node.tag/group/node.tag/node.def2
-rw-r--r--templates/show/vrrp/interface/node.tag/node.def2
-rw-r--r--templates/show/vrrp/node.def2
-rw-r--r--templates/show/vrrp/summary/node.def3
51 files changed, 77 insertions, 48 deletions
diff --git a/templates/show/arp/node.def b/templates/show/arp/node.def
index 021f848..10e5d5d 100644
--- a/templates/show/arp/node.def
+++ b/templates/show/arp/node.def
@@ -1,2 +1,2 @@
-help: Show Address Resolution Protocol Information
+help: Show Address Resolution Protocol (ARP) information
run: /usr/sbin/arp -e
diff --git a/templates/show/bridge/node.def b/templates/show/bridge/node.def
index 53327bd..a1ed782 100644
--- a/templates/show/bridge/node.def
+++ b/templates/show/bridge/node.def
@@ -1,2 +1,2 @@
-help: "Show bridging information"
+help: Show bridging information
run: /usr/sbin/brctl show
diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def
index 160b236..d07958c 100644
--- a/templates/show/bridge/node.tag/macs/node.def
+++ b/templates/show/bridge/node.tag/macs/node.def
@@ -1,2 +1,2 @@
-help: Show bridge MAC table
+help: Show bridge Media Access Control (MAC) address table
run: /usr/sbin/brctl showmacs "$3"
diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def
index dd59fca..db7fcca 100644
--- a/templates/show/bridge/node.tag/node.def
+++ b/templates/show/bridge/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show bridge information for a given bridge
+help: Show bridge information for a given bridge interface
allowed: local -a array ;
array=( /sys/class/net/br* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/dhcp/client/leases/interface/node.def b/templates/show/dhcp/client/leases/interface/node.def
index 458e0ec..ab13930 100644
--- a/templates/show/dhcp/client/leases/interface/node.def
+++ b/templates/show/dhcp/client/leases/interface/node.def
@@ -1 +1 @@
-help: Show dhcp client information for a given interface
+help: Show DHCP client information for a given interface
diff --git a/templates/show/dhcp/client/leases/interface/node.tag/node.def b/templates/show/dhcp/client/leases/interface/node.tag/node.def
index 5e8f7f3..b0120d0 100644
--- a/templates/show/dhcp/client/leases/interface/node.tag/node.def
+++ b/templates/show/dhcp/client/leases/interface/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show dhcp client information for interface
+help: Show DHCP client information for interface
allowed: local -a array ;
array=( /sys/class/net/eth* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/dhcp/client/leases/node.def b/templates/show/dhcp/client/leases/node.def
index 16bef4d..abded1e 100644
--- a/templates/show/dhcp/client/leases/node.def
+++ b/templates/show/dhcp/client/leases/node.def
@@ -1,2 +1,2 @@
-help: Show dhcp client leases
+help: Show DHCP client leases
run: /opt/vyatta/bin/vyatta-show-dhclient.pl
diff --git a/templates/show/dhcp/client/node.def b/templates/show/dhcp/client/node.def
index 874c579..094eaf4 100644
--- a/templates/show/dhcp/client/node.def
+++ b/templates/show/dhcp/client/node.def
@@ -1 +1 @@
-help: Show dhcp client information
+help: Show DHCP client information
diff --git a/templates/show/files/node.tag/node.def b/templates/show/files/node.tag/node.def
index 2aea5ab..17dcae9 100644
--- a/templates/show/files/node.tag/node.def
+++ b/templates/show/files/node.tag/node.def
@@ -1,2 +1,2 @@
-help: Show files in directory
+help: Show files in the specified directory
run: ls -lh $3
diff --git a/templates/show/hardware/cpu/node.def b/templates/show/hardware/cpu/node.def
index 4339af2..2e3c616 100644
--- a/templates/show/hardware/cpu/node.def
+++ b/templates/show/hardware/cpu/node.def
@@ -1,2 +1,4 @@
help: Show system CPU details
-run: cat /proc/cpuinfo
+run: less $_vyatta_less_options \
+ --prompt=".cpu info" \
+ -- /proc/cpuinfo
diff --git a/templates/show/hardware/mem/node.def b/templates/show/hardware/mem/node.def
index 7a54e52..acf1109 100644
--- a/templates/show/hardware/mem/node.def
+++ b/templates/show/hardware/mem/node.def
@@ -1,2 +1,4 @@
help: Show system RAM details
-run: cat /proc/meminfo
+run: less $_vyatta_less_options \
+ --prompt=".mem info" \
+ -- /proc/meminfo
diff --git a/templates/show/host/lookup/node.def b/templates/show/host/lookup/node.def
index d8368b6..375d356 100644
--- a/templates/show/host/lookup/node.def
+++ b/templates/show/host/lookup/node.def
@@ -1 +1 @@
-help: Lookup host info for host/ipaddress
+help: Lookup host information for <hostname|IPv4 address>
diff --git a/templates/show/host/lookup/node.tag/node.def b/templates/show/host/lookup/node.tag/node.def
index e0dd0df..29bf5a7 100644
--- a/templates/show/host/lookup/node.tag/node.def
+++ b/templates/show/host/lookup/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Lookup host information for host/ipaddres
+help: Lookup host information for specified <hostname|IPv4 address>
allowed: vyatta-allowed-hosts
run: /usr/bin/host $4
diff --git a/templates/show/interfaces/bridge/node.tag/brief/node.def b/templates/show/interfaces/bridge/node.tag/brief/node.def
index d3d213d..ca07860 100644
--- a/templates/show/interfaces/bridge/node.tag/brief/node.def
+++ b/templates/show/interfaces/bridge/node.tag/brief/node.def
@@ -1,2 +1,2 @@
-help: Show summary of a given bridge interface information
+help: Show summary of the specified bridge interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/bridge/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/node.def
index 41aa6b2..d2c5eec 100644
--- a/templates/show/interfaces/bridge/node.tag/node.def
+++ b/templates/show/interfaces/bridge/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show given bridge interface information
+help: Show specified bridge interface information
allowed: local -a array ;
array=( /sys/class/net/br* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/interfaces/detail/node.def b/templates/show/interfaces/detail/node.def
index f875ce8..08bdfa4 100644
--- a/templates/show/interfaces/detail/node.def
+++ b/templates/show/interfaces/detail/node.def
@@ -1,2 +1,2 @@
-help: Show detail information of all interfaces
+help: Show detailed information of all interfaces
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --action=show
diff --git a/templates/show/interfaces/ethernet/detail/node.def b/templates/show/interfaces/ethernet/detail/node.def
index 9883539..40ecdf1 100644
--- a/templates/show/interfaces/ethernet/detail/node.def
+++ b/templates/show/interfaces/ethernet/detail/node.def
@@ -1,2 +1,2 @@
-help: Show ethernet interface information
+help: Show detailed ethernet interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=ethernet --action=show
diff --git a/templates/show/interfaces/ethernet/node.tag/brief/node.def b/templates/show/interfaces/ethernet/node.tag/brief/node.def
index 3340d9e..0d164bc 100644
--- a/templates/show/interfaces/ethernet/node.tag/brief/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/brief/node.def
@@ -1,2 +1,2 @@
-help: Show given ethernet interface information
+help: Show summary of the specified ethernet interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/node.def b/templates/show/interfaces/ethernet/node.tag/capture/node.def
new file mode 100644
index 0000000..318f6cf
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified ethernet interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/node.def
new file mode 100644
index 0000000..ca8a2ed
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..ca8a2ed
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..a350ac5
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding the specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/port/node.def b/templates/show/interfaces/ethernet/node.tag/capture/port/node.def
new file mode 100644
index 0000000..7f6d889
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..f1aedc4
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/identify/node.def b/templates/show/interfaces/ethernet/node.tag/identify/node.def
index d94172f..d308621 100644
--- a/templates/show/interfaces/ethernet/node.tag/identify/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/identify/node.def
@@ -1,2 +1,2 @@
-help: Visually identify the specified Ethernet interface
+help: Visually identify the specified ethernet interface
run: sudo ${vyatta_bindir}/sudo-users/vyatta-identify-interface.pl "$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/node.def
index b41cf8b..57a5623 100644
--- a/templates/show/interfaces/ethernet/node.tag/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show given ethernet interface information
+help: Show specified ethernet interface information
allowed: for dev in /sys/class/net/*;
do if [[ -L $dev/device ]]
then if [[ $(cat $dev/type) -eq 1 ]]
diff --git a/templates/show/interfaces/ethernet/node.tag/physical/node.def b/templates/show/interfaces/ethernet/node.tag/physical/node.def
index 3667c13..7723946 100644
--- a/templates/show/interfaces/ethernet/node.tag/physical/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/physical/node.def
@@ -1,3 +1,3 @@
-help: Show physical device information of given ethernet interface
+help: Show physical device information for specified ethernet interface
allowed: ""
run: /usr/sbin/ethtool "$4"; /usr/sbin/ethtool -i "$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.def
index b3d92de..2b74427 100644
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.def
@@ -1,4 +1,4 @@
-help: Show given virtual network interface information
+help: Show specified virtual network interface (vif) information
run: tput setaf ${COLOR_RED:-1} ;
echo error: need to supply vif # ;
tput op
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
index 1eaa07c..7aa871e 100644
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
@@ -1,2 +1,2 @@
-help: Show given virtual network interface information
+help: Show summary of specified virtual network interface (vif) information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4.$6" --action=show-brief
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
index 13f196f..52bfbee 100644
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show given virtual network interface information
+help: Show specified virtual network interface (vif) information
allowed: local -a array ;
array=( /sys/class/net/${COMP_WORDS[3]}.* ) ;
echo -n ${array[@]##*.}
diff --git a/templates/show/interfaces/loopback/detail/node.def b/templates/show/interfaces/loopback/detail/node.def
index 759407a..629a979 100644
--- a/templates/show/interfaces/loopback/detail/node.def
+++ b/templates/show/interfaces/loopback/detail/node.def
@@ -1,2 +1,2 @@
-help: Show loopback interface information
+help: Show detailed loopback interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=loopback
diff --git a/templates/show/interfaces/loopback/node.tag/brief/node.def b/templates/show/interfaces/loopback/node.tag/brief/node.def
index 85970d3..2ea8f06 100644
--- a/templates/show/interfaces/loopback/node.tag/brief/node.def
+++ b/templates/show/interfaces/loopback/node.tag/brief/node.def
@@ -1,2 +1,2 @@
-help: Show summary of given loopback interface information
+help: Show summary of specified loopback interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/loopback/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/node.def
index 84f3624..3364827 100644
--- a/templates/show/interfaces/loopback/node.tag/node.def
+++ b/templates/show/interfaces/loopback/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show given loopback interface information
+help: Show specified loopback interface information
allowed: local -a array ;
array=( /sys/class/net/lo* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/interfaces/tunnel/detail/node.def b/templates/show/interfaces/tunnel/detail/node.def
index d3c8d95..ea23c81 100644
--- a/templates/show/interfaces/tunnel/detail/node.def
+++ b/templates/show/interfaces/tunnel/detail/node.def
@@ -1,2 +1,2 @@
-help: Show tunnel interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=tunnel --action=show \ No newline at end of file
+help: Show detailed tunnel interface information
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=tunnel --action=show
diff --git a/templates/show/interfaces/tunnel/node.tag/brief/node.def b/templates/show/interfaces/tunnel/node.tag/brief/node.def
index 81e2c24..4c63d8e 100644
--- a/templates/show/interfaces/tunnel/node.tag/brief/node.def
+++ b/templates/show/interfaces/tunnel/node.tag/brief/node.def
@@ -1,2 +1,2 @@
-help: Show given tunnel interface information
+help: Show summary of specified tunnel interface information
run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/tunnel/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/node.def
index c39ad7e..6818464 100644
--- a/templates/show/interfaces/tunnel/node.tag/node.def
+++ b/templates/show/interfaces/tunnel/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show given tunnel interface information
+help: Show specified tunnel interface information
allowed: local -a array ;
array=( /sys/class/net/tun* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/ip/route/cache/node.tag/node.def b/templates/show/ip/route/cache/node.tag/node.def
index 85fe4e6..2cb78d5 100644
--- a/templates/show/ip/route/cache/node.tag/node.def
+++ b/templates/show/ip/route/cache/node.tag/node.def
@@ -1,3 +1,3 @@
help: Show kernel route cache for a given route
-allowed: echo -n '<network>'
+allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
run: ip -s route list cache $5
diff --git a/templates/show/ip/route/forward/node.tag/node.def b/templates/show/ip/route/forward/node.tag/node.def
index 257eb0f..e1ba954 100644
--- a/templates/show/ip/route/forward/node.tag/node.def
+++ b/templates/show/ip/route/forward/node.tag/node.def
@@ -1,3 +1,3 @@
help: Show kernel route table for a given route
-allowed: echo -n '<network>'
+allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
run: ip -s route list $5
diff --git a/templates/show/license/node.def b/templates/show/license/node.def
index eadfbbf..2108f30 100644
--- a/templates/show/license/node.def
+++ b/templates/show/license/node.def
@@ -1,2 +1,4 @@
help: Show Vyatta license information
-run: cat ${vyatta_sysconfdir}/LICENSE
+run: less $_vyatta_less_options \
+ --prompt=".license, page %dt of %D" \
+ -- ${vyatta_sysconfdir}/LICENSE
diff --git a/templates/show/log/all/node.def b/templates/show/log/all/node.def
index 87e959b..069d1d4 100644
--- a/templates/show/log/all/node.def
+++ b/templates/show/log/all/node.def
@@ -1,2 +1,4 @@
help: Show contents of all master log files
-run: ${vyatta_bindir}/vyatta-show-log-all
+run: less $_vyatta_less_options \
+ --prompt=".log?m, file %i of %m., page %dt of %D" \
+ -- `printf "%s\n" /var/log/messages* | sort -nr`
diff --git a/templates/show/log/file/node.tag/node.def b/templates/show/log/file/node.tag/node.def
index a5a1c9d..9171a0c 100644
--- a/templates/show/log/file/node.tag/node.def
+++ b/templates/show/log/file/node.tag/node.def
@@ -1,5 +1,7 @@
-help: Show contents of user-defined log file
+help: Show contents of specified user-defined log file
allowed: local -a array ;
array=( /var/log/user/* ) ;
- echo -n ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-show-log-file "$4"
+ [ ${#array[@]} -gt 0 ] && echo -n ${array[@]##*/} || echo -n none
+run: less $_vyatta_less_options \
+ --prompt=".$4 log, page %dt of %D" \
+ -- /var/log/user/$4
diff --git a/templates/show/log/node.def b/templates/show/log/node.def
index 5f61e1d..3d37d84 100644
--- a/templates/show/log/node.def
+++ b/templates/show/log/node.def
@@ -1,2 +1,4 @@
help: Show contents of current master log file
-run: ${vyatta_bindir}/vyatta-show-log
+run: less $_vyatta_less_options \
+ --prompt=".log, page %dt of %D" \
+ -- /var/log/messages
diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def
index a4a4443..ef69a68 100644
--- a/templates/show/ntp/node.tag/node.def
+++ b/templates/show/ntp/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show date and time of given NTP server
+help: Show date and time of specified NTP server
allowed: vyatta-allowed-hosts ntp.vyatta.com ;
sed -n 's/^server[ \t]\+//p' /etc/ntp.conf
run: /usr/sbin/ntpdate -q ${3:-ntp.vyatta.com}
diff --git a/templates/show/system/boot-messages/all/node.def b/templates/show/system/boot-messages/all/node.def
index b151fc2..e414987 100644
--- a/templates/show/system/boot-messages/all/node.def
+++ b/templates/show/system/boot-messages/all/node.def
@@ -1,2 +1,4 @@
help: Show all kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg-all
+run: less $_vyatta_less_options \
+ --prompt=".boot-messages?m, file %i of %m., page %dt of %D" \
+ -- `printf "%s\n" /var/log/dmesg* | sort -nr`
diff --git a/templates/show/system/boot-messages/node.def b/templates/show/system/boot-messages/node.def
index 7cfe5d3..97bbb61 100644
--- a/templates/show/system/boot-messages/node.def
+++ b/templates/show/system/boot-messages/node.def
@@ -1,2 +1,4 @@
help: Show most recent kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg
+run: less $_vyatta_less_options \
+ --prompt=".boot-messages, page %dt of %D" \
+ -- /var/log/dmesg
diff --git a/templates/show/vrrp/interface/node.def b/templates/show/vrrp/interface/node.def
index eec2ae7..79480a1 100644
--- a/templates/show/vrrp/interface/node.def
+++ b/templates/show/vrrp/interface/node.def
@@ -1,2 +1 @@
-help: "Show VRRP information for given interface"
-
+help: Show VRRP information for specified interface
diff --git a/templates/show/vrrp/interface/node.tag/group/node.def b/templates/show/vrrp/interface/node.tag/group/node.def
index a79e838..0af500d 100644
--- a/templates/show/vrrp/interface/node.tag/group/node.def
+++ b/templates/show/vrrp/interface/node.tag/group/node.def
@@ -1 +1 @@
-help: Show VRRP information for interface and group
+help: Show VRRP information for specified interface and group
diff --git a/templates/show/vrrp/interface/node.tag/group/node.tag/node.def b/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
index 84e168f..1e74e2d 100644
--- a/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
+++ b/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Show VRRP information for interface group
+help: Show VRRP information for specified interface and group
allowed: echo -n '<VRRP_GROUP>'
run: /opt/vyatta/sbin/vyatta-show-vrrp.pl "$4" "$6"
diff --git a/templates/show/vrrp/interface/node.tag/node.def b/templates/show/vrrp/interface/node.tag/node.def
index 19b323e..860b12a 100644
--- a/templates/show/vrrp/interface/node.tag/node.def
+++ b/templates/show/vrrp/interface/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Show VRRP information for interface
+help: Show VRRP information for specified interface
allowed: local -a array ;
array=( /sys/class/net/eth* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/show/vrrp/node.def b/templates/show/vrrp/node.def
index 8f7a621..3842d98 100644
--- a/templates/show/vrrp/node.def
+++ b/templates/show/vrrp/node.def
@@ -1,2 +1,2 @@
-help: Show VRRP information
+help: Show Virtual Router Redundancy Protocol (VRRP) information
run: /opt/vyatta/sbin/vyatta-show-vrrp.pl
diff --git a/templates/show/vrrp/summary/node.def b/templates/show/vrrp/summary/node.def
new file mode 100644
index 0000000..c087165
--- /dev/null
+++ b/templates/show/vrrp/summary/node.def
@@ -0,0 +1,3 @@
+help: Show summary of VRRP information
+run: /opt/vyatta/sbin/vyatta-show-vrrp.pl "$3"
+