merge two diverged contribution docs

Fixes an issue that happened when I merged a 2.5 docs change forward to master (which had moved those files).
Can you add something about new features going into the release notes as well?