Merge branch 'master' of https://github.com/cfengine/design-center into cleanup/dclib/tzconfig

Author: nickanderson

sketches/cfsketches.json

@@ -5,7 +5,7 @@ Tags: cfdc, logrotate
 Authors: Jon Henrik Bjornstad <[email protected]>
 
 ## Description
-Sets defaults and user permissions in the sudoers file
+Configure the LogRotate daemon
 
 ## Dependencies
 CFEngine::dclib, CFEngine::stdlib

sketches/system/logrotate/README.md

@@ -8,7 +8,7 @@
     "metadata":
     {
         "name": "System::Logrotate",
-        "description": "Sets defaults and user permissions in the sudoers file",
+        "description": "Configure the LogRotate daemon",
         "version": 1.00,
         "license": "MIT",
         "tags": [ "cfdc", "logrotate" ],

sketches/system/logrotate/sketch.json

@@ -5,7 +5,7 @@ Tags: cfdc, routes, iptables
 Authors: Jon Henrik Bjornstad <[email protected]>
 
 ## Description
-Sets defaults and user permissions in the sudoers file
+Sets default network routes
 
 ## Dependencies
 CFEngine::dclib, CFEngine::stdlib

sketches/system/routes/README.md

@@ -8,7 +8,7 @@
     "metadata":
     {
         "name": "System::Routes",
-        "description": "Sets defaults and user permissions in the sudoers file",
+        "description": "Sets default network routes",
         "version": 1.00,
         "license": "MIT",
         "tags": [ "cfdc", "routes", "iptables" ],

sketches/system/routes/sketch.json

@@ -8,7 +8,7 @@ Authors: Nick Anderson <[email protected]>, Ted Zlatanov <[email protected]>
 Manage system timezone configuration
 
 ## Dependencies
-CFEngine::dclib, CFEngine::stdlib
+CFEngine::dclib
 
 ## API
 ### bundle: set

sketches/system/tzconfig/README.md

@@ -26,7 +26,7 @@
     'list_activations',
    ],
    [
-    '-list [-v] params [REGEX|all]',
+    '-list [-v] paramsets [REGEX|all]',
     'List defined parameter sets. If REGEX is given, only list sets that match it (either in the set name or the sketch name to which they correspond). Use -v to show the values in each parameter set.',
     '(?:(-v)\b\s*)?param\S*(?:\s+(.*))?',
     'list_params',
@@ -50,7 +50,7 @@
     'list_all',
    ],
    [
-    'list [-v] [sketches|params|activations|environments|validations] [REGEX|all]',
+    'list [-v] [sketches|paramsets|activations|environments|validations] [REGEX|all]',
     'List defined sketches, parameter sets, activations, environments or validations (sketches is the default). If REGEX is given, only list those that match it. Use -v to show detailed information.',
     '(?:(-v)\b\s*)?(?:sketch\S*\b\s*)?(.*)',
     'list_sketches',

tools/cf-sketch/perl-lib/Parser/Commands/12list.pl

@@ -31,7 +31,7 @@
   'remove' =>
   [
    [
-    'remove params PARAMSET|all ...',
+    'remove paramset PARAMSET|all ...',
     'Undefine the given parameter sets. Use "all" to remove all of them.',
     'param\S*\s+(.*)',
     'remove_params',

tools/cf-sketch/perl-lib/Parser/Commands/16remove.pl

@@ -17,7 +17,7 @@
    [
     'define paramset SKETCH [ PARAMSET [FILE.json] ]',
     'Create a new parameter set for SKETCH named PARAMSET using the parameters from FILE.json, or interactively if the file is ommitted. If PARAMSET is omitted, a name is automatically generated.',
-    'param(?:set|eters|eterset)?\s+(\S+)\s*(?:\s+(\S+)(?:\s+(\S+))?)?',
+    'param\S*\s+(\S+)\s*(?:\s+(\S+)(?:\s+(\S+))?)?',
     'define_params'
    ],
    [