Skip to content

DOC: fix typo in colormap docs #15364

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 3, 2019
Merged

DOC: fix typo in colormap docs #15364

merged 1 commit into from
Oct 3, 2019

Conversation

tacaswell
Copy link
Member

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

The meaning was inverted!

@tacaswell
DOC: fix typo in colormap docs
c11e0a1 
The meaning was inverted!
@tacaswell tacaswell added this to the v3.1.2 milestone Oct 3, 2019
@tacaswell tacaswell modified the milestones: v3.1.2, v3.1-doc Oct 3, 2019
@timhoffm timhoffm merged commit ba7a162 into matplotlib:master Oct 3, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 3, 2019

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

"Backport PR #15364 on branch v3.1.x"

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.

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 3, 2019

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

"Backport PR #15364 on branch v3.1.1-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.

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Oct 3, 2019
@timhoffm
Backport PR matplotlib#15364: DOC: fix typo in colormap docs
cb0a742
@meeseeksmachine meeseeksmachine mentioned this pull request Oct 3, 2019
Merged
timhoffm added a commit that referenced this pull request Oct 3, 2019
@timhoffm
Merge pull request #15366 from meeseeksmachine/auto-backport-of-pr-15…
b983e5d 
…364-on-v3.2.x

Backport PR #15364 on branch v3.2.x (DOC: fix typo in colormap docs)
timhoffm added a commit to timhoffm/matplotlib that referenced this pull request Oct 3, 2019
@timhoffm
Backport PR matplotlib#15364: DOC: fix typo in colormap docs
510314e
@timhoffm timhoffm mentioned this pull request Oct 3, 2019
Merged
QuLogic added a commit that referenced this pull request Oct 3, 2019
@QuLogic
Merge pull request #15370 from timhoffm/auto-backport-of-pr-15364-on-…
9050d94 
…v3.1.1-doc

Backport PR #15364 on branch v3.1.1-doc
@tacaswell tacaswell deleted the doc_colormap_inversion branch October 4, 2019 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
v3.1-doc
Development

Successfully merging this pull request may close these issues.
2 participants
@tacaswell @timhoffm