Skip to content

Shorten description on search page #15766

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
Nov 29, 2019
Merged

Conversation

timhoffm
Copy link
Member

PR Summary

The description on the search page was quite wordy. This PR reduces clutter and reproduces my accepted PR at sphinx-doc/sphinx#6814.

@timhoffm timhoffm added this to the v3.1-doc milestone Nov 24, 2019
@anntzer anntzer merged commit c9a551d into matplotlib:master Nov 29, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Nov 29, 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 c9a551d2c34c0587147b4373806621edb988a7e1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15766: Shorten description on search page'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-15766-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #15766 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 Nov 29, 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 c9a551d2c34c0587147b4373806621edb988a7e1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15766: Shorten description on search page'
  1. Push to a named branch :
git push YOURFORK v3.1.1-doc:auto-backport-of-pr-15766-on-v3.1.1-doc
  1. Create a PR against branch v3.1.1-doc, I would have named this PR:

"Backport PR #15766 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.

@lumberbot-app
Copy link

lumberbot-app bot commented Nov 29, 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.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 c9a551d2c34c0587147b4373806621edb988a7e1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15766: Shorten description on search page'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15766-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

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

@timhoffm
Copy link
Member Author

timhoffm commented Dec 1, 2019

I was hoping that this backports cleanly. Since it does not, it's not worth the hassle of backporting manually.

@timhoffm timhoffm deleted the search-text branch December 1, 2019 16:18
@QuLogic QuLogic modified the milestones: v3.1-doc, v3.3.0 Dec 2, 2019
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.

5 participants