DOC: cookbook.rst adds and release notes merge fix