Merged revisions 84945 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line
#9911: doc copyedits.
........
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index a9ef1d8..cdb6a8e 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -296,7 +296,7 @@
<bound method D.f of <__main__.D object at 0x00B18C90>>
The output suggests that bound and unbound methods are two different types.
-While they could have been implemented that way, the actual C implemention of
+While they could have been implemented that way, the actual C implementation of
:ctype:`PyMethod_Type` in
`Objects/classobject.c <http://svn.python.org/view/python/trunk/Objects/classobject.c?view=markup>`_
is a single object with two different representations depending on whether the
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
index 9f7fe68..3927544 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -313,7 +313,7 @@
Non-blocking Sockets
====================
-If you've understood the preceeding, you already know most of what you need to
+If you've understood the preceding, you already know most of what you need to
know about the mechanics of using sockets. You'll still use the same calls, in
much the same ways. It's just that, if you do it right, your app will be almost
inside-out.