Merge branch 'master' of https://github.com/agreif/cdist

docs/man/man7/cdist-manifest.text

@@ -25,8 +25,8 @@ the reference with pointers to the manpages.
 Types in manifests are used like normal command line tools. Let's have a look
 at an example:
 --------------------------------------------------------------------------------
-# Create object of type __package with the parameter state = removed
-__package apache2 --state removed
+# Create object of type __package with the parameter state = absent
+__package apache2 --state absent
 
 # Same with the __directory type
  __directory /tmp/cdist --state present
@@ -135,12 +135,12 @@ The initial manifest may for instance contain the following code:
 
 --------------------------------------------------------------------------------
 # Always create this file, so other sysadmins know cdist is used.
-__file /etc/cdist-configured --type file
+__file /etc/cdist-configured
 
 case "$__target_host" in
    my.server.name)
-      __file /root/bin/ --type directory
-      __file /etc/issue.net --type file --source "$__manifest/issue.net
+      __directory /root/bin/
+      __file /etc/issue.net --source "$__manifest/issue.net
    ;;
 esac
 --------------------------------------------------------------------------------
@@ -148,7 +148,7 @@ esac
 The manifest of the type "nologin" may look like this:
 
 --------------------------------------------------------------------------------
-__file /etc/nologin --type file --source "$__type/files/default.nologin"
+__file /etc/nologin --source "$__type/files/default.nologin"
 --------------------------------------------------------------------------------