From 575fb3195517fc06ec664a1fbfcedf84a2d8ea3a Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 25 Dec 2013 23:21:03 -0500
Subject: [PATCH] shelf in with stmt, fish/csh in venv, ElementTree
 short_empty_elements keyword.

Also added versionadded for for fish/csh, fixed indentation of versionadded
for ElementTree.write, and make the behavior of shelf as a context manager
explicit in the docs.
---
 Doc/library/shelve.rst                |  3 ++-
 Doc/library/xml.etree.elementtree.rst |  4 ++--
 Doc/using/venv-create.inc             |  2 ++
 Doc/whatsnew/3.4.rst                  | 25 +++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 4ba9ddc4770..22e202dace1 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -121,7 +121,8 @@ Restrictions
    The *keyencoding* parameter is the encoding used to encode keys before they
    are used with the underlying dict.
 
-   :class:`Shelf` objects can also be used as context managers.
+   A :class:`Shelf` object can also be used as a context manager, in which
+   case it will be automatically closed when the :keyword:`with` block ends.
 
    .. versionchanged:: 3.2
       Added the *keyencoding* parameter; previously, keys were always encoded in
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
index 4c89dc34ea9..0731cd8e98c 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -831,8 +831,8 @@ ElementTree Objects
       :term:`file object`; make sure you do not try to write a string to a
       binary stream and vice versa.
 
-   .. versionadded:: 3.4
-      The *short_empty_elements* parameter.
+      .. versionadded:: 3.4
+         The *short_empty_elements* parameter.
 
 
 This is the XML file that is going to be manipulated::
diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc
index 868bbc827be..997e24bd2b5 100644
--- a/Doc/using/venv-create.inc
+++ b/Doc/using/venv-create.inc
@@ -92,3 +92,5 @@ a "deactivate" function, whereas on Windows there are separate scripts called
 ``deactivate.bat`` and ``Deactivate.ps1`` which are installed when the venv is
 created.
 
+.. versionadded:: 3.4
+   ``fish`` and ``csh`` activation scripts.
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index e9292ba021b..e2f810cc757 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -823,6 +823,15 @@ resource
 New :func:`resource.prlimit` function and Linux specific constants.
 (Contributed by Christian Heimes in :issue:`16595` and :issue:`19324`.)
 
+
+shelve
+------
+
+:class:`~shelve.Shelf` instances may now be used in :keyword:`with` statements,
+and will be automatically closed at the end of the :keyword:`with` block.
+(Contributed by Filip Gruszczyński in :issue:`13896`.)
+
+
 smtplib
 -------
 
@@ -927,6 +936,13 @@ Support for easy dynamically-generated subtests using the
 (Contributed by Antoine Pitrou in :issue:`16997`.)
 
 
+venv
+----
+
+:mod:`venv` now includes activation scripts for the ``csh`` and ``fish``
+shells (Contributed by Andrew Svetlov in :issue:`15417`.)
+
+
 wave
 ----
 
@@ -956,6 +972,15 @@ Add an event-driven parser for non-blocking applications,
 :class:`~xml.etree.ElementTree.XMLPullParser`.
 (Contributed by Antoine Pitrou in :issue:`17741`.)
 
+The :mod:`xml.etree.ElementTree` :func:`~xml.etree.ElementTree.tostring` and
+:func:`~xml.etree.ElementTree.tostringlist` functions, and the
+:class:`~xml.etree.ElementTree.ElementTree`
+:meth:`~xml.etree.ElementTree.ElementTree.write` method, now have a
+*short_empty_elements* :ref:`keyword-only parameter <keyword-only_parameter>`
+providing control over whether elements with no content are written in
+abbreviated (``<tag />``) or expanded (``<tag></tag>``) form.  (Contributed by
+Ariel Poliak and Serhiy Storchaka in :issue:`14377`.)
+
 
 zipfile.PyZipfile
 -----------------