Merge branch 'master' of https://github.com/cfengine/documentation
Merge pull request #602 from KevWright/master

Fixed cf files in examples
Merge pull request #603 from KevWright/master

Fixed markdown example files
fixed mistake in writing policy and promises
Merge branch 'master' of https://github.com/cfengine/documentation
Merge pull request #140 from TekHus/master

Fixed a small error in policy hello world snippet