DOC: more updates to release notes

Add merge -s ours instructions for maintenance branch.

Add reminder to do pyx file doctests.