Merge pull request #5872 from jenshnielsen/sphinx134

tacaswell · tacaswell · commit b7dfa4fa7a69 · 2016-01-24T13:08:16.000-05:00
DOC: Fix issue with Sphinx 1.3.4 Discarded changes to .travis.yml from #5872
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None):
     """
     Call :program:`kpsewhich` to find a file in the texmf tree. If
     *format* is not None, it is used as the value for the
-    :option:`--format` option.
+    `--format` option.
 
     Apparently most existing TeX distributions on Unix-like systems
     use kpathsea. I hear MikTeX (a popular distribution on Windows)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -2992,15 +2992,21 @@ class Bar(_Base):
 
         def __init__(self, armA=0., armB=0., fraction=0.3, angle=None):
             """
-            *armA* : minimum length of armA
+            Parameters
+            ----------
+            armA : float
+                minimum length of armA
 
-            *armB* : minimum length of armB
+            armB : float
+                minimum length of armB
 
-            *fraction* : a fraction of the distance between two points that
-                         will be added to armA and armB.
+            fraction : float
+                a fraction of the distance between two points that
+                will be added to armA and armB.
 
-            *angle* : angle of the connecting line (if None, parallel to A
-                      and B)
+            angle : float or None
+                angle of the connecting line (if None, parallel
+                to A and B)
             """
             self.armA = armA
             self.armB = armB
