Merge remote-tracking branch 'matplotlib/v2.0.0-doc' into v2.0.x

tacaswell · tacaswell · commit 752d6c612a1a · 2017-02-20T12:22:41.000-05:00
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -82,7 +82,8 @@ <h3>{{ _('Navigation') }}</h3>
         VERSION:     '{{ release|e }}',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
+        HAS_SOURCE:  {{ has_source|lower }},
+        SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
       };
     </script>
     {%- for scriptfile in script_files %}
diff --git a/examples/pylab_examples/set_and_get.py b/examples/pylab_examples/set_and_get.py
@@ -77,7 +77,7 @@
 l1, l2 = lines
 plt.setp(lines, linestyle='--')       # set both to dashed
 plt.setp(l1, linewidth=2, color='r')  # line1 is thick and red
-plt.setp(l2, linewidth=1, color='g')  # line2 is thicker and green
+plt.setp(l2, linewidth=1, color='g')  # line2 is thinner and green
 
 
 print('Line setters')
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -399,10 +399,10 @@ backend      : $TEMPLATE_BACKEND
 #ytick.labelsize      : medium # fontsize of the tick labels
 #ytick.direction      : out    # direction: in, out, or inout
 #ytick.minor.visible  : False  # visibility of minor ticks on y-axis
-#xtick.major.left     : True   # draw y axis left major ticks
-#xtick.major.right    : True   # draw y axis right major ticks
-#xtick.minor.left     : True   # draw y axis left minor ticks
-#xtick.minor.right    : True   # draw y axis right minor ticks
+#ytick.major.left     : True   # draw y axis left major ticks
+#ytick.major.right    : True   # draw y axis right major ticks
+#ytick.minor.left     : True   # draw y axis left minor ticks
+#ytick.minor.right    : True   # draw y axis right minor ticks
 
 
 ### GRIDS
