Merge pull request #3228 from tacaswell/top_level_docstring

NelleV · NelleV · commit 496d7a7b0f7b · 2014-07-12T13:44:25.000-04:00
DOC : top_level doc-string clean up
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -4,19 +4,16 @@
 A procedural interface is provided by the companion pyplot module,
 which may be imported directly, e.g.::
 
-    from matplotlib.pyplot import *
-
-To include numpy functions too, use::
-
-    from pylab import *
+    import matplotlib.pyplot as plt
 
 or using ipython::
 
     ipython
 
 at your terminal, followed by::
 
-    In [1]: %pylab
+    In [1]: %matplotlib
+    In [2]: import matplotlib.pyplot as plt
 
 at the ipython shell prompt.
 
@@ -25,8 +22,7 @@
 interactively.  The
 exceptions are the pyplot commands :func:`~matplotlib.pyplot.figure`,
 :func:`~matplotlib.pyplot.subplot`,
-:func:`~matplotlib.pyplot.subplots`,
-:func:`~matplotlib.backends.backend_qt4agg.show`, and
+:func:`~matplotlib.pyplot.subplots`, and
 :func:`~pyplot.savefig`, which can greatly simplify scripting.
 
 Modules include:
