Merge 3.6 (issue #28635)
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 25fb29c..ee51791 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -311,7 +311,7 @@
Much like :c:func:`PyErr_SetImportError` but this function allows for
specifying a subclass of :exc:`ImportError` to raise.
- .. versionadded:: 3.4
+ .. versionadded:: 3.6
.. c:function:: int PyErr_WarnExplicitObject(PyObject *category, PyObject *message, PyObject *filename, int lineno, PyObject *module, PyObject *registry)
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index 7e861fd..cc3017b 100644
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -232,6 +232,10 @@
.. versionchanged:: 3.3
Added support for the ``'n'`` and ``'N'`` formats.
+.. versionchanged:: 3.6
+ Added support for the ``'e'`` format.
+
+
Notes:
(1)