diff --git a/HACKERS_README b/HACKERS_README
index 04a09d53..fa01666f 100755
--- a/HACKERS_README
+++ b/HACKERS_README
@@ -2,13 +2,16 @@ cat << eof
 
 Hey hackers,
 
-cdist has not been published, you're accessing a early in developent
-code.
+this README is for you, for those who want to dig into cdist, hack it or try
+to get a deeper understanding.
 
-Do not believe anything written in cdist, besides what's written in this file
-(everything else may be future stuff for the initial release).
+A lot of documentation is still missing, but running cdist-quickstart should
+give you an impression of how cdist works.
 
-   -- Nico, 20101201
+I hope you have a lot of fun with cdist, because it was also a lot of fun to
+develop it!
+
+   -- Nico, 20110304
 
 
 ## Conventions
@@ -21,7 +24,7 @@ Do not believe anything written in cdist, besides what's written in this file
 This file is suitable for execution and saving the objects and
 explorers from cdist. I usually do it like this:
 
-   % rm -rf /tmp/localhost && ./HACKERS_README
+   % ./HACKERS_README
 
 ################################################################################
 eof
diff --git a/Makefile b/Makefile
index 476bc89a..23b7962d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,47 +8,45 @@ A2X=a2x -f manpage --no-xmllint
 WEBDIR=$$HOME/niconetz
 WEBPAGE=software/cdist.mdwn
 
-MANSRC=doc/man/cdist-config-layout.text \
-	doc/man/cdist-config.text 		\
-	doc/man/cdist-explorer.text	\
-	doc/man/cdist-quickstart.text \
-	doc/man/cdist-stages.text		\
-	doc/man/cdist-terms.text 		\
-	doc/man/cdist-type.text
+MANDIR=doc/man
+MANSRC=$(MANDIR)/cdist-config-layout.text \
+	$(MANDIR)/cdist-config.text 		\
+	$(MANDIR)/cdist-explorer.text	\
+	$(MANDIR)/cdist-quickstart.text \
+	$(MANDIR)/cdist-stages.text		\
+	$(MANDIR)/cdist-terms.text 		\
+	$(MANDIR)/cdist-type.text
 
-MANSRC=doc/man/cdist.text			\
-   doc/man/cdist-deploy-to.text 	\
-	doc/man/cdist-manifest.text 	\
+MANSRC=$(MANDIR)/cdist.text			\
+   $(MANDIR)/cdist-deploy-to.text 	\
+	$(MANDIR)/cdist-manifest.text 	\
 
 
 ################################################################################
 # User targets
 #
 
-all: man
+all:
+	@echo ''
+	@echo 'Welcome to cdist!'
+	@echo ''
+	@echo 'Here are the possible targets:'
+	@echo ''
+	@echo '	man: Build manpages'
+	@echo '	clean: Remove build stuff'
+	@echo ''
+	@echo ''
 
 man: doc/man/.marker
 
 doc/man/.marker: $(MANSRC)
-	for man in $(MANSRC); do $(A2X) $$man; done
+	for mansrc in $(MANSRC); do $(A2X) $$mansrc; done
+	for manpage in $(MANDIR)/*.[1-9]; do cat=$${manpage##*.}; echo $$cat; mandir=$(MANDIR)/man$$cat; mkdir -p $$mandir; mv $$manpage $$mandir; done
 	touch $@
 
 clean:
 	rm -f doc/man/*.html doc/man/*.[1-9]
 
-################################################################################
-# Install targets
-#
-
-# FIXME: some distro nerd, can you make this more beautiful?
-# Like integrating install, ...
-# I'm just a hacker, I don't really care...
-install: install-man
-	cp bin/* $(BINDIR)
-
-install-man:
-	for p in doc/man/*.[1-9]; do n=$${p##*.}; cp $$p $(MANDIR)/man$$n/; done
-
 ################################################################################
 # Developer targets
 #
diff --git a/README b/README
index 585317cb..ace36209 120000
--- a/README
+++ b/README
@@ -1 +1 @@
-HACKERS_README
\ No newline at end of file
+REAL_README
\ No newline at end of file
diff --git a/REAL_README b/REAL_README
index 5b950519..7cefb29e 100644
--- a/REAL_README
+++ b/REAL_README
@@ -1,5 +1,7 @@
 [[!meta title="cdist - configuration management"]]
 
+[[!toc  levels=2]]
+
 ## Introduction
 
 cdist configures your system and is similar to
@@ -11,23 +13,23 @@ and [puppet](http://www.puppetlabs.com/), but
 it ticks differently:
 
  * cdist sticks completly to the KISS (keep it simple and stupid) paradigma
-  * cdist's core is very small (currently around 400 lines of code)
+  * cdist's core is very small (< 1k lines of code)
   * There is only one type to extend cdist called ***type***.
+  * One main development target: ***It must be incredible easy to add new types.***
  * cdist is UNIX
   * It reuses existing tools like cat, find, mv, ...
   * cdist's documentation is bundled as manpages
  * cdist is written in POSIX shell
   * No special requirements like high level interpreters needed on server or target
 
-MAIN AIM:  It MUST be incredible easy/dumb to add new types.
-
-
 ### Architecture
 
  * Push mode (server pushes configuration)
- * Pull mode (client triggers configuration)
+ * Pull mode planned (client triggers configuration)
  * User defines configuration in shell scripts (called ***manifests***)
- * Cdist generates internal configuration (cconfig style) and afterwards applies configuration
+ * Generates internal configuration (cconfig style)
+ * Uses ***types*** to generate code be executed on the target
+ * And finally executes the code on the target / applies the configuration
 
 ### Features
 
@@ -51,39 +53,69 @@ but is not. Or: The reason why I began to write cdist.
   * sh
   * find, rm, ...
 
+### Roadmap
+
+[[!table  data="""
+**Version** | **Objectives** | **Status**
+1.0.0 | Initial release |
+1.0.1 | Documentation cleanup |
+"""]]
+
 ## Requirements
 
 ### Server
 
  * A posix like shell
- * SSH-Client (for push architecture)
- * SSH-Server (for pull architecture)
+ * SSH-Client
 
-### Client
+### Client ("target host")
 
  * A posix like shell
- * SSH-Client (for pull architecture)
- * SSH-Server (for push architecture)
+ * SSH-Server
+
+
+## Getting cdist
+
+You can clone cdist from git, which gives you the advantage of having
+a version control in place for development of your own stuff as well.
+
+### Installation
 
-## Installation
+To install cdist, execute the following commands:
 
-Cdist stable always in master
+    git clone git://git.schottelius.org/cdist
+    cd cdist
+    export PATH=$PATH:$(pwd -P)/bin
 
- * Create a new unpriviliged user (probably "cdist")
- * Become that user, execute the following code:
 
-git clone git://git.schottelius.org/cdist
-cd cdist
-export PATH=$PATH:$(pwd -P)/bin
- 
-That's it.
+Afterwards you can run ***cdist-quickstart*** to get an impression on
+how to use cdist.
 
-Operation on the server is run as "cdist" user.
-Operation on the client is run as "root" user.
+### Available versions
 
-## Update
+There are at least two branches available:
 
-git pull && make install
+ * master: the development branch
+ * 1.0: stable branch of version 1.0
+
+Other branches may be available as well for features or bugfixes, but they
+may vanish at any point. To select a specific branch use
+
+    # Generic code
+    git checkout -b <name> origin/<name>
+    
+    # Stay on version 1.0
+    git checkout -b 1.0 origin/1.0
+
+### Update
+
+To upgrade cdist in the current branch use
+
+    git pull
+
+The version branches are designed to change if there are incompatibilities.
+Or the other way round: As long as you stay on 1.0 and do git pull, nothing
+should break.
 
 ## Support
 
@@ -96,7 +128,3 @@ You can join the development ***IRC channel***
 
 Bug reports, questions, patches, etc. should be send to the
 [cdist mailing list](http://l.schottelius.org/mailman/listinfo/cdist).
-
-## Commercial Support
-
-To be done.
diff --git a/TODO-1.0 b/TODO-1.0
deleted file mode 100644
index a8874914..00000000
--- a/TODO-1.0
+++ /dev/null
@@ -1,73 +0,0 @@
-Steps needed until 1.0:
-
-   x finish type __file
-   - finish type __package
-   - cleanup documentation (see below)
-
---------------------------------------------------------------------------------
-
-This document defines how to continue work on cdist:
-
-x general stuff
-   x Define configuration paths (doc/internal/config-layout)
-   x check whether remote and local view of objects can be the same,
-    i.e. local:/outdir == remote:/var/lib/cdist
-    x similar, but not the same
-
-x get information from target (stage 1)
-   x Define how to get information from targets
-      x Create shell script that creates code to run on client (cdist-build-explorer)
-   x Redo explorers (see manpage)
-x run initial manifest (stage 2)
-   x Create configuration tree from manifest
-      x write binaries, which create the tree when called from manifest (cdist_tree_wrapper)
-
-x be able to run manifest of types (stage 3)
-   x Parse configuration tree/objects recursively
-      x can/may types modify tree?
-         -> yes, of everything a type created itself!
-         x may open door for getting information from manifest / other stuff
-   x Cleanly define paths for object creation, especially recursive calls
-      x doc/man/cdist-config-layout.text
-   x cd $__object_dir, before running manifest
-   x rename $__object_dir to $__object_base_dir
-   x use $type/manifest instead of $type/init
-   x find $object_id in recursive runner (before merge)
-   x move parameters of object to subdir parameter
-   x run explorers for every object
-
-x generate code to be executed on clients (stage 4)
-   x for one object
-   x for all objects
-
-x execute code on client (stage 5)
-
-- Last doc stuff for 1.0.0:
-   x remove old documentation from doc/man/!
-   - Check all references in manpages, ensure all manpages exist
-      - cdist
-      - cdist-deploy-to
-      - cdist-manifest
-      - cdist-quickstart: how to get started
-   - ensure every file in bin/ has a correspondent manpage
-   - cdist-type           [IMPORTANT]
-      - only do necessary work [TYPE IMPLEMENTATION HINTS]
-         - install packages only if not existent
-         - copy file only if different
-   - cdist-type-integration
-   - cdist                 [IMPORTANT]
-      - explain the general approach
-      - give right pointers
-   - cdist-explorer
-
-   - DOC document "cd $__object_dir, before running manifest" in doc/man/cdist-types.text
-   - DOC document that $type/manifest is executed for every object/instance
-   - DOC: exported variables: __type, __explorer, __type_explorer, __object, __object_id
-
-   - Cleanup READMEs
-   - Ensure manpages are formatted correctly
-   - Ensure html output of manpages are published on the web
-
-- Makefile:
-   - Add install target
-   - Include manpage generation
diff --git a/bin/cdist-bin-transfer b/bin/cdist-bin-transfer
index d7a1dbe3..7b98de28 100755
--- a/bin/cdist-bin-transfer
+++ b/bin/cdist-bin-transfer
@@ -41,4 +41,11 @@ ssh "${__cdist_remote_user}@${__cdist_target_host}" \
 
 # Transfer cdist-* to the remote host
 scp -qr "${__cdist_src_base}"* \
-       "root@${__cdist_target_host}:${__cdist_my_remote_out_dir}"
+       "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_my_remote_out_dir}"
+
+# Adjust cdist-config to contain static version string
+tmp_version="$__cdist_version"
+sed "s/^: \${\(__cdist_version\):=.*/\1=\"$tmp_version\"/" "$(which cdist-config)" | \
+   ssh -q "${__cdist_remote_user}@${__cdist_target_host}"                     \
+      "cat > \"${__cdist_my_remote_out_dir}\"/cdist-config"
+
diff --git a/bin/cdist-config b/bin/cdist-config
index d1adf760..fd0ae9ab 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -22,17 +22,30 @@
 # Fail if something bogus is going on and export all variables
 set -u
 
-__cdist_version="1.0.0"
+################################################################################
+# cconf standard vars prefixed with cdist
+
+__cdist_pwd="$(pwd -P)"
+__cdist_mydir="${0%/*}";
+__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
+__cdist_myname=${0##*/};
+__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 
+: ${__cdist_version:="$(cd "$__cdist_abs_mydir/.." && git describe)"}
+
+################################################################################
+# Names / Constants
+#
 # Most values can be overriden from outside, so you can
 # customise paths as you like (for distributors, geeks and hackers)
+#
 
-# Names / Constants
 : ${__cdist_name_bin:=bin}
 : ${__cdist_name_code:=code}
 : ${__cdist_name_conf_dir:=conf}
 : ${__cdist_name_explorer:=explorer}
 : ${__cdist_name_gencode:=gencode}
+: ${__cdist_name_global:=global}
 : ${__cdist_name_host:=host}
 : ${__cdist_name_init:=init}
 : ${__cdist_name_manifest:=manifest}
@@ -49,10 +62,19 @@ __cdist_version="1.0.0"
 : ${__cdist_name_type_bin:=type_bin}
 : ${__cdist_name_type_explorer:=type_explorer}
 
+# Used for IDs
+: ${__cdist_sane_regexp:=[A-Za-z0-9/]*[-A-Za-z0-9_/]*}
+
+# Default remote user
+: ${__cdist_remote_user:=root}
 
-# Exported variable names (usable for non core)
+
+################################################################################
+# Exported variable names (usable for non core
+#
 : ${__cdist_name_var_explorer:=__$__cdist_name_explorer}
 : ${__cdist_name_var_type_explorer:=__$__cdist_name_type_explorer}
+: ${__cdist_name_var_global:=__$__cdist_name_global}
 : ${__cdist_name_var_manifest:=__$__cdist_name_manifest}
 : ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
 : ${__cdist_name_var_object:=__$__cdist_name_object}
@@ -60,53 +82,49 @@ __cdist_version="1.0.0"
 : ${__cdist_name_var_type:=__$__cdist_name_type}
 
 
-# Base
-: ${__cdist_conf_dir:=/etc/cdist}
+################################################################################
+# Tempfiles
+# 
+__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
+__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
+
+################################################################################
+# Local Base
+# 
+: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
+
+: ${__cdist_conf_dir:="$(cd "$__cdist_abs_mydir/../conf" && pwd -P)"}
+
 : ${__cdist_explorer_dir:=$__cdist_conf_dir/$__cdist_name_explorer}
 : ${__cdist_manifest_dir:=$__cdist_conf_dir/$__cdist_name_manifest}
 : ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init}
 : ${__cdist_type_dir:=$__cdist_conf_dir/$__cdist_name_type}
 
-# Used for IDs
-__cdist_sane_regexp='[A-Za-z0-9/]*[-A-Za-z0-9_/]*'
-
-# Default remote user
-: ${__cdist_remote_user:=root}
+################################################################################
+# Local output
+# 
+: ${__cdist_out_dir:=$__cdist_local_base_dir/$__cdist_name_out_dir}
+: ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
+: ${__cdist_out_object_dir:=$__cdist_out_dir/$__cdist_name_object}
+: ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}
 
+################################################################################
 # Remote base
+# 
 : ${__cdist_remote_base_dir:=/var/lib/cdist}
-
-# Remote config
+: ${__cdist_remote_bin_dir:=$__cdist_remote_base_dir/$__cdist_name_bin}
 : ${__cdist_remote_conf_dir:=$__cdist_remote_base_dir/$__cdist_name_conf_dir}
+
 : ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer}
-: ${__cdist_remote_bin_dir:=$__cdist_remote_conf_dir/$__cdist_name_bin}
 : ${__cdist_remote_type_dir:=$__cdist_remote_conf_dir/$__cdist_name_type}
 
-# Remote out
+################################################################################
+# Remote output
+#
 : ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
 : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}
 : ${__cdist_remote_out_object_base_dir:=$__cdist_remote_out_dir/$__cdist_name_object}
 
-# Tempfiles
-__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
-__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
-
-# Local output base directory
-: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
-: ${__cdist_out_dir:=$__cdist_local_base_dir/$__cdist_name_out_dir}
-: ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
-: ${__cdist_out_object_dir:=$__cdist_out_dir/$__cdist_name_object}
-: ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}
-
-
-################################################################################
-# cconf standard vars prefixed with cdist
-__cdist_pwd="$(pwd -P)"
-__cdist_mydir="${0%/*}";
-__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
-__cdist_myname=${0##*/};
-__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
-
 ################################################################################
 # Function list
 #
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 5c78f695..c576dfd6 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -40,7 +40,7 @@ echo "cdist $__cdist_version: Configuring $__cdist_target_host"
 #
 
 # Prepare local and remote directories
-__cdist_init_deploy "$__cdist_target_host"
+__cdist_init_deploy           "$__cdist_target_host"
 
 # Transfer cdist "binaries"
 cdist-bin-transfer            "$__cdist_target_host" "$__cdist_remote_bin_dir"
diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index d10cba02..240d446b 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -34,7 +34,10 @@ __cdist_output_dir="$1"; shift
 __cdist_work_dir="$__cdist_local_base_dir"
 
 # Export information for cdist-type-emulator
-export __cdist_output_dir __cdist_manifest
+export __cdist_conf_dir __cdist_output_dir __cdist_manifest __cdist_version
+
+# Export information for manifests
+export __global="$__cdist_out_dir"
 
 # Ensure binaries exist and are up-to-date
 cdist-type-build-emulation "${__cdist_out_type_bin_dir}" \
diff --git a/bin/cdist-object-codegen b/bin/cdist-object-codegen
index b9bdae72..a1092a46 100755
--- a/bin/cdist-object-codegen
+++ b/bin/cdist-object-codegen
@@ -40,6 +40,7 @@ gencode="$(__cdist_type_gencode "$__cdist_type")"
 # export variables for gencode
 export __object_id="$__cdist_object_id"
 export __object="$__cdist_object_dir"
+export __global="$__cdist_out_dir"
 
 cd "$__cdist_local_base_dir"
 
diff --git a/bin/cdist-quickstart b/bin/cdist-quickstart
index 08122a39..781c1b45 100755
--- a/bin/cdist-quickstart
+++ b/bin/cdist-quickstart
@@ -35,100 +35,231 @@ __prompt()
 }
 
 ################################################################################
-# Intro
+# Intro of quickstart
 #
 cat << eof
 $banner cdist version $__cdist_version
 
 Welcome to the interactive guide to cdist!
-This is the interactive tutorial and beginners help for cdist.
+This is the interactive tutorial and beginners help for cdist and here's
+our schedule:
 
-If you would like to run this tutorial completly without root priveliges,
-setup the variables __cdist_conf_dir to point to a writable locaction
-(i.e. $HOME/cdist-config).
+   - Stages:   How cdist operates
+   - Explorer: Explore facts of the target host
+   - Manifest: Map configurations to hosts
+   - Types:    Bundled functionality
+   - Deploy a configuration to the local host!
 
 eof
 __prompt "$continue"
 
 ################################################################################
-# /etc/cdist via root
+# Stages
 #
 cat << eof
-To make any use of cdist, we need to create the configuration base, which
-can normally be found below ${__cdist_conf_dir}. As cdist does not need
-any root priveliges normally, it is recommended that you create this
-directory as root and change the owner to a dedicated user (for instance
-cdist).
 
-MANUAL STEP:
+To deploy configurations to a host, you call
 
-   - Become root: su -
-   - Create ${__cdist_conf_dir}: mkdir ${__cdist_conf_dir}
-   - Change owner to $USER: chown $USER ${__cdist_conf_dir}
+   cdist-deploy-to <hostname>
+
+which makes calls to other scripts, which realise the so called "stages".
+Usually you'll not notice this, but in case you want to debug or hack cdist,
+you can run each stage on its own. Besides that, you just need to remember
+that the command cdist-deploy-to is the main cdist command.
+
+See also:
+
+   Source of cdist-deploy-to, cdist-stages(7)
 
 eof
 __prompt "$continue"
 
 ################################################################################
-# Basic directories
+# Explorer
 #
 cat << eof
-Now we need to create some basic directories:
 
-   - ${__cdist_explorer_dir}: Contains explorer, which explore the target
-   - ${__cdist_manifest_dir}: Contains manifests which define types being used
-   - ${__cdist_type_dir}: Contains types
+The first thing cdist always does is running different explorers on the
+target host. The explorers can be found in the directory
+
+   ${__cdist_explorer_dir}
+
+An explorer is executed on the target host and its output is saved to a file.
+You can use these files later to decide what or how to configure the host.
+
+For a demonstration, we'll call the OS explorer locally now, but remember:
+This is only for demonstration, normally it is run on the target host.
+The os explorer will which either displays the detected operating system or
+nothing if it does not know your OS.
+
+See also:
+
+   cdist-explorer(7)
 
 eof
-__prompt "$create_continue"
+explorer="${__cdist_explorer_dir}/os"
+
+__prompt "Press enter to execute $explorer"
 
 set -x
-mkdir -p ${__cdist_explorer_dir}
-mkdir -p ${__cdist_manifest_dir}
-mkdir -p ${__cdist_type_dir}
+"$explorer"
 set +x
 
 ################################################################################
-# create manifest/init
+# Manifest
 #
 cat << eof
-At the beginning of a configuration deployment the first file cdist reads is
-${__cdist_manifest_init}, which defines the types to be created on
-a specific host.
 
-We'll create the initial manifest and add some example types to it.
+The initial manifest is the entry point for cdist to find out, what you would
+like to have configured. It is located at
 
-eof
-__prompt "$create_continue"
+   ${__cdist_manifest_init}
 
-set -x
-cat << eof > "${__cdist_manifest_init}"
-# Always create a marker
+And can be as simple as
+
+--------------------------------------------------------------------------------
 __file /etc/cdist-configured --type file
+--------------------------------------------------------------------------------
 
-case "\$__target_host" in
-   $(hostname)*)
-      __file /tmp/cdist-quickstart --type file
-   ;;
-esac
+See also:
+
+   cdist-manifest(7)
 
 eof
-set +x
+__prompt "$continue"
+
+cat << eof
+
+Let's take a deeper look at the initial manifest to understand what it means:
+
+   __file /etc/cdist-configured --type file
+      |     |                    |        \\
+      |     |        The parameter type    \\ With the value file
+      |     |
+      |     |
+      |     | This is the object id
+      |
+   __file is a so called "type"
+
+
+This essentially looks like a standard command executed in the shell.
+eof
+__prompt "$continue"
+
+cat << eof
+
+And that's exactly true. Manifests are shell snippets that can use
+types as commands with arguments. cdist prepends a special path
+that contain links to the cdist-type-emulator, to \$PATH, so you
+can use your types as a command.
+
+This is also the reason why types should always be prefixed with
+"__", to prevent collisions with existing binaries.
+
+The object id is unique per type and used to prevent you from creating
+the same object twice.
+
+Parameters are type specific and are always specified as --parameter <value>.
+
+See also:
+
+   cdist-type-build-emulation(1), cdist-type-emulator(1)
+
+eof
+__prompt "$continue"
 
 ################################################################################
-# show generated manifest/niit
+# Types
 #
 cat << eof
-Let's have a look how the initial manifest looks like currently:
---------------------------------------------------------------------------------
+
+Types are bundled functionality and are the main component of cdist.
+If you want to have a feature x, you write the type __x. Types are stored in
+
+   ${__cdist_type_dir}
+
+And cdist ships with some types already!
+
+See also:
+
+   cdist-type(7)
+
 eof
-cat "${__cdist_manifest_init}"
+__prompt "Press enter to see available types"
+
+set -x
+ls ${__cdist_type_dir}
+set +x
+
 cat << eof
---------------------------------------------------------------------------------
+
+Types consist of the following parts:
+
+   - ${__cdist_name_parameter} (${__cdist_name_parameter_required}/${__cdist_name_parameter_optional}
+   - ${__cdist_name_manifest}
+   - ${__cdist_name_explorer}
+   - ${__cdist_name_gencode}
+
 eof
+__prompt "$continue"
+
+
+cat << eof
+
+Every type must have a directory named ${__cdist_name_parameter}, which
+contains required or optional parameters (in newline seperated files).
 
+If an object of a specific type was created in the initial manifest,
+the manifest of the type is run and may create other objects.
+
+A type may have ${__cdist_name_explorer}, which are very similar to the
+${__cdist_name_explorer} seen above, but with a different purpose:
+They are specific to the type and are not relevant for other types.
+
+You may use them for instance to find out details on the target host,
+so you can decide what to do on the target host eventually.
+
+After the ${__cdist_name_manifest} and the ${__cdist_name_explorer} of
+a type have been run, ${__cdist_name_gencode} is executed, which creates
+code to be executed on the target on stdout.
+
+eof
 __prompt "$continue"
 
 ################################################################################
-# add type file
+# Deployment
 #
+
+cat << eof
+
+Now you've got some basic knowledge about cdist, let's configure your localhost!
+
+Ensure that you have a ssh server running locally and that you can login as root.
+
+The cdist distribution contains some sensible default initial manifest, which
+will create 2 files, /etc/cdist-configured (for every host) and
+/tmp/cdist-testfile (only for localhost).
+
+eof
+
+cmd="cdist-deploy-to localhost"
+
+__prompt "Press enter to run \"$cmd\""
+
+# No quotes, we need field splitting
+$cmd
+
+################################################################################
+# End
+#
+
+cat << eof
+
+That's it, this is the end of the cdist-introduction.
+
+I hope you've got some impression on how cdist works, here are again some
+pointers on where to continue to read:
+
+cdist(7), cdist-deploy-to(1), cdist-type(7), cdist-stages(7)
+
+eof
diff --git a/bin/cdist-remote-explorer-run b/bin/cdist-remote-explorer-run
index 7064a323..0dae3007 100755
--- a/bin/cdist-remote-explorer-run
+++ b/bin/cdist-remote-explorer-run
@@ -39,12 +39,10 @@ __cdist_explorer_dir="$1"; shift
 # Write output here
 __cdist_my_out_dir="$1"; shift
 
-# cd to this dir
-__cdist_work_dir="$__cdist_remote_base_dir"
-
 # Setup environment
 export $__cdist_variable_name="$__cdist_explorer_dir"
-cd "${__cdist_work_dir}"
+export __global="$__cdist_remote_out_dir"
+
 mkdir -p "$__cdist_my_out_dir"
 
 # Ensure there is at least one explorer
diff --git a/conf/explorer/os b/conf/explorer/os
index 41d70545..f7481193 100755
--- a/conf/explorer/os
+++ b/conf/explorer/os
@@ -28,13 +28,56 @@ if grep -q ^DISTRIB_ID=Ubuntu /etc/lsb-release 2>/dev/null; then
    exit 0
 fi
 
-[ -f /etc/arch-release ] && echo archlinux
+if [ -f /etc/arch-release ]; then
+   echo archlinux
+   exit 0
+fi
 
-[ -f /etc/debian_version ] && echo debian
+if [ -f /etc/debian_version ]; then
+   echo debian
+   exit 0
+fi
+
+if [ -f /etc/gentoo-release ]; then
+   echo gentoo
+   exit 0
+fi
+
+if [ -f /etc/redhat-release ]; then
+   echo redhat
+   exit 0
+fi
+
+if [ -f /etc/SuSE-release ]; then
+   echo suse
+   exit 0
+fi
 
-[ -f /etc/gentoo-release ] && echo gentoo
+uname_s="$(uname -s)"
 
-[ -f /etc/redhat-release ] && echo redhat
+# Assume there is no tr on the client -> do lower case ourselves
+case "$uname_s" in
+   Darwin)
+      echo macosx
+      exit 0
+   ;;
+   NetBSD)
+      echo netbsd
+      exit 0
+   ;;
+   FreeBSD)
+      echo freebsd
+      exit 0
+   ;;
+   OpenBSD)
+      echo openbsd
+      exit 0
+   ;;
+   SunOS)
+      echo solaris
+      exit 0
+   ;;
+esac
 
-# ensure correct exit, otherwise other explorer won't get started
-exit 0
+echo "Unknown OS" >&2
+exit 1
diff --git a/conf/manifest/init b/conf/manifest/init
index 51b06e6f..beccc84b 100755
--- a/conf/manifest/init
+++ b/conf/manifest/init
@@ -10,7 +10,6 @@ __file /etc/cdist-configured --type file
 case "$__target_host" in
    # Everybody has this
    localhost)
-      __issue iddoesnotmatterhere
       __file test --type file --destination /tmp/cdist-testfile
    ;;
 
@@ -29,4 +28,7 @@ case "$__target_host" in
       __package_apt zsh --state installed
       __package_apt apache2 --state uninstalled
    ;;
+   kr)
+      __issue iddoesnotmatterhere
+   ;;
 esac
diff --git a/conf/type/__file/explorer/md5sum b/conf/type/__file/explorer/md5sum
index f755c769..b2867385 100755
--- a/conf/type/__file/explorer/md5sum
+++ b/conf/type/__file/explorer/md5sum
@@ -24,12 +24,24 @@
 if [ -f "$__object/parameter/destination" ]; then
    destination="$(cat "$__object/parameter/destination")"
 else
-   destination="$__object_id"
+   destination="/$__object_id"
 fi
 
+os="$(cat $__global/explorer/os)"
+
+case "$os" in
+   macosx)
+      md5sum="md5"
+   ;;
+
+   *)
+      md5sum="md5sum"
+   ;;
+esac
+
 # No output if file does not exist - does definitely not match the md5sum :-)
 if [ -e "$destination" ]; then
-   md5sum "$destination"
+   $md5sum < "$destination"
 else
-   echo "NO FILE NOT FOUND, NO CHECKSUM CALCULATED."
+   echo "NO FILE FOUND, NO CHECKSUM CALCULATED."
 fi
diff --git a/conf/type/__file/gencode b/conf/type/__file/gencode
index e0398877..0f3b1bf8 100755
--- a/conf/type/__file/gencode
+++ b/conf/type/__file/gencode
@@ -40,20 +40,26 @@ if ! $(echo "$destination" | grep -q ^/); then
    exit 1
 fi
 
+case "$os" in
+   macosx)
+      md5sum="md5"
+   ;;  
+
+   *)  
+      md5sum="md5sum"
+   ;;  
+esac
+
 # Copy source if existing
 # FIXME: directory handling not supported - add recursive flag?
 if [ -f "$__object/parameter/source" ]; then
    source="$(cat "$__object/parameter/source")"
 
-   exec 3>&1
-   exec 1>&2
-
-   set -x
-   md5sum="$(md5sum "$source")"
+   local_md5sum="$($md5sum < "$source")"
    remote_md5sum="$(cat "$__object/explorer/md5sum")"
 
    # Is md5sum the right approach?
-   if [ "$md5sum" != "$remote_md5sum" ]; then
+   if [ "$local_md5sum" != "$remote_md5sum" ]; then
       # FIXME: This is ugly and hardcoded, replace after 1.0!
       # Probably a better aproach is to have the user configured
       # ~/.ssh/config to contain the right username
diff --git a/doc/dev/config.guess b/doc/dev/config.guess
new file mode 100644
index 00000000..fd30ab03
--- /dev/null
+++ b/doc/dev/config.guess
@@ -0,0 +1,1354 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-07-23'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# This shell variable is my proudest work .. or something. --bje
+
+set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
+(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
+   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
+dummy=$tmpdir/dummy ;
+files="$dummy.c $dummy.o $dummy.rel $dummy" ;
+trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $files ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;
+unset files'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy && rmdir $tmpdir
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+		rm -f $dummy.c $dummy && rmdir $tmpdir
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		fi ;;
+	esac
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c && rmdir $tmpdir
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:3*)
+	echo i386-pc-interix3
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i386-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+rm -f $dummy.c $dummy && rmdir $tmpdir
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/doc/dev/logs/20101201/SCAN0000.PDF b/doc/dev/logs/2010-12-01.handwritten/SCAN0000.PDF
similarity index 100%
rename from doc/dev/logs/20101201/SCAN0000.PDF
rename to doc/dev/logs/2010-12-01.handwritten/SCAN0000.PDF
diff --git a/doc/dev/logs/20101201/SCAN0001.PDF b/doc/dev/logs/2010-12-01.handwritten/SCAN0001.PDF
similarity index 100%
rename from doc/dev/logs/20101201/SCAN0001.PDF
rename to doc/dev/logs/2010-12-01.handwritten/SCAN0001.PDF
diff --git a/doc/dev/logs/20101201/SCAN0002.PDF b/doc/dev/logs/2010-12-01.handwritten/SCAN0002.PDF
similarity index 100%
rename from doc/dev/logs/20101201/SCAN0002.PDF
rename to doc/dev/logs/2010-12-01.handwritten/SCAN0002.PDF
diff --git a/doc/dev/logs/20101201/SCAN0003.PDF b/doc/dev/logs/2010-12-01.handwritten/SCAN0003.PDF
similarity index 100%
rename from doc/dev/logs/20101201/SCAN0003.PDF
rename to doc/dev/logs/2010-12-01.handwritten/SCAN0003.PDF
diff --git a/doc/dev/logs/20101201/SCAN0004.PDF b/doc/dev/logs/2010-12-01.handwritten/SCAN0004.PDF
similarity index 100%
rename from doc/dev/logs/20101201/SCAN0004.PDF
rename to doc/dev/logs/2010-12-01.handwritten/SCAN0004.PDF
diff --git a/doc/dev/logs/2011-03-03 b/doc/dev/logs/2011-03-03
new file mode 100644
index 00000000..3f900c15
--- /dev/null
+++ b/doc/dev/logs/2011-03-03
@@ -0,0 +1,9 @@
+Update on env:
+
+   general explorer: __explorer
+   initial manifest: __manifest, __global
+   type manifests  __object, __object_id, __global
+   type explorers:  __object, __object_id, __type_explorers
+   type codegen:  __object, __object_id, __global
+   type code:  -
+
diff --git a/doc/dev/logs/2011-03-07 b/doc/dev/logs/2011-03-07
new file mode 100644
index 00000000..35dff279
--- /dev/null
+++ b/doc/dev/logs/2011-03-07
@@ -0,0 +1,9 @@
+Update on env:
+
+   general explorer: __explorer
+   initial manifest: __manifest, __global
+   type manifests  __object, __object_id, __global
+   type explorers:  __object, __object_id, __type_explorers, __global
+   type codegen:  __object, __object_id, __global
+   type code:  -
+
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index ccfaf288..6a7da465 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,5 +1 @@
-Prepare documentation for 1.0.0.
-   - Check all references in manpages
-      - cdist.text, cdist-quickstart
-         - write cdist-quickstart
-            - redefine installation + configuration base?
+Prepare release 1.0.0
diff --git a/doc/dev/todo/post-1.0 b/doc/dev/todo/post-1.0
index 379fa214..e469214e 100644
--- a/doc/dev/todo/post-1.0
+++ b/doc/dev/todo/post-1.0
@@ -40,3 +40,56 @@ Documentation:
    - Different environments (production, integration, development)
       - via version control
    - Define how to raise errors in types
+
+   - = todo
+   + = in progress -> S|N
+   x = done
+
+
+   x remove old documentation from doc/man/!
+   - Check all references in manpages, ensure all manpages exist, generic ones:
+      + cdist
+         + cdist-deploy-to
+         + cdist-manifest
+         - cdist-quickstart: how to get started
+      - cdist-type           [IMPORTANT]
+         - only do necessary work [TYPE IMPLEMENTATION HINTS]
+            - install packages only if not existent
+            - copy file only if different
+         - DOC document that $type/manifest is executed for every object/instance
+      - cdist-explorer
+      - exported variables:
+         - general explorer: __explorer                           # cdist-explorer
+         - initial manifest: __manifest, __global                 # cdist-manifest
+         - type manifests  __object, __object_id, __global        # cdist-type
+         - type explorers:  __object, __object_id, __type_explorers # cdist-type
+         - type codegen:  __object, __object_id, __global         # cdist-type
+         - type code:  -                                          # cdist-code
+      - cdist-type-integration
+         - Ensure available types are documented (!)
+            - define how to in cdist-type-integration
+         - referenced on the webpage via cdist-type(7)!
+   - ensure every file in bin/ has a correspondent manpage
+      - cdist-bin-transfer
+      - cdist-code-run-all
+      - cdist-config
+      - cdist-deploy-to
+      - cdist-dir
+      - cdist-explorer-run-init
+      - cdist-manifest-run
+      - cdist-manifest-run-all
+      - cdist-manifest-run-init
+      - cdist-object-codegen
+      - cdist-object-codegen-all
+      - cdist-object-explorer-all
+      - cdist-quickstart
+      - cdist-remote-code-run-all
+      - cdist-remote-explorer-run
+      - cdist-run-remote
+      - cdist-type-build-emulation
+      - cdist-type-emulator
+   - Cleanup READMEs
+   - Ensure html output of manpages are published on the web
+
+- Makefile:
+   - Include manpage generation