copy edited
Merge branch 'master' of github.com:puppetlabs/puppet-docs