[Python-checkins] cpython (merge 3.3 -> default): Merge typo fixes from 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/40ef5ce25d08
changeset:   85093:40ef5ce25d08
parent:      85091:9f7581816890
parent:      85092:168f6ac90abf
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Aug 10 18:47:37 2013 +0300
summary:
  Merge typo fixes from 3.3.

files:
  Lib/email/architecture.rst |  6 +++---
  Lib/email/generator.py     |  2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/email/architecture.rst b/Lib/email/architecture.rst
--- a/Lib/email/architecture.rst
+++ b/Lib/email/architecture.rst
@@ -24,9 +24,9 @@
 Conceptually the package is organized around the model.  The model provides both
 "external" APIs intended for use by application programs using the library,
 and "internal" APIs intended for use by the Parser and Generator components.
-This division is intentionally a bit fuzy; the API described by this documentation
-is all a public, stable API.  This allows for an application with special needs
-to implement its own parser and/or generator.
+This division is intentionally a bit fuzzy; the API described by this
+documentation is all a public, stable API.  This allows for an application
+with special needs to implement its own parser and/or generator.
 
 In addition to the three major functional components, there is a third key
 component to the architecture:
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -349,7 +349,7 @@
     # This used to be a module level function; we use a classmethod for this
     # and _compile_re so we can continue to provide the module level function
     # for backward compatibility by doing
-    #   _make_boudary = Generator._make_boundary
+    #   _make_boundary = Generator._make_boundary
     # at the end of the module.  It *is* internal, so we could drop that...
     @classmethod
     def _make_boundary(cls, text=None):

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