Skip to content
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

Merged
merged 4 commits into from
Jul 10, 2018
Merged

Doc merge up #11603

merged 4 commits into from
Jul 10, 2018

Conversation

tacaswell
Copy link
Member

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.

@tacaswell tacaswell added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Jul 9, 2018
@tacaswell tacaswell added this to the v3.0 milestone Jul 9, 2018
@dstansby
Copy link
Member

dstansby commented Jul 9, 2018

@tacaswell I'm happy to give editing a shot when this is merged.

Copy link
Member

@dstansby dstansby left a 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.

@tacaswell
Copy link
Member Author

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.

@tacaswell
Copy link
Member Author

and the circle CI jobs passed.

@tacaswell tacaswell merged commit b424991 into matplotlib:master Jul 10, 2018
@tacaswell tacaswell deleted the doc_merge_up branch July 10, 2018 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants