summaryrefslogtreecommitdiff
path: root/Doc/library/archiving.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 13:49:59 +0100
committerÉric Araujo <merwok@netwok.org>2012-02-05 13:49:59 +0100
commitafc1d657a647594d9fb268692508be847a8958b7 (patch)
tree769e1b689d6f89d325bee176251945f69146e132 /Doc/library/archiving.rst
parent96c4dbfd0ab5fd8ab8c5627642eeb3d6bf8064fe (diff)
parent7386892486bdd9eb94f99339ad526a8dbb10b645 (diff)
downloadcpython-afc1d657a647594d9fb268692508be847a8958b7.tar.gz
Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)
Diffstat (limited to 'Doc/library/archiving.rst')
-rw-r--r--Doc/library/archiving.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/archiving.rst b/Doc/library/archiving.rst
index b7d400ce85..c9284949af 100644
--- a/Doc/library/archiving.rst
+++ b/Doc/library/archiving.rst
@@ -6,7 +6,8 @@ Data Compression and Archiving
The modules described in this chapter support data compression with the zlib,
gzip, bzip2 and lzma algorithms, and the creation of ZIP- and tar-format
-archives.
+archives. See also :ref:`archiving-operations` provided by the :mod:`shutil`
+module.
.. toctree::