Fixed some typos and a mistake in the upgrade page.
Merge branch 'master' of github.com:puppetlabs/puppet-docs