Thanks to visit codestin.com
Credit goes to github.com

Skip to content

merge V1.4.0-doc into v1.4.x #3585

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

Merged
merged 5 commits into from
Sep 28, 2014
Merged

merge V1.4.0-doc into v1.4.x #3585

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81760d7
Remove backticks around None. This is not a ref
jenshnielsen Sep 16, 2014
630f867
Fix formatting in docstring for dates
jenshnielsen Sep 16, 2014
592ac13
Merge pull request #3521 from jenshnielsen/more_doc_fixes
tacaswell Sep 16, 2014
11748bf
DOC : fix main-page tags
tacaswell Sep 19, 2014
4706ee0
Merge pull request #3543 from tacaswell/fix_mainpage
mdboom Sep 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove backticks around None. This is not a ref
  • Loading branch information
@jenshnielsen
jenshnielsen committed Sep 16, 2014
commit 81760d7bd3491a1c2c02ad840c9093d76a15f129
4 changes: 2 additions & 2 deletions lib/matplotlib/colorbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,12 +1014,12 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,

Keyword arguments may include the following (with defaults):

location : [`None`|'left'|'right'|'top'|'bottom']
location : [None|'left'|'right'|'top'|'bottom']
The position, relative to **parents**, where the colorbar axes
should be created. If None, the value will either come from the
given ``orientation``, else it will default to 'right'.

orientation : [`None`|'vertical'|'horizontal']
orientation : [None|'vertical'|'horizontal']
The orientation of the colorbar. Typically, this keyword shouldn't
be used, as it can be derived from the ``location`` keyword.

Expand Down