Merge branch 'master' of https://github.com/cfengine/documentation
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
Merge pull request #604 from KevWright/master

Fixed a small error in policy hello world snippet