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.
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 4ba9ddc..22e202d 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -121,7 +121,8 @@
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 4c89dc3..0731cd8 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -831,8 +831,8 @@
: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::