Merge remote-tracking branch 'upstream/master' into fu1+sort

Author: TomAugspurger

pandas/core/frame.py

@@ -4459,9 +4459,9 @@ def pivot(self, index=None, columns=None, values=None):
         Return reshaped DataFrame organized by given index / column values.
 
         Reshape data (produce a "pivot" table) based on column values. Uses
-        unique values from specified `index` / `columns` to form axes of the resulting
-        DataFrame. This function does not support data aggregation, multiple
-        values will result in a MultiIndex in the columns. See the
+        unique values from specified `index` / `columns` to form axes of the
+        resulting DataFrame. This function does not support data aggregation,
+        multiple values will result in a MultiIndex in the columns. See the
         :ref:`User Guide <reshaping>` for more on reshaping.
 
         Parameters