summaryrefslogtreecommitdiffstats
path: root/Doc/library/archiving.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
commitcd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 (patch)
tree3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39 /Doc/library/archiving.rst
parentbe095b3b9857a5b949dd23b89dac5f5151b252d5 (diff)
parentcd2a6033ac0bafd69a7cba2d132e092127acc895 (diff)
downloadcpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.zip
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.gz
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.bz2
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 b7d400c..c928494 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::