Merge remote branch 'nico/master'

doc/changelog

@@ -1,7 +1,10 @@
 1.6.0:
 	* New Type __package_yum
 	* New type __debconf_set_selections
+	* New explorer os_version
 	* Fix Type __group in case of __group NAME syntax
+	* Fix __package* types: consistently name --state removed instead of
+		uninstalled or deinstalled
 	* Type __package gained Fedora support
 	* Removed --preseed support from __package_apt
 	* explorer/os: gained Fedora support

doc/dev/logs/2011-04-04.openbsd

@@ -0,0 +1,24 @@
+
+Some openbsd experiements:
+
+# pkg_add foo                                                                                           
+Can't find foo
+# echo $?
+0
+# 
+# pkg_info foo
+# echo $?
+0
+
+# pkg_add -s vim 
+Ambiguous: vim could be vim-7.2.444-gtk2 vim-7.2.444-no_x11
+# pkg_add -s vim--no_x11
+# echo $?
+0
+# pkg_add -s vimfooooooooo
+Can't find vimfooooooooo
+# pkg_add -s vim--foooooooo
+Can't find vim--foooooooo
+# echo $?
+0
+

doc/dev/todo/1.6

@@ -1 +1,3 @@
-- adjust documentation / stages
+Documentation:
+   - update stages
+   - go through all manpages and ensure __ and co are correct

doc/dev/todo/TAKEME

@@ -23,6 +23,19 @@ CORE
    [20:22] kr:bin% 
 
 - probably remove or improve cdist-type-template
+- add $__tmp?
+   - for use in manifest, code, etc.?
+      - for creating temporary files, etc.
+
+- How to cleanly implement "restart service if config file changed"
+
+- Cache
+   - add example how to use 
+   - export variable $__cache
+      -> for current host
+      -> add function to cdist-config, import from cdist-cache
+
+- check all all internal variables are prefixed with __cdist
 
 TYPES
 ------
@@ -31,18 +44,12 @@ TYPES
    - regexp replace (can probably cover all?)
       -> aka sed.
 - __cron
-- __user:
+- __user
    add option to include --create-home
-   fix __user NAME case (same issue as __group)
 
 DOCUMENTATION
 --------------
 - asciidoc interprets __, which we use for variables
   names -> seek through docs and replace with \_\_!
-- check all all internal variables are prefixed with __cdist
+- reference explorers in cdist-reference!
 
-Cache:
-   - add example how to use 
-   - export variable $__cache
-      -> for current host
-      -> add function to cdist-config, import from cdist-cache

doc/man/cdist-reference.text.sh

@@ -45,9 +45,11 @@ cdist-reference - Variable, path and type reference for cdist
 
 DESCRIPTION
 -----------
-Various scripts which are not in the core need information on how
-to find information. This manpage summarises the available environment
-variables, types and paths and clearifies with part may access which variables.
+This reference summarises
+
+- environment variables
+- paths
+- types 
 
 
 PATHS
@@ -62,7 +64,6 @@ conf/manifest/init::
    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.
 
 conf/manifest/*::
@@ -103,15 +104,12 @@ conf/type/<name>/parameters/optional::
 
 conf/type/<name>/explorer::
    Location of the type specific explorers.
-
    This directory is referenced by the variable __type_explorer (see below).
-
    See cdist-explorer(7).
 
 out/::
    This directory contains output of cdist and is usually located
    in a temporary directory and thus will be removed after the run.
-
    This directory is referenced by the variable __global (see below).
 
 out/explorer::
@@ -122,7 +120,6 @@ out/object::
 
 out/object/<object>::
    Contains all object specific information.
-
    This directory is referenced by the variable __object (see below).
 
 out/object/<object>/explorers::
@@ -138,8 +135,8 @@ TYPES
 The available types are listed in the SEE ALSO section
 and are referenced as cdist-type__TYPENAME.
 
-VARIABLES
----------
+ENVIRONMENT VARIABLES
+---------------------
 __explorer::
    Directory that contains all explorers.
    Available for: explorer

doc/man/man7/cdist-hacker.text

@@ -59,7 +59,8 @@ HOW TO SUBMIT A NEW TYPE
 Submitting a type works as described above, with the additional requirement
 that a corresponding manpage named man.text in asciidoc format with
 the manpage-name "cdist-type__NAME" is included in the type directory
-AND asciidoc is able to compile it.
+AND asciidoc is able to compile it (i.e. do NOT have to many "=" in the second
+line).
 
 
 SEE ALSO