Merge branch 'master' into feature_init_process

Conflicts:
	doc/man/cdist-reference.text.sh

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-02-14 13:56:29 +01:00
commit 18eaa476e4

View file

@ -166,8 +166,8 @@ changed::
ENVIRONMENT VARIABLES
---------------------
__explorer::
Directory that contains all global explorers.
Available for: explorer, type explorer
Directory that contains all global explorers.
Available for: explorer, type explorer
__manifest::
Directory that contains the initial manifest.
Available for: initial manifest
@ -192,8 +192,8 @@ __object_name::
The full qualified name of the current object.
Available for: type manifest, type explorer, type gencode
__target_host::
The host we are deploying to.
Available for: explorer, initial manifest, type explorer, type manifest, type gencode
The host we are deploying to.
Available for: explorer, initial manifest, type explorer, type manifest, type gencode
__type::
Path to the current type.
Available for: type manifest, type gencode