Refer people to UPGRADING-4.0, not to the old UPGRADING file
Merge branch '4.0/update-doc-path-article-upgrade' into 4.0-trunk