Skip to content

DOC: Fix duplicated words #25722

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

Merged
merged 1 commit into from
Apr 19, 2023
Merged

DOC: Fix duplicated words #25722

merged 1 commit into from
Apr 19, 2023

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Apr 18, 2023

PR Summary

PR Checklist

Documentation and Tests

  • [n/a] Has pytest style unit tests (and pytest passes)
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • [n/a] New plotting related features are documented with examples.

Release Notes

  • [n/a] New features are marked with a .. versionadded:: directive in the docstring and documented in doc/users/next_whats_new/
  • [n/a] API changes are marked with a .. versionchanged:: directive in the docstring and documented in doc/api/next_api_changes/
  • [n/a] Release notes conform with instructions in next_whats_new/README.rst or next_api_changes/README.rst

@oscargus oscargus added this to the v3.7.2 milestone Apr 19, 2023
@oscargus oscargus merged commit 21f27f1 into matplotlib:main Apr 19, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Apr 19, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 21f27f13c0d2bf06e4321a5948d5531434e2293e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #25722: DOC: Fix duplicated words'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-25722-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #25722 on branch v3.7.x (DOC: Fix duplicated words)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@oscargus
Copy link
Member

oscargus commented Apr 19, 2023

Backporting, but in the event that any of the errors has been introduced in 3.8, just skip it...

Edit: there were errors, so skipping it.

@oscargus oscargus modified the milestones: v3.7.2, v3.8.0 Apr 19, 2023
@QuLogic QuLogic deleted the spelling branch April 19, 2023 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants