summaryrefslogtreecommitdiff
path: root/templates/system/sysctl
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-06-24 12:50:17 +0200
committerDaniil Baturin <daniil@baturin.org>2018-06-24 12:50:17 +0200
commitbacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch)
tree2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /templates/system/sysctl
parent0d8e75e2e808ccf366a1527647a6353c09d92237 (diff)
parent0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff)
downloadvyatta-cfg-system-lithium.tar.gz
vyatta-cfg-system-lithium.zip
Merge branch 'current' into lithiumlithium
Conflicts: debian/changelog scripts/snmp/vyatta-snmp-v3.pl scripts/snmp/vyatta-snmp.pl templates/interfaces/tunnel/node.def templates/system/sysctl/custom/node.def
Diffstat (limited to 'templates/system/sysctl')
-rw-r--r--templates/system/sysctl/custom/node.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/system/sysctl/custom/node.def b/templates/system/sysctl/custom/node.def
index 4e6480ea..a072b2ba 100644
--- a/templates/system/sysctl/custom/node.def
+++ b/templates/system/sysctl/custom/node.def
@@ -1,5 +1,5 @@
tag:
priority: 318
type: txt
-help: Define specific sysctl option to modify
+help: Define specific sysctl options to modify
val_help: <sysctl_option> ; Name of sysctl option you want to modify