summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-10-26 16:35:00 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-10-26 16:35:00 (GMT)
commitda2bd6caca34eb9c52e7262680b067ace7ac6f7d (patch)
treee25536d45ef45adcaa6c880efa6954478c557387
parentf9de90a935c0294b32e2c5dc00efb28884a0e3c7 (diff)
parentafa46abab8fa738bec5bb0e6ba85aea9cf353ae0 (diff)
downloadcpython-da2bd6caca34eb9c52e7262680b067ace7ac6f7d.zip
cpython-da2bd6caca34eb9c52e7262680b067ace7ac6f7d.tar.gz
cpython-da2bd6caca34eb9c52e7262680b067ace7ac6f7d.tar.bz2
Merge heads.
-rw-r--r--Doc/tutorial/stdlib.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 5b3d1d8..cb892fd 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -203,7 +203,7 @@ Data Compression
================
Common data archiving and compression formats are directly supported by modules
-including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and
+including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`lzma`, :mod:`zipfile` and
:mod:`tarfile`. ::
>>> import zlib