From 4c5404421f7c1fe9cc941df1cbc645222aae7b6c Mon Sep 17 00:00:00 2001
From: Dean Moldovan <dean0x7d@gmail.com>
Date: Wed, 30 Aug 2017 21:53:08 +0200
Subject: [PATCH] Update changelog and upgrade guide

[skip ci]
---
 docs/changelog.rst | 18 ++++++++++++++----
 docs/upgrade.rst   |  9 +++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7f898fe55..81fe5d0c0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -77,7 +77,8 @@ v2.2.0 (Not yet released)
   functions which return a class instance by value, pointer or holder. This
   supersedes the old placement-new ``__init__`` technique.
   See :ref:`custom_constructors` for details.
-  `#805 <https://github.com/pybind/pybind11/pull/805>`_.
+  `#805 <https://github.com/pybind/pybind11/pull/805>`_,
+  `#1014 <https://github.com/pybind/pybind11/pull/1014>`_.
 
   .. code-block:: cpp
 
@@ -193,8 +194,8 @@ v2.2.0 (Not yet released)
 * Fixed overriding static properties in derived classes.
   `#784 <https://github.com/pybind/pybind11/pull/784>`_.
 
-* Improved deduction of member function of derived class when the bases
-  isn't registered with pybind11.
+* Improved deduction of member functions of a derived class when its bases
+  aren't registered with pybind11.
   `#855 <https://github.com/pybind/pybind11/pull/855>`_.
 
   .. code-block:: cpp
@@ -228,6 +229,9 @@ v2.2.0 (Not yet released)
   `#866 <https://github.com/pybind/pybind11/pull/866>`_,
   `#960 <https://github.com/pybind/pybind11/pull/960>`_.
 
+* Fixed reference leak of type objects.
+  `#1030 <https://github.com/pybind/pybind11/pull/1030>`_.
+
 * Improved support for the ``/std:c++14`` and ``/std:c++latest`` modes
   on MSVC 2017.
   `#841 <https://github.com/pybind/pybind11/pull/841>`_,
@@ -272,6 +276,10 @@ v2.2.0 (Not yet released)
   Use ``py::object::borrowed_t{}``/``py::object::stolen_t{}`` instead.
   `#771 <https://github.com/pybind/pybind11/pull/771>`_.
 
+* Changed internal data structure versioning to avoid conflicts between
+  modules compiled with different revisions of pybind11.
+  `#1012 <https://github.com/pybind/pybind11/pull/1012>`_.
+
 * Additional compile-time and run-time error checking and more informative messages.
   `#786 <https://github.com/pybind/pybind11/pull/786>`_,
   `#794 <https://github.com/pybind/pybind11/pull/794>`_,
@@ -300,9 +308,11 @@ v2.2.0 (Not yet released)
   `#962 <https://github.com/pybind/pybind11/pull/962>`_,
   `#965 <https://github.com/pybind/pybind11/pull/965>`_,
   `#970 <https://github.com/pybind/pybind11/pull/970>`_,
-  `#979 <https://github.com/pybind/pybind11/pull/979>`_,
   `#978 <https://github.com/pybind/pybind11/pull/978>`_,
+  `#979 <https://github.com/pybind/pybind11/pull/979>`_,
   `#986 <https://github.com/pybind/pybind11/pull/986>`_,
+  `#1020 <https://github.com/pybind/pybind11/pull/1020>`_,
+  `#1027 <https://github.com/pybind/pybind11/pull/1027>`_,
   `#1037 <https://github.com/pybind/pybind11/pull/1037>`_.
 
 * Testing improvements.
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index f993e2047..5ad7c2981 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -201,6 +201,15 @@ localize all common type bindings in order to avoid conflicts with
 third-party modules.
 
 
+Negative strides for Python buffer objects and numpy arrays
+-----------------------------------------------------------
+
+Support for negative strides required changing the integer type from unsigned
+to signed in the interfaces of ``py::buffer_info`` and ``py::array``. If you
+have compiler warnings enabled, you may notice some new conversion warnings
+after upgrading. These can be resolved using ``static_cast``.
+
+
 Deprecation of some ``py::object`` APIs
 ---------------------------------------