Skip to content
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

Doc multi version master #1100

Merged
merged 16 commits into from
Aug 19, 2012
Merged

Commits on Aug 3, 2012

  1. Configuration menu
    Copy the full SHA
    ca678a4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request matplotlib#1054 from mdboom/doc_build_fail

     stix_fonts_demo.py fails with bad refcount
    mdboom committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    8089e04 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    64e64f6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request matplotlib#1024 from mdboom/fix-gallery

    broken links in the gallery
    mdboom committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    ff883a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2012

  1. Fix pythonxy link

    mdboom committed Aug 10, 2012
    Configuration menu
    Copy the full SHA
    c9c108e View commit details
    Browse the repository at this point in the history
  2. 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.
    mdboom committed Aug 10, 2012
    Configuration menu
    Copy the full SHA
    9745bdd View commit details
    Browse the repository at this point in the history
  3. Gentler donation language.

    mdboom committed Aug 10, 2012
    Configuration menu
    Copy the full SHA
    3a1c832 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2012

  1. Update credits page

    mdboom committed Aug 16, 2012
    Configuration menu
    Copy the full SHA
    b60f3ee View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    87f8df3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd4c335 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2012

  1. Configuration menu
    Copy the full SHA
    5a2d0a6 View commit details
    Browse the repository at this point in the history
  2. Update credits

    mdboom committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    fe2e95d View commit details
    Browse the repository at this point in the history
  3. Merge pull request matplotlib#1067 from mdboom/doc_multi_version

    Support multi-version documentation on the website
    mdboom committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    1057eed View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a906f58 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'upstream/v1.1.x' into doc_multi_version…

    …_master
    
    Conflicts:
    	boilerplate.py
    	lib/matplotlib/image.py
    	lib/matplotlib/pyplot.py
    mdboom committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    fc271b9 View commit details
    Browse the repository at this point in the history
  6. Fix hist2d docstring.

    mdboom committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    f537d1e View commit details
    Browse the repository at this point in the history