summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2016-08-26 04:12:16 (GMT)
committerRaymond Hettinger <python@rcn.com>2016-08-26 04:12:16 (GMT)
commitf74c33ad5c94f1f07f574336dc2d5a6345acdcc7 (patch)
tree7de71390a5ea30877d31e56c5fabf44529c86fd2 /Doc
parent8f2ee0d5ffe82c5873bff914835724be0107b0c6 (diff)
parent7ea386e56e76deb2ceeb87c0ac4b346e24cd82e1 (diff)
downloadcpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.zip
cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.gz
cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.bz2
Merge
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst4
-rw-r--r--Doc/whatsnew/2.0.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 08d87cc..e7328ab 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1123,7 +1123,7 @@ Basic customization
instance; for example: ``BaseClass.__init__(self, [args...])``.
Because :meth:`__new__` and :meth:`__init__` work together in constructing
- objects (:meth:`__new__` to create it, and :meth:`__init__` to customise it),
+ objects (:meth:`__new__` to create it, and :meth:`__init__` to customize it),
no non-``None`` value may be returned by :meth:`__init__`; doing so will
cause a :exc:`TypeError` to be raised at runtime.
@@ -1697,7 +1697,7 @@ By default, classes are constructed using :func:`type`. The class body is
executed in a new namespace and the class name is bound locally to the
result of ``type(name, bases, namespace)``.
-The class creation process can be customised by passing the ``metaclass``
+The class creation process can be customized by passing the ``metaclass``
keyword argument in the class definition line, or by inheriting from an
existing class that included such an argument. In the following example,
both ``MyClass`` and ``MySubclass`` are instances of ``Meta``::
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 4d49af1..5bd12ba 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -166,7 +166,7 @@ encoding. Encodings are named by strings, such as ``'ascii'``, ``'utf-8'``,
registering new encodings that are then available throughout a Python program.
If an encoding isn't specified, the default encoding is usually 7-bit ASCII,
though it can be changed for your Python installation by calling the
-``sys.setdefaultencoding(encoding)`` function in a customised version of
+``sys.setdefaultencoding(encoding)`` function in a customized version of
:file:`site.py`.
Combining 8-bit and Unicode strings always coerces to Unicode, using the default
@@ -1139,7 +1139,7 @@ module.
Unix, not to be confused with :program:`gzip`\ -format files (which are
supported by the :mod:`gzip` module) (Contributed by James C. Ahlstrom.)
-* :mod:`imputil`: A module that provides a simpler way for writing customised
+* :mod:`imputil`: A module that provides a simpler way for writing customized
import hooks, in comparison to the existing :mod:`ihooks` module. (Implemented
by Greg Stein, with much discussion on python-dev along the way.)