-
-
Notifications
You must be signed in to change notification settings - Fork 7.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Doc merge up #11603
Doc merge up #11603
Conversation
@tacaswell I'm happy to give editing a shot when this is merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I trust that everything has been copied across fine. Maybe in future we should get contributors to just add a section to api_changes.rst
, or make api_changes.rst
automatically include all the individual files to avoid having to do all this copying across.
We have people put things in separate files to prevent persistent merge conflicts as everyone tries to edit the same text file! For the dev docs we do automatically include them, but it seem better to copy them all into one file and then do a final edit on them (so we can have opinions about order and merge / split entries as needed) for the final release. Going to self merge on the strength of @dstansby 's approval and to avoid collecting anymore merge conflicts. |
and the circle CI jobs passed. |
PR Summary
Starting to merge the whats_new and api_changes files up into the main ones. These still need to be edited and grouped better.