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).
I am going to go ahead and merge since I am mostly moving this file. I really want to have this in place before we go into docs day. I will make that change in a separate pr.