summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-10-31 17:34:01 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-10-31 17:34:01 (GMT)
commit22d4553acb2c80592655167b50ad9a49c2aecb44 (patch)
treec02160a18fdbdc30cae40425f16f76150335d152
parent05a4a9cbaa252fbf57d77f507c01207c73b5b10f (diff)
parentf97edf1aa630d507a69885e5a3e9ff8edbe3ea02 (diff)
downloadcpython-22d4553acb2c80592655167b50ad9a49c2aecb44.zip
cpython-22d4553acb2c80592655167b50ad9a49c2aecb44.tar.gz
cpython-22d4553acb2c80592655167b50ad9a49c2aecb44.tar.bz2
Merge 3.5
-rw-r--r--Doc/whatsnew/3.5.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index e1ae801..c73d50b 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -276,7 +276,7 @@ instead of::
S = dot((dot(H, beta) - r).T,
dot(inv(dot(dot(H, V), H.T)), dot(H, beta) - r))
-An upcoming release of NumPy 1.10 will add support for the new operator::
+NumPy 1.10 has support for the new operator::
>>> import numpy