Fix guide text so that it doesn't appear outside of warning box.
Improve 2.1 upgrade guide.