Merge remote-tracking branch 'origin/v2.2.4-doc' into v2.2.x

tacaswell · tacaswell · commit 06b0b522bb46 · 2019-05-18T13:27:28.000-04:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -363,3 +363,5 @@ def _check_deps():
 # numpydoc config
 
 numpydoc_show_class_members = False
+
+latex_engine = 'xelatex'  # or 'lualatex'
diff --git a/tutorials/introductory/sample_plots.py b/tutorials/introductory/sample_plots.py
@@ -415,6 +415,7 @@
    :scale: 50
 
    Xkcd
+
 """
 
 ###################################################################
