Merge branch 'master' of https://github.com/grechkay/pandas-1 into grechkay-master

Author: jreback

doc/source/indexing.rst

@@ -96,13 +96,15 @@ of multi-axis indexing.
   See more at :ref:`Selection by Position <indexing.integer>`
 
 - ``.ix`` supports mixed integer and label based access. It is primarily label
-  based, but will fall back to integer positional access. ``.ix`` is the most
-  general and will support any of the inputs to ``.loc`` and ``.iloc``, as well
-  as support for floating point label schemes. ``.ix`` is especially useful
-  when dealing with mixed positional and label based hierarchical indexes.
-  As using integer slices with ``.ix`` have different behavior depending on
-  whether the slice is interpreted as position based or label based, it's
-  usually better to be explicit and use ``.iloc`` or ``.loc``.
+  based, but will fall back to integer positional access unless the corresponding
+  axis is of integer type. ``.ix`` is the most general and will
+  support any of the inputs in ``.loc`` and ``.iloc``. ``.ix`` also supports floating point
+  label schemes. ``.ix`` is exceptionally useful when dealing with mixed positional
+  and label based hierachical indexes.
+
+  However, when an axis is integer based, ONLY
+  label based access and not positional access is supported.
+  Thus, in such cases, it's usually better to be explicit and use ``.iloc`` or ``.loc``.
 
   See more at :ref:`Advanced Indexing <advanced>`, :ref:`Advanced
   Hierarchical <advanced.advanced_hierarchical>` and :ref:`Fallback Indexing