From a4e2d4fcf15e5973df1f0035a94b086b72b55443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 2 May 2011 22:59:15 +0200
Subject: Add missing name in pkgutil.__all__

---
 Lib/pkgutil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
index 0ec6ec5..e2d630a 100644
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -8,7 +8,7 @@ from types import ModuleType
 
 __all__ = [
     'get_importer', 'iter_importers', 'get_loader', 'find_loader',
-    'walk_packages', 'iter_modules',
+    'walk_packages', 'iter_modules', 'get_data',
     'ImpImporter', 'ImpLoader', 'read_code', 'extend_path',
 ]
 
-- 
cgit v0.12


From 39f180bb1f5407b89ed40c840fe0356566995da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 4 May 2011 15:55:47 +0200
Subject: Fix display of html.parser.HTMLParser.feed docstring

---
 Lib/html/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/html/parser.py b/Lib/html/parser.py
index 3f68e18..bef5c3c 100644
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -99,7 +99,7 @@ class HTMLParser(_markupbase.ParserBase):
         _markupbase.ParserBase.reset(self)
 
     def feed(self, data):
-        """Feed data to the parser.
+        r"""Feed data to the parser.
 
         Call this as often as you want, with as little or as much text
         as you want (may include '\n').
-- 
cgit v0.12


From d4701f426261b93fa528712c0c44426bccdfed41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 25 May 2011 18:13:29 +0200
Subject: Fix two typos

---
 Doc/documenting/style.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/documenting/style.rst b/Doc/documenting/style.rst
index ade845c..2548cb0 100644
--- a/Doc/documenting/style.rst
+++ b/Doc/documenting/style.rst
@@ -135,7 +135,7 @@ Good example (establishing confident knowledge in the effective use of the langu
 Economy of Expression
 ---------------------
 
-More documentation is not necessarily better documentation.  Error on the side
+More documentation is not necessarily better documentation.  Err on the side
 of being succinct.
 
 It is an unfortunate fact that making documentation longer can be an impediment
@@ -197,7 +197,7 @@ Audience
 The tone of the tutorial (and all the docs) needs to be respectful of the
 reader's intelligence.  Don't presume that the readers are stupid.  Lay out the
 relevant information, show motivating use cases, provide glossary links, and do
-our best to connect-the-dots, but don't talk down to them or waste their time.
+your best to connect-the-dots, but don't talk down to them or waste their time.
 
 The tutorial is meant for newcomers, many of whom will be using the tutorial to
 evaluate the language as a whole.  The experience needs to be positive and not
-- 
cgit v0.12

