diff --git a/docs/changelog b/docs/changelog index 0a6a4986..68e040e4 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,6 +6,7 @@ Changelog 3.1.2: + * Documentation: Add missing environment variables to reference * Type __qemu_img: size is optional, if state is not present * Type __key_value: Rewrite using awk (Daniel Heule) * New Type: __dog_vdi diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index cff0f9c7..7081e762 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 2010-2013 Nico Schottelius (nico-cdist at schottelius.org) +# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org) # 2014 Daniel Heule (hda at sfs.biz) # # This file is part of cdist. @@ -237,6 +237,12 @@ The following environment variables influence the behaviour of cdist: require:: Setup dependencies between objects (see cdist-manifest(7)) +CDIST_LOCAL_SHELL:: + Use this shell locally instead of /bin/sh to execute scripts + +CDIST_REMOTE_SHELL:: + Use this shell remotely instead of /bin/sh to execute scripts + CDIST_OVERRIDE:: Allow overwriting type parameters (see cdist-manifest(7))