Merge branch 'master' into 2.1_doc_restructure

docs/changelog

@@ -4,6 +4,30 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+2.1.0pre8:
+	* Type cleanup: __apt_ppa, __apt_ppa_update_index, __file, 
+		__ssh_authorized_key, __timezone, all install types (Steven Armstrong)
+	* Types: Remove all parameter changing code
+	* Type __rvm_ruby: Change parameter "default" to be boolean
+
+2.1.0pre7: 2012-11-07
+	* Core: All unit tests restored back to working
+	* Core: Print error message on missing initial manifest
+
+2.1.0pre6: 2012-11-05
+	* New Example: Turn remote calls into local calls (used for unittesting)
+	* Core: Export PYTHONPATH, it's also needed by emulator
+	* Bugfix Type __rvm_ruby: Add clean package dependencies
+	* Bugfix Type __rvm_gem: Run rvm as user, not as root
+	* Cleanup Type __rvm, __rvm_gemset: Use shortcut version
+	* Bugfix __rvm_gemset: Correctly check for gemsets
+	* Cleanup Type __postgres_database,  __postgres_role: Reference each other
+		in documentation
+	* Cleanp Type __postgres_role: Use boolean parameters where appropriate
+	* Cleanp Type __postgres_role: Use shortcut version
+
+2.1.0pre5: 2012-11-01
+	* Core: First round of tests updated to work with multiple configuration directories
 
 2.1.0pre4: 2012-10-31
 	* Dist: PyPi: Moved cdist.py to script/cdist to avoid double import
@@ -27,7 +51,7 @@ Changelog
 			Parameter state accepts only "present" and "absent"
 	* Dist: Initial support for pypi packaging
 
-2.0.15:
+2.0.15: 2012-11-02
 	* Core: Make variable __object_name available in type explorers (Steven Armtrong)
 	* New Type: __qemu_img
 	* New Type: __line

docs/dev/logs/2012-05-23.urls

@@ -0,0 +1,5 @@
+http://nu-ex.com/cv.html
+
+https://lists.metalab.at/pipermail/devops/2012-January/000089.html
+
+http://www.ir0nik.com/wordpress/?p=121

docs/dev/logs/2012-11-02.migration_to_2.1

@@ -0,0 +1,47 @@
+create a new branch to ensure nothing breaks
+
+    % git checkout -b 2.1_merge
+
+fetch latest upstream changes (change origin if you use another
+remote name for upstream cdist)
+
+    % git fetch -v origin
+
+Now try to merge upstream into the new branch.
+
+
+    % git merge origin/2.1
+
+fix any conflicts that may have been occurred due to local changes
+and then **git add** and *git commit** those changes.
+
+As the types have a new location, **cdist/conf/** now, you have to move
+your own types there as well:
+
+    % git mv conf/type/* cdist/conf/
+
+The manifest location also changed, so move this one as well:
+
+    % git mv conf/manifest/* cdist/conf/manifest/
+
+Use **git status** to review the changes and ensure they
+are in the git database:
+
+    % git commit -m "Move types and manifests for 2.1 migration"
+
+This should be everything necessary for a 2.1 migration. Test the result
+by running cdist on one of your staging hosts:
+
+    % ./bin/cdist config -v staging-host
+
+
+You can now cleanup the empty conf/ directory:
+
+    %  rmdir conf/* && rmdir conf
+
+
+
+--------------------------------------------------------------------------------
+
+Boolean parameter introduced:
+    __directory /path/to --parents yes => __directory /path/to --parents

docs/man/man7/cdist-quickstart.text

@@ -77,7 +77,7 @@ git clone git://git.schottelius.org/cdist
 
 # Create manifest (maps configuration to host(s)
 cd cdist
-echo '__file /etc/cdist-configured' > conf/manifest/init
+echo '__file /etc/cdist-configured' > cdist/conf/manifest/init
 
 # Configure localhost in verbose mode
 ./bin/cdist config -v localhost