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

Skip to content

Merge 2.x to master #6557

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 34 commits into from
Jun 8, 2016
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9c586f2
py3k: Fix print statements in docstrings.
QuLogic May 29, 2016
7605dd4
Merge pull request #6496 from QuLogic/py3k-print-doc
efiring May 29, 2016
9158c69
DOC: make example a bit wider + remove lines
tacaswell May 30, 2016
e89d32d
DOC: update annotation docstrings
tacaswell May 22, 2016
f649739
DOC: tweak showcase example
tacaswell May 30, 2016
b3c21d3
DOC: tweak demo a bit
tacaswell May 30, 2016
ff98856
Merge pull request #6481 from jenshnielsen/default-boxplot-style-rebase
tacaswell May 30, 2016
72653f2
Merge pull request #6504 from jenshnielsen/patch-issue-6035-rebase
tacaswell May 30, 2016
374b6c0
TST: add small tolerances to streamplot tests
tacaswell May 31, 2016
ef49291
Merge pull request #6506 from tacaswell/tst_tolerance_on_streamplot
WeatherGod May 31, 2016
06dad9b
REL: v2.0.0b1
tacaswell May 31, 2016
d54ffdb
DOC: remove outdated or duplicate Windows documentation
cgohlke May 31, 2016
b1f4d68
DOC: Update Windows installation instructions
cgohlke May 31, 2016
4a0d01a
DOC: remove some absolute links in frontpage
cgohlke May 31, 2016
43ab6c2
DOC: more updates to Windows installation instructions
cgohlke May 31, 2016
ff7e408
DOC: fix links to examples
cgohlke May 31, 2016
5fbabdf
Merge pull request #6519 from paulromano/writeraw-fix
mdboom Jun 1, 2016
debac32
Merge pull request #6529 from afvincent/TST_avoid_calling_show_in_tes…
efiring Jun 2, 2016
9ebdaed
Merge pull request #6522 from phobson/yscales-bxp-demo
tacaswell Jun 3, 2016
1e35d8d
Merge pull request #6517 from anntzer/fix-string-gray-conversion
zblz Jun 3, 2016
4bf53ff
DOC: not all Sphinx builders support SVG
cgohlke Jun 3, 2016
99da366
DOC: add PNG logo
cgohlke Jun 3, 2016
a11bdc4
Use 4-space indent
cgohlke Jun 5, 2016
5c6295b
Use 4-space indent
cgohlke Jun 5, 2016
43d4c10
Merge pull request #6534 from cgohlke/patch-3
tacaswell Jun 5, 2016
ec276e2
Merge pull request #6532 from cgohlke/patch-2
tacaswell Jun 5, 2016
59e0ab9
Merge pull request #6014 from afvincent/afvincent-patch-issue-6009
tacaswell Jun 6, 2016
80c884a
Merge pull request #6464 from tacaswell/doc_annotation_docstrings
jenshnielsen Jun 6, 2016
972266d
Merge pull request #6508 from cgohlke/patch-1
tacaswell Jun 6, 2016
36d563b
Merge pull request #6505 from tacaswell/examples
jenshnielsen Jun 6, 2016
077c72e
Merge pull request #6544 from anntzer/margins-typo
WeatherGod Jun 7, 2016
8356fc2
Merge pull request #5626 from mdboom/new-icons
tacaswell Jun 8, 2016
1512593
Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
jenshnielsen Jun 8, 2016
9cabdc6
Merge remote-tracking branch 'matplotlib/v2.x'
jenshnielsen Jun 8, 2016
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
Prev Previous commit
Next Next commit
DOC: fix links to examples
  • Loading branch information
cgohlke committed May 31, 2016
commit ff7e408be4c80c940b028b5b38cbe38f628c8c20
4 changes: 2 additions & 2 deletions doc/_templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h1>Introduction</h1>
You can generate plots, histograms, power spectra, bar charts,
errorcharts, scatterplots, etc, with just a few lines of code.
For a sampling, see the <a href="{{ pathto('users/screenshots') }}">screenshots</a>, <a href="{{ pathto('gallery') }}">thumbnail</a> gallery, and
<a href="{{ pathto('examples') }}">examples</a> directory</p>
<a href="{{ pathto('examples/index') }}">examples</a> directory</p>

<p>For simple plotting the <tt>pyplot</tt> interface provides a
MATLAB-like interface, particularly when combined
Expand Down Expand Up @@ -110,7 +110,7 @@ <h1>Documentation</h1>
</script>

<p>Trying to learn how to do a particular kind of plot? Check out
the <a href="{{ pathto('gallery') }}">gallery</a>, <a href="{{ pathto('examples') }}">examples</a>,
the <a href="{{ pathto('gallery') }}">gallery</a>, <a href="{{ pathto('examples/index') }}">examples</a>,
or the <a href="{{ pathto('api/pyplot_summary') }}">list of plotting
commands</a>.</p>

Expand Down