A "2.5-release" branch has been created in git for the 2.5.0 release. If you are merging forward doc updates from 2.4, you will want to merge like so: 2.4-release-> 2.4-testing->2.4-dev->2.5-release->2.5-testing->2.6-dev->master