From 5761787b8482abd2c70b88288071c36625227e3a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 20:18:50 +0200 Subject: [PATCH 1/2] remove obsolete reference to tmp_dir Signed-off-by: Nico Schottelius --- doc/man/cdist-reference.text.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh index 2aa87aa1..3f9f7002 100755 --- a/doc/man/cdist-reference.text.sh +++ b/doc/man/cdist-reference.text.sh @@ -133,10 +133,6 @@ out/object/:: out/object//explorers:: Output of type specific explorers, per object. -tmp_dir:: - A tempdir and a tempfile is used by cdist internally, - which will be removed when the scripts end automatically. - TYPES ----- The following types are available: From 550ff8c7277e90aa0ae395b77eec3b34f43db2eb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 20:23:03 +0200 Subject: [PATCH 2/2] cleanup reference Signed-off-by: Nico Schottelius --- doc/man/cdist-reference.text.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh index 3f9f7002..3f4f7c98 100755 --- a/doc/man/cdist-reference.text.sh +++ b/doc/man/cdist-reference.text.sh @@ -65,16 +65,16 @@ conf/:: Contains the (static) configuration like manifests, types and explorers. conf/manifest/init:: - This is the central entry point used by cdist-manifest-init(1). + This is the central entry point. It is an executable (+x bit set) shell script that can use values from the explorers to decide which configuration to create for the specified target host. - It should be primary used to define mapping from configurations to hosts. + Its intent is to used to define mapping from configurations to hosts. conf/manifest/*:: All other files in this directory are not directly used by cdist, but you can seperate configuration mappings, if you have a lot of code in the - manifest/init file. This may also be helpful to have different admins + conf/manifest/init file. This may also be helpful to have different admins maintain different groups of hosts. conf/explorer/:: @@ -96,10 +96,10 @@ conf/type//manifest:: Used to generate additional objects from a type. conf/type//gencode-local:: - Used to generate code to be executed on the server. + Used to generate code to be executed on the source host conf/type//gencode-remote:: - Used to generate code to be executed on the client. + Used to generate code to be executed on the target host conf/type//parameter/required:: Parameters required by type, \n seperated list. @@ -184,10 +184,9 @@ __object_id:: the filesystem database and ensured by the core). Note: Double slashes ("//") will not be fixed and result in an error. - __self:: DEPRECATED: Same as __object_name, do not use anymore, use __object_name instead. - Will be removed in cdist 3.x. + Will be removed in cdist 2.1. __object_name:: The full qualified name of the current object. Available for: type manifest, type explorer, type gencode