Merge pull request #7301 from charris/update-release-notes

DOC: Update release notes

2 files changed, 27 insertions, 2 deletions

diff --git a/doc/release/1.11.0-notes.rst b/doc/release/1.11.0-notes.rst
index 26406a874..c9b7a6d3e 100644
--- a/doc/release/1.11.0-notes.rst
+++ b/doc/release/1.11.0-notes.rst
@@ -55,8 +55,6 @@ The following changes are scheduled for Numpy 1.12.0.
   e.g., ``a['1', '2']``
 * Indexing with multiple ellipsis will raise ``IndexError``,
   e.g., ``a[..., ...]``.
-* Indexing with boolean where integer expected will raise ``IndexError``,
-  e.g., ``a[False:True:True]``.
 * Non-integers used as index values will raise ``TypeError``,
   e.g., in ``reshape``, ``take``, and specifying reduce axis.
 
@@ -138,6 +136,18 @@ FutureWarning to changed behavior
   due to a bug, sometimes no warning was raised and the dimensions were
   already preserved.
 
+``%`` and ``//`` operators
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+These operators are implemented with the ``remainder`` and ``floor_divide``
+functions respectively. Those functions are now based around ``fmod`` and are
+computed together so as to be compatible with each other and with the Python
+versions for float types.  The results should be marginally more accurate or
+outright bug fixes compared to the previous results, but they may
+differ significantly in cases where roundoff makes a difference in the integer
+returned by ``floor_divide``. Some corner cases also change, for instance, NaN
+is always returned for both functions when the divisor is zero,
+``divmod(1.0, inf)`` returns ``(0.0, 1.0)`` except on MSVC 2008, and
+``divmod(-1.0, inf)`` returns ``(-1.0, inf)``.
 
 C API
 ~~~~~
@@ -212,6 +222,9 @@ New Features
   The change is backward compatible, passing a scalar ``deg`` will behave
   as before.
 
+* A divmod function for float types modeled after the Python version has
+  been added to the npy_math library.
+
 
 Improvements
 ============
diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst
index 09f94141c..85b10cd45 100644
--- a/doc/release/1.12.0-notes.rst
+++ b/doc/release/1.12.0-notes.rst
@@ -23,6 +23,18 @@ Future Changes
 Compatibility notes
 ===================
 
+DeprecationWarning to error
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Indexing with floats raises ``IndexError``,
+  e.g., a[0, 0.0].
+* Indexing with non-integer array_like raises ``IndexError``,
+  e.g., ``a['1', '2']``
+* Indexing with multiple ellipsis raises ``IndexError``,
+  e.g., ``a[..., ...]``.
+* Non-integers used as index values raise ``TypeError``,
+  e.g., in ``reshape``, ``take``, and specifying reduce axis.
+
 Relaxed stride checking is the default
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~