Merge: More whatsnew updates, move some doc NEWS items into the doc section.

2 files changed, 26 insertions, 16 deletions

diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 0169dc7..fe7e2b6 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -933,11 +933,12 @@ The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
 (Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
 
 
-base64, binascii
-----------------
+base64
+------
 
 ASCII-only Unicode strings are now accepted by the decoding functions of the
-modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
+:mod:`base64` modern interface. For example, ``base64.b64decode('YWJj')``
+returns ``b'abc'``.  (Contributed by Catalin Iacob in :issue:`13641`.)
 
 
 binascii
@@ -1797,6 +1798,12 @@ shutil
   acts on the symlink itself (or creates one, if relevant).
   (Contributed by Hynek Schlawack in :issue:`12715`.)
 
+* When copying files to a different file system, :func:`~shutil.move` now
+  handles symlinks the way the posix ``mv`` command does, recreating the
+  symlink rather than copying the target file contents.  (Contributed by
+  Jonathan Niehof in :issue:`9993`.)  :func:`~shutil.move` now also returns
+  the ``dst`` argument as its result.
+
 * :func:`~shutil.rmtree` is now resistant to symlink attacks on platforms
   which support the new ``dir_fd`` parameter in :func:`os.open` and
   :func:`os.unlink`. (Contributed by Martin von Löwis and Hynek Schlawack
@@ -1879,6 +1886,9 @@ socket
   (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and
   http://oss.oracle.com/projects/rds/).
 
+* The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol
+  family on OS X.  (Contributed by Michael Goderbauer in :issue:`13777`.)
+
 * New function :func:`~socket.sethostname` allows the hostname to be set
   on unix systems if the calling process has sufficient privileges.
   (Contributed by Ross Lagerwall in :issue:`10866`.)
@@ -2094,13 +2104,13 @@ should be used.  For example, this will send a ``'HEAD'`` request::
 webbrowser
 ----------
 
-The :mod:`webbrowser` module supports more browsers: Google Chrome (named
+The :mod:`webbrowser` module supports more "browsers": Google Chrome (named
 :program:`chrome`, :program:`chromium`, :program:`chrome-browser` or
-:program:`chromium-browser` depending on the version and operating system) as
-well as the the generic launchers :program:`xdg-open` from the FreeDesktop.org
-project and :program:`gvfs-open` which is the default URI handler for GNOME 3.
-
-(:issue:`13620` and :issue:`14493`)
+:program:`chromium-browser` depending on the version and operating system),
+and the generic launchers :program:`xdg-open`, from the FreeDesktop.org
+project, and :program:`gvfs-open`, which is the default URI handler for GNOME
+3.  (The former contributed by Arnaud Calmettes in :issue:`13620`, the latter
+by Matthias Klose in :issue:`14493`)
 
 
 xml.etree.ElementTree
diff --git a/Misc/HISTORY b/Misc/HISTORY
index bebc233..87141cb 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -2360,11 +2360,6 @@ Library
   make sure two listeners can't bind to the same socket/pipe (or any existing
   socket/pipe).
 
-- Issue #9021: Add an introduction to the copy module documentation.
-
-- Issue #6005: Examples in the socket library documentation use sendall, where
-  relevant, instead send method.
-
 - Issue #10811: Fix recursive usage of cursors. Instead of crashing,
   raise a ProgrammingError now.
 
@@ -2473,8 +2468,6 @@ Library
 
 - Add a flags parameter to select.epoll.
 
-- Issue #12798: Updated the mimetypes documentation.
-
 - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the
   SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option.
 
@@ -4093,6 +4086,13 @@ Documentation
 
 - Issue #13883: PYTHONCASEOK also works on OS X.
 
+- Issue #9021: Add an introduction to the copy module documentation.
+
+- Issue #6005: Examples in the socket library documentation use sendall, where
+  relevant, instead send method.
+
+- Issue #12798: Updated the mimetypes documentation.
+
 - Issue #12949: Document the kwonlyargcount argument for the PyCode_New
   C API function.