[Python-checkins] peps (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/peps/rev/3e75f2c9903b
changeset:   3923:3e75f2c9903b
parent:      3922:120578926442
parent:      3921:0d53159dc0ae
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Aug 11 20:44:34 2011 +0200
summary:
  Merge

files:
  pep-0402.txt |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/pep-0402.txt b/pep-0402.txt
old mode 100644
new mode 100755
--- a/pep-0402.txt
+++ b/pep-0402.txt
@@ -48,7 +48,7 @@
 
 
 When new users come to Python from other languages, they are often
-confused by Python's packaging semantics.  At Google, for example,
+confused by Python's package import semantics.  At Google, for example,
 Guido received complaints from "a large crowd with pitchforks" [2]_
 that the requirement for packages to contain an ``__init__`` module
 was a "misfeature", and should be dropped.
@@ -434,7 +434,7 @@
 ``import foo.bar.baz`` must wait until ``foo.bar.baz`` is found before
 creating module objects for *both* ``foo`` and ``foo.bar``, and then
 create both of them together, properly setting the ``foo`` module's
-``.bar`` attrbute to point to the ``foo.bar`` module.
+``.bar`` attribute to point to the ``foo.bar`` module.
 
 In this way, pure virtual packages are never directly importable:
 an ``import foo`` or ``import foo.bar`` by itself will fail, and the
@@ -603,7 +603,7 @@
   accidentally work.  Is that good or bad?
 
 
-For those implementing PEP \302 importer objects:
+For those implementing PEP 302 importer objects:
 
 * Importers that support the ``iter_modules()`` method (used by
   ``pkgutil`` to locate importable modules and packages) and want to

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