diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 0f13088..b32b2a6 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1366,6 +1366,16 @@
   listing format and deprecates :meth:`ftplib.FTP.nlst` and
   :meth:`ftplib.FTP.dir`.  (Contributed by Giampaolo Rodolà in :issue:`11072`)
 
+
+functools
+---------
+
+The :func:`functools.lru_cache` decorator now accepts a ``typed`` keyword
+argument (that defaults to ``False`` to ensure that it caches values of
+different types that compare equal in separate cache slots.  (Contributed
+by Raymond Hettinger in :issue:`13227`.)
+
+
 gc
 --
 
@@ -1376,21 +1386,9 @@
 hmac
 ----
 
-A new :func:`~hmac.compare_digest` function has been added to prevent
-side channel attacks on digests through timing analysis.
-
-(Contributed by Nick Coghlan and Christian Heimes in issue:`15061`)
-
-
-html.entities
--------------
-
-A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
-references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
-has been added to the :mod:`html.entities` module.  The dictionary is now also
-used by :class:`~html.parser.HTMLParser`.
-
-(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`)
+A new :func:`~hmac.compare_digest` function has been added to prevent side
+channel attacks on digests through timing analysis.  (Contributed by Nick
+Coghlan and Christian Heimes in :issue:`15061`)
 
 
 http
@@ -1402,21 +1400,29 @@
 can be used to directly manage when the accumlated headers are sent.
 (Contributed by Andrew Schaaf in :issue:`3709`.)
 
+:class:`http.server` now produces valid ``HTML 4.01 strict`` output.
+(Contributed by Ezio Melotti in :issue:`13295`.)
 
-html.parser
------------
 
-:class:`~html.parser.HTMLParser` is now able to parse broken markup without
+html
+----
+
+:class:`html.parser.HTMLParser` is now able to parse broken markup without
 raising errors, therefore the *strict* argument of the constructor and the
 :exc:`~html.parser.HTMLParseError` exception are now deprecated.
 The ability to parse broken markup is the result of a number of bug fixes that
 are also available on the latest bug fix releases of Python 2.7/3.2.
-
 (Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`,
 :issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`,
 :issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`,
 :issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`)
 
+A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
+references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] ==
+'>'``) has been added to the :mod:`html.entities` module.  The dictionary is
+now also used by :class:`~html.parser.HTMLParser`.  (Contributed by Ezio
+Melotti in :issue:`11113` and :issue:`15156`)
+
 
 imaplib
 -------
@@ -1655,6 +1661,14 @@
 * Some platforms now support additional constants for the :func:`~os.lseek`
   function, such as ``os.SEEK_HOLE`` and ``os.SEEK_DATA``.
 
+* New constants :data:`~os.RTLD_LAZY`, :data:`~os.RTLD_NOW`,
+  :data:`~os.RTLD_GLOBAL`, :data:`~os.RTLD_LOCAL`, :data:`~os.RTLD_NODELETE`,
+  :data:`~os.RTLD_NOLOAD`, and :data:`~os.RTLD_DEEPBIND` are available on
+  platforms that support them.   These are for use with the
+  :func:`sys.setdlopenflags` function, and supersede the similar constants
+  defined in :mod:`ctypes` and :mod:`DLFCN`.  (Contributed by Victor Stinner
+  in :issue:`13226`.)
+
 * :func:`os.symlink` now accepts (and ignores) the ``target_is_directory``
   keyword argument on non-Windows platforms, to ease cross-platform support.
 
@@ -1727,6 +1741,7 @@
 
 Solaris and derivatives platforms have a new class :class:`select.devpoll`
 for high performance asynchronous sockets via :file:`/dev/poll`.
+(Contributed by Jesús Cea Avión in :issue:`6397`.)
 
 
 shlex
@@ -1922,6 +1937,14 @@
 (Contributed by Giampaolo Rodolà in :issue:`14807`)
 
 
+struct
+------
+
+The :mod:`struct` module now supports ``ssize_t`` and ``size_t`` via the
+new codes ``n`` and ``N``, respectively.  (Contributed by Antoine Pitrou
+in :issue:`3163`.)
+
+
 subprocess
 ----------
 
@@ -1940,6 +1963,7 @@
 sequence` holding informations about the thread implementation
 (:issue:`11223`).
 
+
 textwrap
 --------
 
@@ -2014,6 +2038,7 @@
 :meth:`unittest.TestCase.run` now returns the :class:`~unittest.TestResult`
 object.
 
+
 urllib
 ------
 
@@ -2050,6 +2075,18 @@
 and a more detailed reference.
 
 
+zlib
+----
+
+New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish
+between a properly-formed compressed stream and an incomplete or truncated one.
+(Contributed by Nadeem Vawda in :issue:`12646`.)
+
+New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of
+the underlying ``zlib`` library that is loaded at runtime.  (Contributed by
+Torsten Landschoff in :issue:`12306`.)
+
+
 Optimizations
 =============
 
@@ -2332,6 +2369,10 @@
 
 * The deprecated variable ``time.accept2dyear`` has been removed.
 
+* The deprecated ``Context._clamp`` attribute has been removed from the
+  :mod:`decimal` module.  It was previously replaced by the public attribute
+  :attr:`~decimal.Context.clamp`.  (See :issue:`8540`.)
+
 * The undocumented internal helper class ``SSLFakeFile`` has been removed
   from :mod:`smtplib`, since its functionality has long been provided directly
   by :meth:`socket.socket.makefile`.
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 954a87f..7fbdc85 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -2703,7 +2703,7 @@
 
 - Issue #8540: Remove deprecated Context._clamp attribute in Decimal module.
 
-- Issue #13235: Added PendingDeprecationWarning to warn() method and function.
+- Issue #13235: Added DeprecationWarning to logging.warn() method and function.
 
 - Issue #9168: now smtpd is able to bind privileged port.
 
@@ -2724,12 +2724,12 @@
   in order to display the prompt correctly.
 
 - Issue #12454: The mailbox module is now using ASCII, instead of the locale
-  encoding, to read and write MH mailboxes (.mh_sequences files).
+  encoding, to read and write .mh_sequences files.
 
 - Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are
   now available on Windows.
 
-- issue #1673007: urllib2  to support HEAD request via new method argument.
+- Issue #1673007: urllib.request now supports HEAD request via new method argument.
   Patch contributions by David Stanek, Patrick Westerhoff and Ezio Melotti.
 
 - Issue #12386: packaging does not fail anymore when writing the RESOURCES
@@ -2770,8 +2770,6 @@
   metaclass is registered with copyreg.  Patch by Nicolas M. Thiéry and Craig
   Citro.
 
-- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes.
-
 - Issue #13034: When decoding some SSL certificates, the subjectAltName
   extension could be unreported.