Merge branch 'v1.5.3-doc' into v2.x

QuLogic · QuLogic · commit 9c1b548d5cd4 · 2016-10-17T20:51:32.000-04:00
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -172,7 +172,7 @@ <h1>Toolkits</h1>
 3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
 axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a>,
 several higher-level plotting interfaces
-    <a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
+    <a href="https://seaborn.github.io/">seaborn</a>,
     <a href="http://holoviews.org">holoviews</a>,
     <a href="http://ggplot.yhathq.com">ggplot</a>, and more.
  </p>
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -155,6 +155,34 @@ where "ax" is an ``Axes3d`` object created with something like ::
    ax = plt.sublot(111, projection='3d')
 
 
+Changes in 1.5.3
+================
+
+``ax.plot(..., marker=None)`` gives default marker
+--------------------------------------------------
+
+Prior to 1.5.3 kwargs passed to `~matplotlib.Axes.plot` were handled
+in two parts -- default kwargs generated internal to
+`~matplotlib.Axes.plot` (such as the cycled styles) and user supplied
+kwargs.  The internally generated kwargs were passed to the
+`matplotlib.lines.Line2D.__init__` and the user kwargs were passed to
+``ln.set(**kwargs)`` to update the artist after it was created.  Now
+both sets of kwargs are merged and passed to
+`~matplotlib.lines.Line2D.__init__`.  This change was made to allow `None`
+to be passed in via the user kwargs to mean 'do the default thing'  as
+is the convention through out mpl rather than raising an exception.
+
+Unlike most `~matplotlib.lines.Line2D` setter methods
+`~matplotlib.lines.Line2D.set_marker` did accept `None` as a valid
+input which was mapped to 'no marker'.  Thus, by routing this
+``marker=None`` through ``__init__`` rather than ``set(...)`` the meaning
+of ``ax.plot(..., marker=None)`` changed from 'no markers' to 'default markers
+from rcparams'.
+
+This is change is only evident if ``mpl.rcParams['lines.marker']`` has a value
+other than ``'None'`` (which is string ``'None'`` which means 'no marker').
+
+
 Changes in 1.5.2
 ================
 
diff --git a/doc/mpl_toolkits/index.rst b/doc/mpl_toolkits/index.rst
@@ -176,10 +176,9 @@ seaborn
 =======
 (*Not distributed with matplotlib*)
 
-`seaborn <http://web.stanford.edu/~mwaskom/software/seaborn>`_ is a high
-level interface for drawing statistical graphics with matplotlib. It
-aims to make visualization a central part of exploring and
-understanding complex datasets.
+`seaborn <https://seaborn.github.io/>`_ is a high level interface for drawing
+statistical graphics with matplotlib. It aims to make visualization a central
+part of exploring and understanding complex datasets.
 
 .. image:: /_static/seaborn.png
     :height: 157px
