summaryrefslogtreecommitdiffstats
path: root/Doc/library/zipimport.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
commit22b3431426349a424e3486c279db8b84cf671da0 (patch)
treedb3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/library/zipimport.rst
parent7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff)
downloadcpython-22b3431426349a424e3486c279db8b84cf671da0.zip
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.gz
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.bz2
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line builtin -> built-in. ........
Diffstat (limited to 'Doc/library/zipimport.rst')
-rw-r--r--Doc/library/zipimport.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
index 3fd0595..2315823 100644
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -10,7 +10,7 @@
This module adds the ability to import Python modules (:file:`\*.py`,
:file:`\*.py[co]`) and packages from ZIP-format archives. It is usually not
needed to use the :mod:`zipimport` module explicitly; it is automatically used
-by the builtin :keyword:`import` mechanism for ``sys.path`` items that are paths
+by the built-in :keyword:`import` mechanism for ``sys.path`` items that are paths
to ZIP archives.
Typically, ``sys.path`` is a list of directory names as strings. This module