Remove inlined code directives
Clarify upgrade notes further
Merge pull request #247 from opscode/sh/upgrade-errata

Fix inline code, clarify upgrade notes