summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/datamodel.rst4
-rw-r--r--Doc/reference/introduction.rst12
2 files changed, 8 insertions, 8 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index a32a84d..25ab11e 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1596,7 +1596,7 @@ The following methods are used to override the default behavior of the
In particular, the metaclass :class:`abc.ABCMeta` implements these methods in
order to allow the addition of Abstract Base Classes (ABCs) as "virtual base
-classes" to any class or type (including built-in types), and including to other
+classes" to any class or type (including built-in types), including other
ABCs.
.. method:: class.__instancecheck__(self, instance)
@@ -1615,7 +1615,7 @@ ABCs.
Note that these methods are looked up on the type (metaclass) of a class. They
cannot be defined as class methods in the actual class. This is consistent with
-the lookup of special methods that are called on instances, only that in this
+the lookup of special methods that are called on instances, only in this
case the instance is itself a class.
.. seealso::
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
index b22d5e0..23ab88e 100644
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -69,12 +69,12 @@ IronPython
more information, see `the IronPython website <http://www.ironpython.com/>`_.
PyPy
- An implementation of Python written in Python; even the bytecode interpreter is
- written in Python. This is executed using CPython as the underlying
- interpreter. One of the goals of the project is to encourage experimentation
- with the language itself by making it easier to modify the interpreter (since it
- is written in Python). Additional information is available on `the PyPy
- project's home page <http://codespeak.net/pypy/>`_.
+ An implementation of Python written completely in Python. It supports several
+ advanced features not found in other implementations like stackless support
+ and a Just in Time compiler. One of the goals of the project is to encourage
+ experimentation with the language itself by making it easier to modify the
+ interpreter (since it is written in Python). Additional information is
+ available on `the PyPy project's home page <http://pypy.org/>`_.
Each of these implementations varies in some way from the language as documented
in this manual, or introduces specific information beyond what's covered in the