Merge of #3402 #3830
Merged
Merge of #3402 #3830
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- expand some text regarding backend usage and IPython notebook plot - improve style a bit (PEP 8) - shorten array printout - convert image resizing example to use PIL - replace pyplot discussion in top material - remove matplotlib argument to IPython in intro
Conflicts: doc/users/image_tutorial.rst
|
The failure is a python2.6 only non related issue. |
jenshnielsen
added a commit
that referenced
this pull request
Nov 22, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#3402
Just doing this to make sure that the docs still builds cleanly with my rebase