[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[zach.ware]

https://hg.python.org/cpython/rev/7b63e7bc5b3d
changeset:   94690:7b63e7bc5b3d
parent:      94688:041a27298cf3
parent:      94689:c6dd9ada7102
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Feb 19 22:15:54 2015 -0600
summary:
  Merge with 3.4

files:
  Doc/reference/expressions.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1075,7 +1075,7 @@
 * Numbers are compared arithmetically.
 
 * The values :const:`float('NaN')` and :const:`Decimal('NaN')` are special.
-  The are identical to themselves, ``x is x`` but are not equal to themselves,
+  They are identical to themselves, ``x is x`` but are not equal to themselves,
   ``x != x``.  Additionally, comparing any value to a not-a-number value
   will return ``False``.  For example, both ``3 < float('NaN')`` and
   ``float('NaN') < 3`` will return ``False``.

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