Squashed commit and removed the excess changes that should not have been made in the first place

Salil Vanvari · NelleV · commit e1c76f603475 · 2016-12-19T05:57:14.000-08:00
diff --git a/doc/users/mathtext.rst b/doc/users/mathtext.rst
@@ -214,6 +214,11 @@ When using the `STIX <http://www.stixfonts.org/>`_ fonts, you also have the choi
     ``\mathfrak{Fraktur}``                 :math-stix:`\mathfrak{Fraktur}`
     ``\mathsf{sansserif}``                 :math-stix:`\mathsf{sansserif}`
     ``\mathrm{\mathsf{sansserif}}``        :math-stix:`\mathrm{\mathsf{sansserif}}`
+    ====================================== =========================================    
+
+  .. htmlonly::   
+
+    ====================================== =========================================    
     ``\mathcircled{circled}``              :math-stix:`\mathcircled{circled}`
 
     ====================================== =========================================
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3798,7 +3798,7 @@ def dopatch(xs, ys, **kwargs):
     def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 vmin=None, vmax=None, alpha=None, linewidths=None,
                 verts=None, edgecolors=None,
-                **kx`wargs):
+                **kwargs):
         """
         Make a scatter plot of `x` vs `y`
 
