Skip to content
This repository

Doc multi version master #1100

Merged
merged 16 commits into from over 1 year ago

2 participants

Michael Droettboom Phil Elson
Michael Droettboom
Owner

This is #1067 rebased against master. There shouldn't be too much to vet here, except for @pelson's benefit to see how the changes to boilerplate.py were handled.

There was no need to generate a colormap list in this case, since master already has a correct and autogenerated list of colormaps thanks to the work by @endolith.

It was not possible to generate the plotting docstring in boilerplate.py, since boilerplate.py doesn't know about any of the hard-coded functions in pyplot.py (gca, gcf etc.) -- ideally at some point all that stuff should probably be cleaned up, but this is working for now.

added some commits August 03, 2012
Michael Droettboom Reinstate the manual reference counting as discovered in #1054. ca678a4
Michael Droettboom Merge pull request #1054 from mdboom/doc_build_fail
 stix_fonts_demo.py fails with bad refcount
8089e04
Michael Droettboom Fix gallery links (#1024) 64e64f6
Michael Droettboom Merge pull request #1024 from mdboom/fix-gallery
broken links in the gallery
ff883a6
Michael Droettboom Fix pythonxy link c9c108e
Michael Droettboom Update index.html page.
This allows for multiple versions of the matplotlib documentation to
be made available.  The scheme is that the root
documentation (i.e. http://matplotlib.sf.net/) will always be the
latest stable version.  Other versions of the documentation will be
available in subdirectories off of the root (the latest stable version
is merely a symlink or redirect back to the root).  This is the same
convention used by "docs.python.org", as an aside.

The index.html page uses some JavaScript to load a little snippet of
HTML from "/versions.html" that lists the available versions.
"versions.html" is not part of this repository, but is part of the
matplotlib.github.com repository and is updated by hand whenever new
versions are added or removed from the archive.  This approach allows
all versions of the documentation to point to all other versions of
the documentation.  This JavaScript XMLHttpRequest magic doesn't
happen when the user is viewing static files on their local machine,
and this is a happy coincidence.

The perhaps controversial outcome of this change is that the summary
list of plotting commands is removed from the front page.  For one, we
want to steer people toward the version of the documentation that
corresponds to the version they are running.  Also, this was a
manually created list, and has become quite out of date over time.
Better, IMHO, to link to the pyplot documentation.

This freed up room to move much of the content that existed in the
sidebar to the main body, where I feel it's much less buried.  I plan
to add a lot more external resources and links, so having the room to
do this would be very helpful.

Adds a "Fork me on Github" banner.
9745bdd
Phil Elson

Perhaps more subtle would be:
Please consider donating ...

Also, is it possible/desirable to provide a page which details the use of the donations? hosting/domain/scipy beers etc.?

Owner

Agreed that that is improved language.

I'll file an issue for adding a page about donations later -- all that stuff is in a bit of flux right now.

Phil Elson

I have been experimenting with providing support on stackoverflow and have found it really nice. Would we want to encourage that over the user mailing list?

Owner

That's a great idea. I don't know if we necessarily want to encourage one over the other at this point, but it would probably be very helpful to link to the stackoverflow entries tagged with "matplotlib":

http://stackoverflow.com/questions/tagged/matplotlib

Phil Elson

I'm glad the pyplot functions are removed from the homepage, but maybe a link to the pyplot docs would be helpful.

Owner

It's linked as "list of plotting commands" under the Documentation section. Perhaps it should be elsewhere?

Michael Droettboom
Owner

Note also: There are a ton of warnings and errors in the master doc build right now. I will create another pull request for that.

Michael Droettboom mdboom merged commit b3f6783 into from August 19, 2012
Michael Droettboom mdboom closed this August 19, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 16 unique commits by 1 author.

Aug 03, 2012
Michael Droettboom Reinstate the manual reference counting as discovered in #1054. ca678a4
Michael Droettboom Merge pull request #1054 from mdboom/doc_build_fail
 stix_fonts_demo.py fails with bad refcount
8089e04
Michael Droettboom Fix gallery links (#1024) 64e64f6
Michael Droettboom Merge pull request #1024 from mdboom/fix-gallery
broken links in the gallery
ff883a6
Aug 10, 2012
Michael Droettboom Fix pythonxy link c9c108e
Michael Droettboom Update index.html page.
This allows for multiple versions of the matplotlib documentation to
be made available.  The scheme is that the root
documentation (i.e. http://matplotlib.sf.net/) will always be the
latest stable version.  Other versions of the documentation will be
available in subdirectories off of the root (the latest stable version
is merely a symlink or redirect back to the root).  This is the same
convention used by "docs.python.org", as an aside.

The index.html page uses some JavaScript to load a little snippet of
HTML from "/versions.html" that lists the available versions.
"versions.html" is not part of this repository, but is part of the
matplotlib.github.com repository and is updated by hand whenever new
versions are added or removed from the archive.  This approach allows
all versions of the documentation to point to all other versions of
the documentation.  This JavaScript XMLHttpRequest magic doesn't
happen when the user is viewing static files on their local machine,
and this is a happy coincidence.

The perhaps controversial outcome of this change is that the summary
list of plotting commands is removed from the front page.  For one, we
want to steer people toward the version of the documentation that
corresponds to the version they are running.  Also, this was a
manually created list, and has become quite out of date over time.
Better, IMHO, to link to the pyplot documentation.

This freed up room to move much of the content that existed in the
sidebar to the main body, where I feel it's much less buried.  I plan
to add a lot more external resources and links, so having the room to
do this would be very helpful.

Adds a "Fork me on Github" banner.
9745bdd
Michael Droettboom Gentler donation language. 3a1c832
Aug 16, 2012
Michael Droettboom Update credits page b60f3ee
Michael Droettboom Add an autogenerated plotting command summary. 87f8df3
Michael Droettboom Fix small typo listing members to exclude cd4c335
Aug 17, 2012
Michael Droettboom Add docstring to _setup_plot_info_docstrings 5a2d0a6
Michael Droettboom Update credits fe2e95d
Michael Droettboom Merge pull request #1067 from mdboom/doc_multi_version
Support multi-version documentation on the website
1057eed
Michael Droettboom Remove hard-coded docstring on plotting() a906f58
Michael Droettboom Merge remote-tracking branch 'upstream/v1.1.x' into doc_multi_version…
…_master

Conflicts:
	boilerplate.py
	lib/matplotlib/image.py
	lib/matplotlib/pyplot.py
fc271b9
Michael Droettboom Fix hist2d docstring. f537d1e
Something went wrong with that request. Please try again.