Merge remote-tracking branch 'origin/v2.2.3-doc' into 224_prep

tacaswell · tacaswell · commit c2d1b19b936f · 2019-02-22T22:24:56.000-05:00
diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -6,7 +6,7 @@
 # Install the documentation requirements with:
 #     pip install -r doc-requirements.txt
 #
-sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3
+sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,<1.8
 colorspacious
 ipython
 ipywidgets
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -623,6 +623,14 @@ table.docutils {
     background-color: #eff3f4;
 }
 
+/* tables inside class descriptions */
+dl.class table.property-table {
+    width: 85%;
+    border-spacing: 2px;
+    border-collapse: collapse;
+    border: 0px;
+}
+
 /* tables inside parameter descriptions */
 td.field-body table.property-table {
     width: 100%;
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,6 +27,9 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
 
 DOIs
 ----
+v2.2.3
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1343133.svg
+      :target: https://doi.org/10.5281/zenodo.1343133
 v2.2.2
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
       :target: https://doi.org/10.5281/zenodo.1202077
diff --git a/doc/devel/MEP/MEP24.rst b/doc/devel/MEP/MEP24.rst
@@ -31,7 +31,7 @@ but this seems more generally useful (for example growth rate as a
 function of angle).  The assumption in the current code (as I
 understand it) is that the center of the graph is `r==0`, however it
 would be good to be able to set the center to be at any `r` (with any
-value less than the off set clipped).
+value less than the offset clipped).
 
 Implementation
 ==============
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -156,10 +156,10 @@ A new dark blue/yellow colormap named 'cividis' was added. Like
 viridis, cividis is perceptually uniform and colorblind
 friendly. However, cividis also goes a step further: not only is it
 usable by colorblind users, it should actually look effectively
-identical to colorblind and non-colorblind users. For more details,
-see Nunez J, Anderton C, and Renslow R. (submitted). Optimizing
-colormaps with consideration for color vision deficiency to enable
-accurate interpretation of scientific data."
+identical to colorblind and non-colorblind users. For more details
+see `Nuñez J, Anderton C, and Renslow R: "Optimizing colormaps with consideration
+for color vision deficiency to enable accurate interpretation of scientific data"
+<https://doi.org/10.1371/journal.pone.0199239>`_.
 
 .. plot::
 
diff --git a/examples/lines_bars_and_markers/fill_betweenx_demo.py b/examples/lines_bars_and_markers/fill_betweenx_demo.py
@@ -3,7 +3,8 @@
 Fill Betweenx Demo
 ==================
 
-Using ``fill_betweenx`` to color between two horizontal curves.
+Using `~.Axes.fill_betweenx` to color along the horizontal direction between
+two curves.
 """
 import matplotlib.pyplot as plt
 import numpy as np
@@ -13,35 +14,35 @@
 x1 = np.sin(2 * np.pi * y)
 x2 = 1.2 * np.sin(4 * np.pi * y)
 
-fig, [ax1, ax2, ax3] = plt.subplots(3, 1, sharex=True)
+fig, [ax1, ax2, ax3] = plt.subplots(1, 3, sharey=True, figsize=(6, 6))
 
 ax1.fill_betweenx(y, 0, x1)
-ax1.set_ylabel('(x1, 0)')
+ax1.set_title('between (x1, 0)')
 
 ax2.fill_betweenx(y, x1, 1)
-ax2.set_ylabel('(x1, 1)')
+ax2.set_title('between (x1, 1)')
+ax2.set_xlabel('x')
 
 ax3.fill_betweenx(y, x1, x2)
-ax3.set_ylabel('(x1, x2)')
-ax3.set_xlabel('x')
+ax3.set_title('between (x1, x2)')
 
 # now fill between x1 and x2 where a logical condition is met.  Note
 # this is different than calling
 #   fill_between(y[where], x1[where], x2[where])
 # because of edge effects over multiple contiguous regions.
 
-fig, [ax, ax1] = plt.subplots(2, 1, sharex=True)
+fig, [ax, ax1] = plt.subplots(1, 2, sharey=True, figsize=(6, 6))
 ax.plot(x1, y, x2, y, color='black')
 ax.fill_betweenx(y, x1, x2, where=x2 >= x1, facecolor='green')
 ax.fill_betweenx(y, x1, x2, where=x2 <= x1, facecolor='red')
-ax.set_title('fill between where')
+ax.set_title('fill_betweenx where')
 
 # Test support for masked arrays.
 x2 = np.ma.masked_greater(x2, 1.0)
 ax1.plot(x1, y, x2, y, color='black')
 ax1.fill_betweenx(y, x1, x2, where=x2 >= x1, facecolor='green')
 ax1.fill_betweenx(y, x1, x2, where=x2 <= x1, facecolor='red')
-ax1.set_title('Now regions with x2 > 1 are masked')
+ax1.set_title('regions with x2 > 1 are masked')
 
 # This example illustrates a problem; because of the data
 # gridding, there are undesired unfilled triangles at the crossover
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -12,8 +12,8 @@
 -----------------
 
 The default formatter identifies when the x-data being plotted is a
-small range on top of a large off set. To reduce the chances that the
-ticklabels overlap the ticks are labeled as deltas from a fixed offset.
+small range on top of a large offset. To reduce the chances that the
+ticklabels overlap, the ticks are labeled as deltas from a fixed offset.
 For example::
 
    ax.plot(np.arange(2000, 2010), range(10))
diff --git a/tutorials/colors/colormaps.py b/tutorials/colors/colormaps.py
@@ -391,4 +391,4 @@ def plot_color_gradients(cmap_category, cmap_list):
 # .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
 # .. [colorblindness] http://www.color-blindness.com/
 # .. [vischeck] http://www.vischeck.com/vischeck/
-# .. [IBM] http://www.research.ibm.com/people/l/lloydt/color/color.HTM
+# .. [IBM] https://dx.doi.org/10.1109/VISUAL.1995.480803
diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py
@@ -387,7 +387,7 @@ def my_plotter(ax, data1, data2, param_dict):
 # DPI setting.
 #
 # Here is a summary of the matplotlib renderers (there is an eponymous
-# backed for each; these are *non-interactive backends*, capable of
+# backend for each; these are *non-interactive backends*, capable of
 # writing to a file):
 #
 # =============   ============   ================================================

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Install the documentation requirements with:`
`7`	`7`	`# pip install -r doc-requirements.txt`
`8`	`8`	`#`
`9`		`-sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3`
	`9`	`+sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3,<1.8`
`10`	`10`	`colorspacious`
`11`	`11`	`ipython`
`12`	`12`	`ipywidgets`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ def my_plotter(ax, data1, data2, param_dict):`
`387`	`387`	`# DPI setting.`
`388`	`388`	`#`
`389`	`389`	`# Here is a summary of the matplotlib renderers (there is an eponymous`
`390`		`-# backed for each; these are non-interactive backends, capable of`
	`390`	`+# backend for each; these are non-interactive backends, capable of`
`391`	`391`	`# writing to a file):`
`392`	`392`	`#`
`393`	`393`	`# ============= ============ ================================================`