updates to the sidebar, misc fixes

jdh2358 · jdh2358 · commit 4e2a5db754b9 · 2008-10-15T15:49:26.000Z
svn path=/trunk/matplotlib/; revision=6204
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -1,21 +1,24 @@
 <h3>Download</h3>
 <p>Current version: <b>{{ version }}</b></p>
-<p>Get matplotlib from the sourceforge <a
-href="http://sourceforge.net/projects/matplotlib">download</a> page
+<p>Download matplotlib from the  sourceforge <a
+href="http://sourceforge.net/projects/matplotlib">project</a> page.  
+
+There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.  
 
 <h3>Need help?</h3>
-<p>Join the matplotlib  <a
-href="http://sourceforge.net/project/showfiles.php?group_id=80706">mailing lists</a>
+<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>, the <a
+href="{{ pathto('faq/index') }}">faq</a>, and join the matplotlib  mailing  <a
+href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>
 
-<p>You can file bugs and patches on the sourceforge <a href="http://sourceforge.net/tracker/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
+<p>You can file bugs, patches and feature requests on the sourceforge <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
 
 <h3>Screenshots</h3>
 
 <a href="{{ pathto('users/screenshots') }}"><img align=center src="{{
-pathto("_static/logo_sidebar.png", 1) }}"></a>
+pathto('_static/logo_sidebar.png', 1) }}"></a>
 
 <a href="{{ pathto('users/screenshots') }}">screenshots</a> and <a href=examples>examples</a>
 
 
-
+ 
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -17,3 +17,4 @@
 {% block sidebar2 %}{% endblock %}
 
 
+ 
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -90,6 +90,20 @@ install directory.  To cleanly rebuild:
    <locating-matplotlib-install>`
 
 
+.. _install_svn:
+
+How to install from svn
+=======================
+
+Checking out the main source::
+
+   svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk matplotlib
+
+and build and install as usual with::
+
+  > cd matplotlib
+  > python setup.py install
+
 Backends
 ========
 
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -158,13 +158,14 @@ Financial charts
 ================
 
 You can make much more sophisticated financial plots.  This example
-emulates one of the `ChartDirector <http://www.advsofteng.com/gallery_finance.html>`
-financial plots.  Some of the data in the plot, are real financial
-data, some are random traces that I used since the goal was to
-illustrate plotting techniques, not market analysis!
+emulates one of the `ChartDirector
+<http://www.advsofteng.com/gallery_finance.html>` financial plots.
+Some of the data in the plot, are real financial data, some are random
+traces that I used since the goal was to illustrate plotting
+techniques, not market analysis!
 
 
-plot:: ../mpl_examples/pylab_examples/finance_work2.py
+.. plot:: ../mpl_examples/pylab_examples/finance_work2.py
 
 
 .. _screenshots_basemap_demo:
@@ -178,7 +179,7 @@ collection of lines over a colormap image using the
 proj4 library: cylindrical equidistant, mercator, lambert conformal
 conic, lambert azimuthal equal area, albers equal area conic and
 stereographic.  See the `tutorial
-<http://www.scipy.org/wikis/topical_software/Maps>` entry on the wiki.
+<http://www.scipy.org/wikis/topical_software/Maps>`_ entry on the wiki.
 
 .. plot:: plotmap.py
 
@@ -197,7 +198,7 @@ infrastructure.
 
 
 
-plot:: ../mpl_examples/pylab_examples/log_demo.py
+.. plot:: ../mpl_examples/pylab_examples/log_demo.py
 
 .. _screenshots_polar_demo:
 
@@ -206,7 +207,7 @@ Polar plots
 
 The :func:`~matplotlib.pyplot.polar` command generates polar plots.
 
-plot:: ../mpl_examples/pylab_examples/polar_demo.py
+.. plot:: ../mpl_examples/pylab_examples/polar_demo.py
 
 .. _screenshots_legend_demo:
 
@@ -218,7 +219,7 @@ generates figure legends, with Matlab compatible legend placement
 commands.  Thanks to Charles Twardy for input on the legend
 command
 
-plot:: ../mpl_examples/pylab_examples/legend_demo.py
+.. plot:: ../mpl_examples/pylab_examples/legend_demo.py
 
 .. _screenshots_mathtext_examples_demo:
 
@@ -231,9 +232,9 @@ mathematical expressions using freetype2 and the BaKoMa computer
 modern or STIX fonts.  See the matplotlib.mathtext module for
 additional.  matplotlib mathtext is an independent implementation, and
 does not required TeX or any external packages installed on your
-computer. 
+computer.
 
-plot:: ../mpl_examples/pylab_examples/mathtext_examples.py
+.. plot:: ../mpl_examples/pylab_examples/mathtext_examples.py
 
 .. _screenshots_tex_demo:
 
@@ -242,9 +243,9 @@ Native TeX rendering
 
 Although matplotlib's internal math rendering engine is quite
 powerful, sometimes you need TeX, and matplotlib supports external TeX
-rendering of strings with the *usetex* option. 
+rendering of strings with the *usetex* option.
 
-plot:: tex_demo.py
+.. plot:: tex_demo.py
 
 .. _screenshots_eeg_demo:
 
diff --git a/doc/users/toolkits.rst b/doc/users/toolkits.rst
@@ -12,20 +12,25 @@ Basemap
 =======
 
 Plots data on map projections, with continental and political
-boundaries, `see <http://matplotlib.sf.net/basemap/doc/html>`
+boundaries, `see <http://matplotlib.sf.net/basemap/doc/html>`_
 
 .. _toolkit_gtk:
 
 GTK Tools
 =========
-mpl_toolkits.gtktools provides some utilities for working with GTK.  This toolkit ships with matplotlib, but requires `pygtk <http://www.pygtk.org/>`.
+
+mpl_toolkits.gtktools provides some utilities for working with GTK.
+This toolkit ships with matplotlib, but requires `pygtk
+<http://www.pygtk.org/>`_.
 
 .. _toolkit_excel:
 
 Excel Tools
 ===========
 
-mpl_toolkits.exceltools provides some utilities for working with Excel.  This toolkit ships with matplotlib, but requires `pyExcelerator <http://sourceforge.net/projects/pyexcelerator>`
+mpl_toolkits.exceltools provides some utilities for working with
+Excel.  This toolkit ships with matplotlib, but requires
+`pyExcelerator <http://sourceforge.net/projects/pyexcelerator>`_
 
 .. _toolkit_natgrid:
 
@@ -35,6 +40,6 @@ Natrgrid
 mpl_toolkits.natgrid is an interface to natgrid C library for gridding
 irregularly spaced data.  This requires a separate installation of the
 natgrid toolkit from the sourceforge `download
-<http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792>`
+<http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792>`_
 page.
 
diff --git a/examples/misc/longshort.py b/examples/misc/longshort.py
@@ -41,7 +41,7 @@
 fig = plt.figure()
 ax = fig.add_subplot(111)
 ax.plot(r.date, tr)
-ax.set_title('total return: long appl, short goog')
+ax.set_title('total return: long APPL, short GOOG')
 ax.grid()
 fig.autofmt_xdate()
 plt.show()
diff --git a/examples/pylab_examples/mathtext_examples.py b/examples/pylab_examples/mathtext_examples.py
@@ -49,7 +49,7 @@
     r'$\widehat{abc}\widetilde{def}$',
     r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
     r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
-    ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
+    #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
     ]
 
 from pylab import *
@@ -66,7 +66,7 @@ def doall():
         print (i, s)
         text(0.1, -i, s, fontsize=20)
 
-    savefig('mathtext_examples')
+    #savefig('mathtext_examples')
     #close('all')
     show()
 

Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,4 @@`
`17`	`17`	`{% block sidebar2 %}{% endblock %}`
`18`	`18`
`19`	`19`
	`20`	`+`