Clean up text and links in screenshots page of user docs.

tonysyu · tonysyu · commit 54380516a983 · 2013-05-20T22:45:03.000-05:00
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -4,13 +4,13 @@
 Screenshots
 **********************
 
-Here you will find a host of example figures with the code that
-generated them
+Here you'll find a host of example plots with the code that
+generated them.
 
 Simple Plot
 ===========
 
-The most basic :func:`~matplotlib.pyplot.plot`, with text labels
+Here's a very basic :func:`~matplotlib.pyplot.plot` with text labels:
 
 .. plot:: mpl_examples/pylab_examples/simple_plot.py
 
@@ -19,8 +19,8 @@ The most basic :func:`~matplotlib.pyplot.plot`, with text labels
 Subplot demo
 ============
 
-Multiple regular axes (numrows by numcolumns) are created with the
-:func:`~matplotlib.pyplot.subplot` command.
+Multiple axes (i.e. subplots) are created with the
+:func:`~matplotlib.pyplot.subplot` command:
 
 .. plot:: mpl_examples/subplots_axes_and_figures/subplot_demo.py
 
@@ -30,7 +30,7 @@ Histograms
 ==========
 
 The :func:`~matplotlib.pyplot.hist` command automatically generates
-histograms and will return the bin counts or probabilities
+histograms and returns the bin counts or probabilities:
 
 .. plot:: mpl_examples/statistics/histogram_demo_features.py
 
@@ -40,8 +40,8 @@ histograms and will return the bin counts or probabilities
 Path demo
 =========
 
-You can add arbitrary paths in matplotlib as of release 0.98.  See
-the :mod:`matplotlib.path`.
+You can add arbitrary paths in matplotlib using the
+:mod:`matplotlib.path` module:
 
 .. plot:: mpl_examples/shapes_and_collections/path_patch_demo.py
 
@@ -52,13 +52,14 @@ mplot3d
 
 The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
 :ref:`mplot3d-examples-index`) has support for simple 3d graphs
-including surface, wireframe, scatter, and bar charts (added in
-matlpotlib-0.99).  Thanks to John Porter, Jonathon Taylor and Reinier
-Heeres for the mplot3d toolkit.  The toolkit is included with all
-standard matplotlib installs.
+including surface, wireframe, scatter, and bar charts.
 
 .. plot:: mpl_examples/mplot3d/surface3d_demo.py
 
+Thanks to John Porter, Jonathon Taylor, Reinier Heeres, and Ben Root for
+the `mplot3d` toolkit. This toolkit is included with all standard matplotlib
+installs.
+
 .. _screenshots_ellipse_demo:
 
 
@@ -67,12 +68,10 @@ Ellipses
 
 In support of the
 `Phoenix <http://www.jpl.nasa.gov/news/phoenix/main.php>`_ mission to
-Mars, which used matplotlib in ground tracking of the spacecraft,
-Michael Droettboom built on work by Charlie Moad to provide an
-extremely accurate 8-spline approximation to elliptical arcs (see
-:class:`~matplotlib.patches.Arc`)  in the viewport.  This
-provides a scale free, accurate graph of the arc regardless of zoom
-level
+Mars (which used matplotlib to display ground tracking of spacecraft),
+Michael Droettboom built on work by Charlie Moad to provide an extremely
+accurate  8-spline approximation to elliptical arcs (see
+:class:`~matplotlib.patches.Arc`), which are insensitive to zoom level.
 
 .. plot:: mpl_examples/pylab_examples/ellipse_demo.py
 
@@ -81,27 +80,29 @@ level
 Bar charts
 ==========
 
-The :func:`~matplotlib.pyplot.bar`
-command takes error bars as an optional argument.  You can also use up
-and down bars, stacked bars, candlestick bars, etc, ... See
-`bar_stacked.py <examples/pylab_examples/bar_stacked.py>`_ for another example.
-You can make horizontal bar charts with the
-:func:`~matplotlib.pyplot.barh` command.
+Bar charts are simple to create using the :func:`~matplotlib.pyplot.bar`
+command, which includes customizations such as error bars:
 
 .. plot:: mpl_examples/pylab_examples/barchart_demo.py
 
+It's also simple to create stacked bars
+(`bar_stacked.py <mpl_examples/pylab_examples/bar_stacked.html>`_),
+candlestick bars
+(`bar_stacked.py <mpl_examples/pylab_examples/finance_demo.html>`_),
+and horizontal bar charts
+(`barh_demo.py <mpl_examples/lines_bars_and_markers/barh_demo.html>`_).
+
 .. _screenshots_pie_demo:
 
 
 Pie charts
 ==========
 
-The :func:`~matplotlib.pyplot.pie` command
-uses a MATLAB compatible syntax to produce pie charts.  Optional
-features include auto-labeling the percentage of area, exploding one
-or more wedges out from the center of the pie, and a shadow effect.
-Take a close look at the attached code that produced this figure; nine
-lines of code.
+The :func:`~matplotlib.pyplot.pie` command allows you to easily create pie
+charts.  Optional features include auto-labeling the percentage of area,
+exploding one or more wedges from the center of the pie, and a shadow effect.
+Take a close look at the attached code, which generates this figure in just
+a few lines of code.
 
 .. plot:: mpl_examples/pie_and_polar_charts/pie_demo_features.py
 
@@ -110,23 +111,23 @@ lines of code.
 Table demo
 ==========
 
-The :func:`~matplotlib.pyplot.table` command will place a text table
-on the axes
+The :func:`~matplotlib.pyplot.table` command adds a text table
+to an axes.
 
 .. plot:: mpl_examples/pylab_examples/table_demo.py
 
 
 .. _screenshots_scatter_demo:
 
+
 Scatter demo
 ============
 
 The :func:`~matplotlib.pyplot.scatter` command makes a scatter plot
-with (optional) size and color arguments.  This example plots changes
-in Google stock price from one day to the next with the sizes coding
-trading volume and the colors coding price change in day i.  Here the
-alpha attribute is used to make semitransparent circle markers with
-the Agg backend (see :ref:`what-is-a-backend`)
+with (optional) size and color arguments. This example plots changes
+in Google's stock price, with marker sizes reflecting the
+trading volume and colors varying with time. Here, the
+alpha attribute is used to make semitransparent circle markers.
 
 .. plot:: mpl_examples/pylab_examples/scatter_demo2.py
 
@@ -138,8 +139,8 @@ Slider demo
 
 Matplotlib has basic GUI widgets that are independent of the graphical
 user interface you are using, allowing you to write cross GUI figures
-and widgets.  See matplotlib.widgets and the widget `examples
-<examples/widgets>`
+and widgets.  See :mod:`matplotlib.widgets` and the
+`widget examples <../examples/widgets/index.html>`_.
 
 .. plot:: mpl_examples/widgets/slider_demo.py
 
@@ -150,34 +151,33 @@ Fill demo
 =========
 
 The :func:`~matplotlib.pyplot.fill` command lets you
-plot filled polygons.  Thanks to Andrew Straw for providing this
-function
+plot filled curves and polygons:
 
 .. plot:: mpl_examples/lines_bars_and_markers/fill_demo.py
 
+Thanks to Andrew Straw for adding this function.
 
 .. _screenshots_date_demo:
 
 Date demo
 =========
 
-You can plot date data with major and minor ticks and custom tick
-formatters for both the major and minor ticks; see matplotlib.ticker
-and matplotlib.dates for details and usage.
+You can plot date data with major and minor ticks and custom tick formatters
+for both.
 
 .. plot:: mpl_examples/api/date_demo.py
 
+See :mod:`matplotlib.ticker` and :mod:`matplotlib.dates` for details and usage.
+
 .. _screenshots_jdh_demo:
 
 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!
+You can make sophisticated financial plots by combining the various
+plot functions, layout commands, and labeling tools provided by matplotlib.
+The following example emulates one of the financial plots in
+`ChartDirector <http://www.advsofteng.com/gallery_finance.html>`_:
 
 
 .. plot:: mpl_examples/pylab_examples/finance_work2.py
@@ -188,9 +188,7 @@ techniques, not market analysis!
 Basemap demo
 ============
 
-Jeff Whitaker's :ref:`toolkit_basemap` add-on toolkit makes it possible to plot data on many
-different map projections.  This example shows how to plot contours, markers and text
-on an orthographic projection, with NASA's "blue marble" satellite image as a background.
+Jeff Whitaker's :ref:`toolkit_basemap` add-on toolkit makes it possible to plot data on many different map projections.  This example shows how to plot contours, markers and text on an orthographic projection, with NASA's "blue marble" satellite image as a background.
 
 .. plot:: pyplots/plotmap.py
 
@@ -201,16 +199,14 @@ Log plots
 
 The :func:`~matplotlib.pyplot.semilogx`,
 :func:`~matplotlib.pyplot.semilogy` and
-:func:`~matplotlib.pyplot.loglog` functions generate log scaling on the
-respective axes.  The lower subplot uses a base10 log on the xaxis and
-a base 4 log on the yaxis.  Thanks to Andrew Straw, Darren Dale and
-Gregory Lielens for contributions to the log scaling
-infrastructure.
-
-
+:func:`~matplotlib.pyplot.loglog` functions simplify the creation of
+logarithmic plots.
 
 .. plot:: mpl_examples/pylab_examples/log_demo.py
 
+Thanks to Andrew Straw, Darren Dale and Gregory Lielens for contributions
+log-scaling infrastructure.
+
 .. _screenshots_polar_demo:
 
 Polar plots
@@ -222,40 +218,43 @@ The :func:`~matplotlib.pyplot.polar` command generates polar plots.
 
 .. _screenshots_legend_demo:
 
+
 Legends
 =======
 
 The :func:`~matplotlib.pyplot.legend` command automatically
-generates figure legends, with MATLAB compatible legend placement
-commands.  Thanks to Charles Twardy for input on the legend
-command
+generates figure legends, with MATLAB-compatible legend placement
+commands.
 
 .. plot:: mpl_examples/pylab_examples/legend_demo.py
 
+Thanks to Charles Twardy for input on the legend command.
+
 .. _screenshots_mathtext_examples_demo:
 
 Mathtext_examples
 =================
 
-A sampling of the many TeX expressions now supported by matplotlib's
-internal mathtext engine.  The mathtext module provides TeX style
-mathematical expressions using `freetype2
-<http://freetype.sourceforge.net/index2.html>`_ and the BaKoMa
-computer modern or `STIX <http://www.stixfonts.org>`_ fonts.  See the
-:mod:`matplotlib.mathtext` module for additional.  matplotlib mathtext
-is an independent implementation, and does not required TeX or any
-external packages installed on your computer.  See the tutorial at
-:ref:`mathtext-tutorial`.
+Below is a sampling of the many TeX expressions now supported by matplotlib's
+internal mathtext engine.  The mathtext module provides TeX style mathematical
+expressions using `freetype2 <http://freetype.sourceforge.net/index2.html>`_
+and the BaKoMa computer modern or `STIX <http://www.stixfonts.org>`_ fonts.
+See the :mod:`matplotlib.mathtext` module for additional details.
 
 .. plot:: mpl_examples/pylab_examples/mathtext_examples.py
 
+Matplotlib's mathtext infrastructure is an independent implementation and
+does not require TeX or any external packages installed on your computer. See
+the tutorial at :ref:`mathtext-tutorial`.
+
+
 .. _screenshots_tex_demo:
 
 Native TeX rendering
 ====================
 
 Although matplotlib's internal math rendering engine is quite
-powerful, sometimes you need TeX, and matplotlib supports external TeX
+powerful, sometimes you need TeX. Matplotlib supports external TeX
 rendering of strings with the *usetex* option.
 
 .. plot:: pyplots/tex_demo.py
@@ -265,17 +264,20 @@ rendering of strings with the *usetex* option.
 EEG demo
 =========
 
-You can embed matplotlib into pygtk, wxpython, Tk, FLTK or Qt
-applications.  Here is a screenshot of an eeg viewer called pbrain
-which is part of the NeuroImaging in Python suite `NIPY
-<http://neuroimaging.scipy.org>`_.  Pbrain is written in pygtk using
-matplotlib.  The lower axes uses :func:`~matplotlib.pyplot.specgram`
-to plot the spectrogram of one of the EEG channels.  For an example of
-how to use the navigation toolbar in your applications, see
-:ref:`user_interfaces-embedding_in_gtk2`.  If you want to use
-matplotlib in a wx application, see
-:ref:`user_interfaces-embedding_in_wx2`.  If you want to work with
-`glade <http://glade.gnome.org>`_, see
-:ref:`user_interfaces-mpl_with_glade`.
+You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt
+applications.  Here is a screenshot of an EEG viewer called pbrain,
+which is part of the NeuroImaging in Python suite
+`NIPY <http://nipy.sourceforge.net/nipy/stable/index.html>`_.
 
 .. image:: ../_static/eeg_small.png
+
+The lower axes uses :func:`~matplotlib.pyplot.specgram`
+to plot the spectrogram of one of the EEG channels.
+
+For examples of how to embed matplotlib in different toolkits, see:
+
+   * :ref:`user_interfaces-embedding_in_gtk2`
+   * :ref:`user_interfaces-embedding_in_wx2`
+   * :ref:`user_interfaces-mpl_with_glade`
+   * :ref:`user_interfaces-embedding_in_qt`
+   * :ref:`user_interfaces-embedding_in_tk`
