Merge branch 'master' into preos

docs/changelog

@@ -4,11 +4,41 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+3.0.1:
+	* Type __line: Remove unecessary backslash escape
+	* Type __directory: Add messaging support (Daniel Heule)
+	* Type __directory: Do not generate code if mode is 0xxx ((Daniel Heule)
+	* Type __directory: Add messaging support (Daniel Heule)
+	* Type __package: Fix typo in optional parameter ptype (Daniel Heule)
+	* Type __start_on_boot: Fix for SuSE's chkconfig (Daniel Heule)
 
-3.0.0:
-	* Core: Messaging support added
-	* Type: __iptables_rule: Use default parameter
+3.0.0: 2013-12-24
+	* Core: Added messaging support
+	* Core: Removed unused "changed" attribute of objects 
+	* Core: Support default values for multiple parameters (Steven Armstrong)
+	* Core: Ensure Object Parameter file contains \n (Steven Armstrong)
+	* New Type: __zypper_repo (Daniel Heule)
+	* New Type: __zypper_service (Daniel Heule)
+	* New Type: __package_emerge (Daniel Heule)
+	* New Type: __package_emerge_dependencies (Daniel Heule)
+	* Type __cron: Add support for raw lines (Daniel Heule)
+	* Type __cron: Suppress stderr output from crontab (Daniel Heule)
+	* Type __cron: Fix quoting issue (Daniel Heule)
 	* Type __file: Do not generate code if mode is 0xxx
+	* Type __iptables_rule: Use default parameter
+	* Type __key_value: Fix quoting issue (Steven Armstrong)
+	* Type __package: Use state --present by default (Steven Armstrong)
+	* Type __package_zypper: Support non packages as well (Daniel Heule)
+	* Type __package_zypper: Support package versions (Daniel Heule)
+	* Type __postfix_*: Depend on __postfix Type (Steven Armstrong)
+	* Type __postfix_postconf: Enable support for SuSE (Daniel Heule)
+	* Type __postfix: Enable support for SuSE (Daniel Heule)
+	* Type __start_on_boot: Use default parameter state
+	* Type __start_on_boot: Add support for gentoo (Daniel Heule)
+	* Type __user: Add support for state parameter (Daniel Heule)
+	* Type __user: Add support for system users (Daniel Heule)
+	* Type __user: Add messaging support (Steven Armstrong)
+	* Type __zypper_service: Support older SuSE releases (Daniel Heule)
 
 2.3.7: 2013-12-02
 	* Type __file: Secure the file transfer by using mktemp (Steven Armstrong)

docs/changelog.future

@@ -1,10 +0,0 @@
-Changelog
----------
-
-	* Changes are always commented with their author in (braces)
-	* Exception: No braces means author == Nico Schottelius
-
-future (maybe 3.x?):
-	* Type __cron: Dropped support for old internal format
-	  Using this version prior to running cdist 2.1.2 will
-	  break add the cron entries twice.

docs/dev/logs/2013-12-12.discussion

@@ -0,0 +1,6 @@
+With Steven
+
+- Implement environments
+    - for configuring "anything" including switches
+    - can disable / use other global explorers
+- 98% of our framework is generic and can be used for any applikation

docs/man/man7/cdist-hacker.text

@@ -33,7 +33,6 @@ nearby, so grepping for FIXME gives all positions that need to be fixed.
 
 Indention is 4 spaces (welcome to the python world).
 
-
 HOW TO SUBMIT STUFF FOR INCLUSION INTO UPSTREAM CDIST
 -----------------------------------------------------
 If you did some cool changes to cdist, which you value as a benefit for
@@ -75,14 +74,91 @@ code and thus such a type introduces redundant functionality that is given by
 core cdist already.
 
 
+EXAMPLE GIT WORKFLOW
+---------------------
+The following workflow works fine for most developers:
+
+--------------------------------------------------------------------------------
+# get latest upstream master branch
+git clone https://github.com/telmich/cdist.git
+
+# update if already existing
+cd cdist; git fetch -v; git merge origin/master
+
+# create a new branch for your feature/bugfix
+cd cdist # if you haven't done before
+git checkout -b documentation_cleanup
+
+# *hack*
+*hack*
+
+# clone the cdist repository on github if you haven't done so
+
+# configure your repo to know about your clone (only once)
+git remote add github git@github.com:YOURUSERNAME/cdist.git
+
+# push the new branch to github 
+git push github documentation_cleanup
+
+# (or everything)
+git push --mirror github
+
+# create a pull request at github (use a browser)
+# *fixthingsbecausequalityassurancefoundissuesinourpatch*
+*hack*
+
+# push code to github again
+git push ... # like above
+
+# add comment that everything should be green now (use a browser)
+
+# go back to master branch
+git checkout master
+
+# update master branch that includes your changes now
+git fetch -v origin
+git diff master..origin/master
+git merge origin/master
+--------------------------------------------------------------------------------
+
+If at any point you want to go back to the original master branch, you can
+use **git stash** to stash your changes away:
+
+--------------------------------------------------------------------------------
+# assume you are on documentation_cleanup
+git stash
+
+# change to master and update to most recent upstream version
+git checkout master
+git fetch -v origin
+git merge origin/master
+--------------------------------------------------------------------------------
+
+Similar when you want to develop another new feature, you go back
+to the master branch and create another branch based on it:
+
+--------------------------------------------------------------------------------
+# change to master and update to most recent upstream version
+git checkout master
+git fetch -v origin
+git merge origin/master
+
+git checkout -b another_feature
+--------------------------------------------------------------------------------
+
+(you can repeat the code above for as many features as you want to develop
+in parallel)
 
 
 SEE ALSO
 --------
 - cdist(7)
+- git(1)
+- git-checkout(1)
+- git-stash(1)
 
 
 COPYING
 -------
-Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).

docs/web/cdist/update.mdwn

@@ -55,6 +55,11 @@ To upgrade to the lastet version do
 
 ## General Update Instructions
 
+### Updating from 2.3 to 3.0
+
+The **changed** attribute of objects has been removed.
+Use [messaging](/software/cdist/man/3.0.0/man7/cdist-messaging.html) instead.
+
 ### Updating from 2.2 to 2.3
 
 No incompatiblities.