[Python-checkins] cpython (merge 3.3 -> default): #18126: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/1f0b6462ea3c
changeset:   84062:1f0b6462ea3c
parent:      84059:d1b5e41acf28
parent:      84061:aafa11c1dd61
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Jun 09 01:05:16 2013 +0300
summary:
  #18126: merge with 3.3.

files:
  Doc/faq/programming.rst |  2 +-
  Doc/library/array.rst   |  6 ++----
  Misc/ACKS               |  1 +
  3 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1092,7 +1092,7 @@
    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
--- a/Doc/library/array.rst
+++ b/Doc/library/array.rst
@@ -271,9 +271,7 @@
       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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1395,6 +1395,7 @@
 Milan Zamazal
 Artur Zaprzala
 Mike Zarnstorff
+Yury V. Zaytsev
 Siebren van der Zee
 Nickolai Zeldovich
 Yuxiao Zeng

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