8 files changed, 14 insertions, 14 deletions
diff --git a/templates/protocols/snmp/community/node.def b/templates/protocols/snmp/community/node.def
index 18472af8..07bedcd1 100644
--- a/templates/protocols/snmp/community/node.def
+++ b/templates/protocols/snmp/community/node.def
@@ -1,3 +1,3 @@
 tag:
 type: txt
-help: "Community name"
+help: Community name
diff --git a/templates/protocols/snmp/community/node.tag/authorization/node.def b/templates/protocols/snmp/community/node.tag/authorization/node.def
index fee6aa42..005e9b39 100644
--- a/templates/protocols/snmp/community/node.tag/authorization/node.def
+++ b/templates/protocols/snmp/community/node.tag/authorization/node.def
@@ -1,7 +1,7 @@
 type: txt
 default: "ro"
-help: "Authorization type (rw or ro)"
-syntax: $(@) in "ro", "rw"; "Authorization type must be either rw or ro"
+help: Authorization type (rw or ro)
+syntax:expression: $VAR(@) in "ro", "rw"; "Authorization type must be either rw or ro"
 
 
 
diff --git a/templates/protocols/snmp/community/node.tag/node.def b/templates/protocols/snmp/community/node.tag/node.def
index 410186c6..20430928 100644
--- a/templates/protocols/snmp/community/node.tag/node.def
+++ b/templates/protocols/snmp/community/node.tag/node.def
@@ -1 +1 @@
-help: "Community options"
+help: Community options
diff --git a/templates/protocols/snmp/contact/node.def b/templates/protocols/snmp/contact/node.def
index 970ed5fa..039cd548 100644
--- a/templates/protocols/snmp/contact/node.def
+++ b/templates/protocols/snmp/contact/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Contact information"
+help: Contact information
diff --git a/templates/protocols/snmp/description/node.def b/templates/protocols/snmp/description/node.def
index d5566f58..61ec96b6 100644
--- a/templates/protocols/snmp/description/node.def
+++ b/templates/protocols/snmp/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Description information"
+help: Description information
diff --git a/templates/protocols/snmp/location/node.def b/templates/protocols/snmp/location/node.def
index 284e38a7..a5b234ea 100644
--- a/templates/protocols/snmp/location/node.def
+++ b/templates/protocols/snmp/location/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Location information"
+help: Location information
 
diff --git a/templates/protocols/snmp/node.def b/templates/protocols/snmp/node.def
index b140f7f6..62adc534 100644
--- a/templates/protocols/snmp/node.def
+++ b/templates/protocols/snmp/node.def
@@ -1,10 +1,10 @@
-help: "Configure SNMP"
-commit: $(community/) != ""; "must configure a community"
-create: "/opt/vyatta/sbin/vyatta-snmp.pl --init-snmp"
-delete: "touch /tmp/snmp.\\$PPID"
-end: "if [ -f \"/tmp/snmp.\\$PPID\" ]; then \
+help: Configure SNMP
+commit:expression: $VAR(community/) != ""; "must configure a community"
+create:expression: "/opt/vyatta/sbin/vyatta-snmp.pl --init-snmp"
+delete:expression: "touch /tmp/snmp.$PPID"
+end:expression: "if [ -f \"/tmp/snmp.$PPID\" ]; then \
         sudo /opt/vyatta/sbin/vyatta-snmp.pl --stop-snmp \
-        rm /tmp/snmp.\\$PPID; \
+        rm /tmp/snmp.$PPID; \
       else \
         sudo /opt/vyatta/sbin/vyatta-snmp.pl --update-snmp; \
       fi; "
diff --git a/templates/protocols/snmp/trap-target/node.def b/templates/protocols/snmp/trap-target/node.def
index 1a7d5bae..bfb450fd 100644
--- a/templates/protocols/snmp/trap-target/node.def
+++ b/templates/protocols/snmp/trap-target/node.def
@@ -1,3 +1,3 @@
 multi:
 type: ipv4
-help: "IPv4 address of trap target"
+help: IPv4 address of trap target