[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/09d6232e4705
changeset:   101514:09d6232e4705
parent:      101511:eaee5aed6fbc
parent:      101512:bb007a5a7291
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu May 26 22:51:44 2016 -0700
summary:
  merge 3.5

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


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1201,7 +1201,7 @@
    w, h = 2, 3
    A = [[None] * w for i in range(h)]
 
-Or, you can use an extension that provides a matrix datatype; `Numeric Python
+Or, you can use an extension that provides a matrix datatype; `NumPy
 <http://www.numpy.org/>`_ is the best known.
 
 

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