[Python-checkins] cpython (merge default -> default): Merge heads.

[ezio.melotti]

http://hg.python.org/cpython/rev/039c316bd157
changeset:   70984:039c316bd157
parent:      70980:d7acf357ad79
parent:      70981:4dcb49395c7a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Jun 25 20:30:52 2011 +0300
summary:
  Merge heads.

files:
  Doc/library/zipimport.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -9,11 +9,11 @@
 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 built-in :keyword:`import` mechanism for ``sys.path`` items that are paths
+by the built-in :keyword:`import` mechanism for :data:`sys.path` items that are paths
 to ZIP archives.
 
-Typically, ``sys.path`` is a list of directory names as strings.  This module
-also allows an item of ``sys.path`` to be a string naming a ZIP file archive.
+Typically, :data:`sys.path` is a list of directory names as strings.  This module
+also allows an item of :data:`sys.path` to be a string naming a ZIP file archive.
 The ZIP archive can contain a subdirectory structure to support package imports,
 and a path within the archive can be specified to only import from a
 subdirectory.  For example, the path :file:`/tmp/example.zip/lib/` would only

-- 
Repository URL: http://hg.python.org/cpython