#18126: update NumPy links in the documentation. Patch by Yury V. Zaytsev.

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index b9ed53410c7bb8c625c686915c38422d202f9730..16fabe1ddf611d4e84be73fc7ca3385eaca28878 100644 (file)
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1204,7 +1204,7 @@ use a list comprehension::
    A = [[None] * w for i in range(h)]
 
 Or, you can use an extension that provides a matrix datatype; `Numeric Python
-<http://numpy.scipy.org/>`_ is the best known.
+<http://www.numpy.org/>`_ is the best known.
 
 
 How do I apply a method to a sequence of objects?

diff --git a/Doc/library/array.rst b/Doc/library/array.rst
index d34cf382b1e55024f5313c70d9e2845a016b1982..1766d47c0fa05cd4584040180f6f6f1454203db1 100644 (file)
--- a/Doc/library/array.rst
+++ b/Doc/library/array.rst
@@ -268,9 +268,7 @@ Examples::
       Packing and unpacking of External Data Representation (XDR) data as used in some
       remote procedure call systems.
 
-   `The Numerical Python Manual <http://numpy.sourceforge.net/numdoc/HTML/numdoc.htm>`_
+   `The Numerical Python Documentation <http://docs.scipy.org/doc/>`_
       The Numeric Python extension (NumPy) defines another array type; see
-      http://numpy.sourceforge.net/ for further information about Numerical Python.
-      (A PDF version of the NumPy manual is available at
-      http://numpy.sourceforge.net/numdoc/numdoc.pdf).
+      http://www.numpy.org/ for further information about Numerical Python.
 

diff --git a/Misc/ACKS b/Misc/ACKS
index 484202699e1b09fc53cdbc79b75ebf800dfd5207..92fffc68de374135388f4007ded9509b672a4d69 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1139,6 +1139,7 @@ Moshe Zadka
 Milan Zamazal
 Artur Zaprzala
 Mike Zarnstorff
+Yury V. Zaytsev
 Siebren van der Zee
 Nickolai Zeldovich
 Uwe Zessin