Convert syslog commands to new CLI help style

12 files changed, 162 insertions, 163 deletions

diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 0b12ac8e..67d41a27 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -2,26 +2,26 @@ tag:
 type: txt
 help: Facility for console logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-comp_help:Available logging facilities:
-  all           All facilities excluding "mark"
-  auth          Authentication and authorization
-  authpriv      Non-system authorization
-  cron          Cron daemon
-  daemon        System daemons
-  kern          Kernel
-  lpr           Line printer spooler
-  mail          Mail subsystem
-  mark          Timestamp
-  news          USENET subsystem
-  protocols     Routing protocols (local7)
-  security      Authentication and authorization
-  syslog        Authentication and authorization
-  user          Application processes
-  uucp          UUCP subsystem
-  local0        Local facility 0
-  local1        Local facility 1
-  local2        Local facility 2
-  local3        Local facility 3
-  local4        Local facility 4
-  local5        Local facility 5
-  local6        Local facility 6
+
+val_help: all; All facilities excluding "mark"
+val_help: auth; Authentication and authorization
+val_help: authpriv; Non-system authorization
+val_help: cron; Cron daemon
+val_help: daemon; System daemons
+val_help: kern; Kernel
+val_help: lpr; Line printer spooler
+val_help: mail; Mail subsystem
+val_help: mark; Timestamp
+val_help: news; USENET subsystem
+val_help: protocols; Routing protocols (local7)
+val_help: security; Authentication and authorization
+val_help: syslog; Authentication and authorization
+val_help: user; Application processes
+val_help: uucp; UUCP subsystem
+val_help: local0; Local facility 0
+val_help: local1; Local facility 1
+val_help: local2; Local facility 2
+val_help: local3; Local facility 3
+val_help: local4; Local facility 4
+val_help: local5; Local facility 5
+val_help: local6; Local facility 6
diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def
index e8a45ea1..bae531af 100644
--- a/templates/system/syslog/console/facility/node.tag/level/node.def
+++ b/templates/system/syslog/console/facility/node.tag/level/node.def
@@ -2,12 +2,12 @@ type: txt
 help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-comp_help:Logging levels in descending order of severity:
-  emerg        Emergency messages
-  alert        Urgent messages
-  crit         Critical messages 
-  err          Error messages
-  warning      Warning messages
-  notice       Messages for further investigation
-  info         Informational messages
-  debug        Debug messages
+
+val_help: emerg; Emergency messages
+val_help: alert; Urgent messages
+val_help: crit; Critical messages 
+val_help: err; Error messages
+val_help: warning; Warning messages
+val_help: notice; Messages for further investigation
+val_help: info; Informational messages
+val_help: debug; Debug messages
diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def
index 97e60a75..098bad2f 100644
--- a/templates/system/syslog/file/node.def
+++ b/templates/system/syslog/file/node.def
@@ -4,4 +4,4 @@ help: Logging to a file
 syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)"
 commit:expression: $VAR(./@/facility/@@) != ""; \
    "At least one facility must be configured to log messages to file $VAR(./@)"
-comp_help: Full path name of log file with leading slash
+val_help: Full path name of log file with leading slash
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index eaa00304..6c80f388 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -2,26 +2,26 @@ tag:
 type: txt
 help: Facility for file logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-comp_help:Available logging facilities:
-  all           All facilities excluding "mark"
-  auth          Authentication and authorization
-  authpriv      Non-system authorization
-  cron          Cron daemon
-  daemon        System daemons
-  kern          Kernel
-  lpr           Line printer spooler
-  mail          Mail subsystem
-  mark          Timestamp
-  news          USENET subsystem
-  protocols     Routing protocols (local7)
-  security      Authentication and authorization
-  syslog        Authentication and authorization
-  user          Application processes
-  uucp          UUCP subsystem
-  local0        Local facility 0
-  local1        Local facility 1
-  local2        Local facility 2
-  local3        Local facility 3
-  local4        Local facility 4
-  local5        Local facility 5
-  local6        Local facility 6
+
+val_help: all; All facilities excluding "mark"
+val_help: auth; Authentication and authorization
+val_help: authpriv; Non-system authorization
+val_help: cron; Cron daemon
+val_help: daemon; System daemons
+val_help: kern; Kernel
+val_help: lpr; Line printer spooler
+val_help: mail; Mail subsystem
+val_help: mark; Timestamp
+val_help: news; USENET subsystem
+val_help: protocols; Routing protocols (local7)
+val_help: security; Authentication and authorization
+val_help: syslog; Authentication and authorization
+val_help: user; Application processes
+val_help: uucp; UUCP subsystem
+val_help: local0; Local facility 0
+val_help: local1; Local facility 1
+val_help: local2; Local facility 2
+val_help: local3; Local facility 3
+val_help: local4; Local facility 4
+val_help: local5; Local facility 5
+val_help: local6; Local facility 6
diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
index e8ba6fe5..bae531af 100644
--- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
@@ -2,12 +2,12 @@ type: txt
 help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-comp_help:Logging levels in descending order of severity:
-  emerg        Emergency messages                  (severity=0)
-  alert        Urgent messages                     (severity=1)
-  crit         Critical messages                   (severity=2)
-  err          Error messages                      (severity=3)
-  warning      Warning messages                    (severity=4)
-  notice       Messages for further investigation  (severity=5)
-  info         Informational messages              (severity=6)
-  debug        Debug messages                      (severity=7)
+
+val_help: emerg; Emergency messages
+val_help: alert; Urgent messages
+val_help: crit; Critical messages 
+val_help: err; Error messages
+val_help: warning; Warning messages
+val_help: notice; Messages for further investigation
+val_help: info; Informational messages
+val_help: debug; Debug messages
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def
index fa44538a..5107dd0e 100644
--- a/templates/system/syslog/global/facility/node.def
+++ b/templates/system/syslog/global/facility/node.def
@@ -2,26 +2,26 @@ tag:
 type: txt
 help: Facility for system logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; "\"$VAR(@)\" is not a valid logging facility"
-comp_help:Available logging facilities:
-  all           All facilities excluding "mark"
-  auth          Authentication and authorization
-  authpriv      Non-system authorization
-  cron          Cron daemon
-  daemon        System daemons
-  kern          Kernel
-  lpr           Line printer spooler
-  mail          Mail subsystem
-  mark          Timestamp
-  news          USENET subsystem
-  protocols     Routing protocols (local7)
-  security      Authentication and authorization
-  syslog        Authentication and authorization
-  user          Application processes
-  uucp          UUCP subsystem
-  local0        Local facility 0
-  local1        Local facility 1
-  local2        Local facility 2
-  local3        Local facility 3
-  local4        Local facility 4
-  local5        Local facility 5
-  local6        Local facility 6
+
+val_help: all; All facilities excluding "mark"
+val_help: auth; Authentication and authorization
+val_help: authpriv; Non-system authorization
+val_help: cron; Cron daemon
+val_help: daemon; System daemons
+val_help: kern; Kernel
+val_help: lpr; Line printer spooler
+val_help: mail; Mail subsystem
+val_help: mark; Timestamp
+val_help: news; USENET subsystem
+val_help: protocols; Routing protocols (local7)
+val_help: security; Authentication and authorization
+val_help: syslog; Authentication and authorization
+val_help: user; Application processes
+val_help: uucp; UUCP subsystem
+val_help: local0; Local facility 0
+val_help: local1; Local facility 1
+val_help: local2; Local facility 2
+val_help: local3; Local facility 3
+val_help: local4; Local facility 4
+val_help: local5; Local facility 5
+val_help: local6; Local facility 6
diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def
index e8a45ea1..bae531af 100644
--- a/templates/system/syslog/global/facility/node.tag/level/node.def
+++ b/templates/system/syslog/global/facility/node.tag/level/node.def
@@ -2,12 +2,12 @@ type: txt
 help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-comp_help:Logging levels in descending order of severity:
-  emerg        Emergency messages
-  alert        Urgent messages
-  crit         Critical messages 
-  err          Error messages
-  warning      Warning messages
-  notice       Messages for further investigation
-  info         Informational messages
-  debug        Debug messages
+
+val_help: emerg; Emergency messages
+val_help: alert; Urgent messages
+val_help: crit; Critical messages 
+val_help: err; Error messages
+val_help: warning; Warning messages
+val_help: notice; Messages for further investigation
+val_help: info; Informational messages
+val_help: debug; Debug messages
diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def
index 1c485f1f..883be27f 100644
--- a/templates/system/syslog/host/node.tag/facility/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.def
@@ -2,26 +2,26 @@ tag:
 type: txt
 help: Facility for host logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-comp_help:Available logging facilities:
-  all           All facilities excluding "mark"
-  auth          Authentication and authorization
-  authpriv      Non-system authorization
-  cron          Cron daemon
-  daemon        System daemons
-  kern          Kernel
-  lpr           Line printer spooler
-  mail          Mail subsystem
-  mark          Timestamp
-  news          USENET subsystem
-  protocols     Routing protocols (local7)
-  security      Authentication and authorization
-  syslog        Authentication and authorization
-  user          Application processes
-  uucp          UUCP subsystem
-  local0        Local facility 0
-  local1        Local facility 1
-  local2        Local facility 2
-  local3        Local facility 3
-  local4        Local facility 4
-  local5        Local facility 5
-  local6        Local facility 6
+
+val_help: all; All facilities excluding "mark"
+val_help: auth; Authentication and authorization
+val_help: authpriv; Non-system authorization
+val_help: cron; Cron daemon
+val_help: daemon; System daemons
+val_help: kern; Kernel
+val_help: lpr; Line printer spooler
+val_help: mail; Mail subsystem
+val_help: mark; Timestamp
+val_help: news; USENET subsystem
+val_help: protocols; Routing protocols (local7)
+val_help: security; Authentication and authorization
+val_help: syslog; Authentication and authorization
+val_help: user; Application processes
+val_help: uucp; UUCP subsystem
+val_help: local0; Local facility 0
+val_help: local1; Local facility 1
+val_help: local2; Local facility 2
+val_help: local3; Local facility 3
+val_help: local4; Local facility 4
+val_help: local5; Local facility 5
+val_help: local6; Local facility 6
diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
index e8a45ea1..bae531af 100644
--- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
@@ -2,12 +2,12 @@ type: txt
 help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-comp_help:Logging levels in descending order of severity:
-  emerg        Emergency messages
-  alert        Urgent messages
-  crit         Critical messages 
-  err          Error messages
-  warning      Warning messages
-  notice       Messages for further investigation
-  info         Informational messages
-  debug        Debug messages
+
+val_help: emerg; Emergency messages
+val_help: alert; Urgent messages
+val_help: crit; Critical messages 
+val_help: err; Error messages
+val_help: warning; Warning messages
+val_help: notice; Messages for further investigation
+val_help: info; Informational messages
+val_help: debug; Debug messages
diff --git a/templates/system/syslog/user/node.def b/templates/system/syslog/user/node.def
index 1161149a..be356042 100644
--- a/templates/system/syslog/user/node.def
+++ b/templates/system/syslog/user/node.def
@@ -4,5 +4,4 @@ help: Logging to specific user's terminal
 syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*$"
                      ; "invalid user name $VAR(@)"
 commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to user $VAR(./@)"
-comp_help: Possible completions:
-  <username>            Send log messages to this user's terminal
+val_help: User login name
diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def
index 8367b3ca..e7d11110 100644
--- a/templates/system/syslog/user/node.tag/facility/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.def
@@ -2,26 +2,26 @@ tag:
 type: txt
 help: Facility for user logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
-comp_help:Available logging facilities:
-  all           All facilities excluding "mark"
-  auth          Authentication and authorization
-  authpriv      Non-system authorization
-  cron          Cron daemon
-  daemon        System daemons
-  kern          Kernel
-  lpr           Line printer spooler
-  mail          Mail subsystem
-  mark          Timestamp
-  news          USENET subsystem
-  protocols     Routing protocols (local7)
-  security      Authentication and authorization
-  syslog        Authentication and authorization
-  user          Application processes
-  uucp          UUCP subsystem
-  local0        Local facility 0
-  local1        Local facility 1
-  local2        Local facility 2
-  local3        Local facility 3
-  local4        Local facility 4
-  local5        Local facility 5
-  local6        Local facility 6
+
+val_help: all; All facilities excluding "mark"
+val_help: auth; Authentication and authorization
+val_help: authpriv; Non-system authorization
+val_help: cron; Cron daemon
+val_help: daemon; System daemons
+val_help: kern; Kernel
+val_help: lpr; Line printer spooler
+val_help: mail; Mail subsystem
+val_help: mark; Timestamp
+val_help: news; USENET subsystem
+val_help: protocols; Routing protocols (local7)
+val_help: security; Authentication and authorization
+val_help: syslog; Authentication and authorization
+val_help: user; Application processes
+val_help: uucp; UUCP subsystem
+val_help: local0; Local facility 0
+val_help: local1; Local facility 1
+val_help: local2; Local facility 2
+val_help: local3; Local facility 3
+val_help: local4; Local facility 4
+val_help: local5; Local facility 5
+val_help: local6; Local facility 6
diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
index e8a45ea1..bae531af 100644
--- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
@@ -2,12 +2,12 @@ type: txt
 help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-comp_help:Logging levels in descending order of severity:
-  emerg        Emergency messages
-  alert        Urgent messages
-  crit         Critical messages 
-  err          Error messages
-  warning      Warning messages
-  notice       Messages for further investigation
-  info         Informational messages
-  debug        Debug messages
+
+val_help: emerg; Emergency messages
+val_help: alert; Urgent messages
+val_help: crit; Critical messages 
+val_help: err; Error messages
+val_help: warning; Warning messages
+val_help: notice; Messages for further investigation
+val_help: info; Informational messages
+val_help: debug; Debug messages