some updates to site docs for release

jdh2358 · jdh2358 · commit 6285c5ec6367 · 2009-08-06T16:41:18.000Z
svn path=/branches/v0_99_maint/; revision=7404
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -1,9 +1,9 @@
 {% extends "layout.html" %}
 {% set title = 'matplotlib: python plotting' %}
 
-
+ 
 {% block body %}
-  <h1>mpl</h1>
+  <h1>intro</h1>
 
   <p>matplotlib is a python 2D plotting library which produces
   publication quality figures in a variety of hardcopy formats and
@@ -41,7 +41,7 @@ <h1>mpl</h1>
   <a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and
   <a href="api/mlab_api.html">matplotlib.mlab</a>.</p>
 
-  <h3>Plotting commands</h3> <br/>
+  <h3>plotting commands</h3> <br/>
 
   <table border="1" cellpadding="3" cellspacing="2">
 
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -2,33 +2,26 @@ <h3>News</h3>
 
 <p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
 to support matplotlib development.</p>
-
-<p> Download <a href="https://sourceforge.net/projects/matplotlib/">matplotlib-0.99.0</a>, see <a href="http://matplotlib.sourceforge.net/users/whats_new.html">what's
-new</a> and post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+ 
+<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>.  See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+pathto('users/installing') }}">installing</a>
 </p>
 
 <p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>. 
 </p>
 
-<h3>Download</h3>
-<p>Current version: <b>{{ version }}</b></p>
-
-
-<p>Download matplotlib from the
-sourceforge <a href="http://sourceforge.net/projects/matplotlib">project</a>
-page (but first take a look at the <a href="{{
-pathto('users/installing') }}">installing</a> page).  Here's a summary
-of <a href="{{ pathto('users/whats_new') }}">what's new</a>. </p>
-
 <p>There are several matplotlib addon <a href="{{
 pathto('users/toolkits') }}">toolkits</a>, including the projection
 and mapping toolkit
-<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>.</p>
+<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
+pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, wild and wonderful axes and axis helpers in <a href="{{
+pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
+ </p>
 
 
 <h3>Need help?</h3>
 
-<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide,
+<p>Check the <a href="{{ pathto('users/index') }}">user guide</a>,
 the <a href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
 pathto('api/index') }}">api</a> docs,
 <a href="http://www.nabble.com/matplotlib---users-f2906.html">archives</a>,
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -293,22 +293,20 @@ Installing OSX binaries
 -----------------------
 
 If you want to install matplotlib from one of the binary installers we
-build, you have two choices: a mpkg installer, which is a typical
+build, you have two choices: a dmg installer, which is a typical
 Installer.app, or an binary OSX egg, which you can install via
 setuptools easy_install.  
-
-The mkpg installer will have a "zip" extension, and will have a name
-like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5_mpkg.zip` depending on
-the python, matplotlib, and OSX versions.  You need to unzip this file
-using either the "unzip" command on OSX, or simply double clicking on
-it to run StuffIt Expander.  When you double click on the resultant
-mpkd directory, which will have a name like
-file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.mpkg`, it will run the
-Installer.app, prompt you for a password if you need system wide
-installation privileges, and install to a directory like
-file:`/Library/Python/2.5/site-packages/`, again depedending on your
-python version.  This directory may not be in your python path, so you
-can test your installation with::
+ 
+The mkpg installer will have a "dmg" extension, and will have a name
+like :file:`matplotlib-0.99.0-py2.5-macosx10.5.dmg` depending on the
+python, matplotlib, and OSX versions.  Save this file and double
+click it, which will open up a folder with a file in it that has the
+mpkg extension.  Double click this to run the Installer.app, which
+will prompt you for a password if you need system wide installation
+privileges, and install to a directory like
+:file:`/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages`,
+again depedending on your python version.  This directory should be in
+your python path, so you can test your installation with::
 
   > python -c 'import matplotlib; print matplotlib.__version__, matplotlib.__file__'
 
@@ -320,9 +318,9 @@ If you get an error like::
 
 then you will need to set your PYTHONPATH, eg::
 
-    export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH 
+    export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages:$PYTHONPATH 
 
-See also ref:`environment-variables`.
+See also :ref:`environment-variables`.
 
 .. _easy-install-osx-egg:
 
diff --git a/doc/users/annotations.rst b/doc/users/annotations.rst
@@ -3,6 +3,9 @@
 Annotating text
 ===============
 
+For a more detailed introduction to annotations, see
+:ref:`plotting-guide-annotation`.
+
 The uses of the basic :func:`~matplotlib.pyplot.text` command above
 place text at an arbitrary position on the Axes.  A common use case of
 text is to annotate some feature of the plot, and the
diff --git a/doc/users/plotting.rst b/doc/users/plotting.rst
@@ -152,5 +152,4 @@ Annotating plot
 
 :ref:`plotting-guide-annotation`
 
-TODO; see :ref:`how-to-contribute-docs`.
 
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -1,13 +1,14 @@
 .. _whats-new:
 
-***************************
+************************
 What's new in matplotlib
-***************************
+************************
 
-.. _whats-new-svn:
+This page just covers the highlights -- for the full story, see the
+`CHANGELOG <http://matplotlib.sourceforge.net/_static/CHANGELOG>`_
 
-What new in matplotlib-0.99
-=============================
+new in matplotlib-0.99
+======================
 
 .. _whats-new-mplot3d:
 
@@ -50,10 +51,17 @@ well as "detach" the spine to offset it away from the data.  See
 
 .. plot:: pyplots/whats_new_99_spines.py
 
+
+New documentation
+-----------------
+
+jae-Joon Lee has written two new guides :ref:`plotting-guide-legend`
+and :ref:`plotting-guide-annotation`.
+
 .. _whats-new-0-98-4:
 
-What new in 0.98.4
-==============================
+new in 0.98.4
+=============
 
 It's been four months since the last matplotlib release, and there are
 a lot of new features and bug-fixes.

Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,4 @@ Annotating plot`
`152`	`152`
`153`	`153`	:ref:`plotting-guide-annotation`
`154`	`154`
`155`		-TODO; see :ref:`how-to-contribute-docs`.
`156`	`155`