Skip to content

DOC: fix minor typo from 19725 - #19758

Merged
tacaswell merged 1 commit into
matplotlib:masterfrom
jklymak:doc-minor-typo
Mar 22, 2021
Merged

DOC: fix minor typo from 19725#19758
tacaswell merged 1 commit into
matplotlib:masterfrom
jklymak:doc-minor-typo

Conversation

@jklymak

@jklymak jklymak commented Mar 22, 2021

Copy link
Copy Markdown
Member

PR Summary

Fixes minor typo from #19725.

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@jklymak jklymak added this to the v3.4-doc milestone Mar 22, 2021
@tacaswell
tacaswell merged commit 645b146 into matplotlib:master Mar 22, 2021
@jklymak
jklymak deleted the doc-minor-typo branch March 22, 2021 21:43
@QuLogic

QuLogic commented Mar 26, 2021

Copy link
Copy Markdown
Member

@meeseeksdev backport to v3.4.0-doc

@lumberbot-app

lumberbot-app Bot commented Mar 26, 2021

Copy link
Copy Markdown

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.4.0-doc
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 645b146eb8508f13eb215d828b57ea76bd31cbf5
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #19758: DOC: fix minor typo from 19725'
  1. Push to a named branch :
git push YOURFORK v3.4.0-doc:auto-backport-of-pr-19758-on-v3.4.0-doc
  1. Create a PR against branch v3.4.0-doc, I would have named this PR:

"Backport PR #19758 on branch v3.4.0-doc"

And apply the correct labels and milestones.

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

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

QuLogic pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Mar 26, 2021
@timhoffm @jklymak
@tacaswell @QuLogic
Backport PR matplotlib#19725/matplotlib#19758: Cleanup installing docs
1215060 
Co-authored-by: Jody Klymak <[email protected]>
Co-authored-by: Thomas A Caswell <[email protected]>
@QuLogic

QuLogic commented Mar 26, 2021

Copy link
Copy Markdown
Member

Cherry-picked onto #19781 manually.

QuLogic added a commit that referenced this pull request Mar 26, 2021
@QuLogic
Merge pull request #19781 from meeseeksmachine/auto-backport-of-pr-19…
e4808b9 
…725-on-v3.4.0-doc

Backport PR #19725/#19758 on branch v3.4.0-doc (Cleanup installing docs)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@story645 story645 story645 approved these changes

Assignees

No one assigned

Labels

Documentation

Projects

None yet

Milestone

v3.4-doc

Development

Successfully merging this pull request may close these issues.

4 participants

@jklymak @QuLogic @story645 @tacaswell