Merge pull request #8840 from rgommers/mailinglist-move

DOC: update docs and comments for move of mailing list to python.org

6 files changed, 17 insertions, 47 deletions

diff --git a/doc/CAPI.rst.txt b/doc/CAPI.rst.txt
index 7da36ad2e..c586dd4ce 100644
--- a/doc/CAPI.rst.txt
+++ b/doc/CAPI.rst.txt
@@ -3,10 +3,10 @@ C-API for NumPy
 ===============
 
 :Author:          Travis Oliphant
-:Discussions to:  `numpy-discussion@scipy.org`__
+:Discussions to:  `numpy-discussion@python.org`__
 :Created:         October 2005
 
-__ http://www.scipy.org/Mailing_Lists
+__ http://scipy.org/scipylib/mailing-lists.html
 
 The C API of NumPy is (mostly) backward compatible with Numeric.
 
diff --git a/doc/HOWTO_DOCUMENT.rst.txt b/doc/HOWTO_DOCUMENT.rst.txt
index 272dd6bf2..e815e1d68 100644
--- a/doc/HOWTO_DOCUMENT.rst.txt
+++ b/doc/HOWTO_DOCUMENT.rst.txt
@@ -654,5 +654,5 @@ HTML using::
   $ rst2html HOWTO_DOCUMENT.txt HOWTO_DOCUMENT.html
 
 .. _SciPy: http://www.scipy.org
-.. _numpy-discussion list: http://www.scipy.org/Mailing_Lists
+.. _numpy-discussion list: http://scipy.org/scipylib/mailing-lists.html
 .. _Sphinx: http://sphinx.pocoo.org
diff --git a/doc/neps/return-of-revenge-of-matmul-pep.rst b/doc/neps/return-of-revenge-of-matmul-pep.rst
index ae75d9d18..df43cad62 100644
--- a/doc/neps/return-of-revenge-of-matmul-pep.rst
+++ b/doc/neps/return-of-revenge-of-matmul-pep.rst
@@ -1173,11 +1173,11 @@ Collected here for reference:
   https://mail.python.org/pipermail/python-ideas/2014-March/027053.html
 
 * numpy-discussion thread on whether to keep ``@@``:
-  http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069448.html
+  http://mail.python.org/pipermail/numpy-discussion/2014-March/069448.html
 
 * numpy-discussion threads on precedence/associativity of ``@``:
-  * http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069444.html
-  * http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069605.html
+  * http://mail.python.org/pipermail/numpy-discussion/2014-March/069444.html
+  * http://mail.python.org/pipermail/numpy-discussion/2014-March/069605.html
 
 
 References
@@ -1286,7 +1286,7 @@ References
 
 .. [#broadcasting] http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html
 
-.. [#matmul-other-langs] http://mail.scipy.org/pipermail/scipy-user/2014-February/035499.html
+.. [#matmul-other-langs] http://mail.python.org/pipermail/scipy-user/2014-February/035499.html
 
 .. [#github-details] Counts were produced by manually entering the
    string ``"import foo"`` or ``"from foo import"`` (with quotes) into
@@ -1358,20 +1358,20 @@ References
    elementwise multiplication, and ``%`` for matrix multiplication:
    https://mail.python.org/pipermail/matrix-sig/1995-August/000002.html
 
-.. [#atat-discussion] http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069502.html
+.. [#atat-discussion] http://mail.python.org/pipermail/numpy-discussion/2014-March/069502.html
 
 .. [#associativity-discussions]
-   http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069444.html
-   http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069605.html
+   http://mail.python.org/pipermail/numpy-discussion/2014-March/069444.html
+   http://mail.python.org/pipermail/numpy-discussion/2014-March/069605.html
 
 .. [#oil-industry-versus-right-associativity]
-   http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069610.html
+   http://mail.python.org/pipermail/numpy-discussion/2014-March/069610.html
 
 .. [#numpy-associativity-counts]
-   http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069578.html
+   http://mail.python.org/pipermail/numpy-discussion/2014-March/069578.html
 
 .. [#group-associativity]
-   http://mail.scipy.org/pipermail/numpy-discussion/2014-March/069530.html
+   http://mail.python.org/pipermail/numpy-discussion/2014-March/069530.html
 
 
 Copyright
diff --git a/doc/neps/ufunc-overrides.rst b/doc/neps/ufunc-overrides.rst
index f0e51b90b..480e229c2 100644
--- a/doc/neps/ufunc-overrides.rst
+++ b/doc/neps/ufunc-overrides.rst
@@ -30,7 +30,7 @@ retro-fit NumPy with multi-methods [4]_, which would solve the same
 problem. The mechanism here follows more closely the way Python enables
 classes to override ``__mul__`` and other binary operations.
 
-.. [1] http://docs.scipy.org/doc/numpy/user/basics.subclassing.html
+.. [1] http://docs.python.org/doc/numpy/user/basics.subclassing.html
 .. [2] https://github.com/scipy/scipy/issues/2123
 .. [3] https://github.com/scipy/scipy/issues/1569
 .. [4] http://technicaldiscovery.blogspot.com/2013/07/thoughts-after-scipy-2013-and-specific.html
@@ -111,7 +111,7 @@ However, this behavior is more confusing than useful, and having a
 Adding the ``__numpy_ufunc__`` functionality fixes this and would
 deprecate the other ufunc modifying functions.
 
-.. [5] http://mail.scipy.org/pipermail/numpy-discussion/2011-June/056945.html
+.. [5] http://mail.python.org/pipermail/numpy-discussion/2011-June/056945.html
 
 
 Proposed interface
diff --git a/doc/source/dev/gitwash/git_links.inc b/doc/source/dev/gitwash/git_links.inc
index e80ab2b63..30532da99 100644
--- a/doc/source/dev/gitwash/git_links.inc
+++ b/doc/source/dev/gitwash/git_links.inc
@@ -8,36 +8,6 @@
    __not_case_sensitive__, so only one target definition is needed for
    nipy, NIPY, Nipy, etc...
 
-.. PROJECTNAME placeholders
-.. _PROJECTNAME: http://neuroimaging.scipy.org
-.. _`PROJECTNAME github`: http://github.com/nipy
-.. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel
-
-.. nipy
-.. _nipy: http://nipy.org/nipy
-.. _`nipy github`: http://github.com/nipy/nipy
-.. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
-
-.. ipython
-.. _ipython: http://ipython.scipy.org
-.. _`ipython github`: http://github.com/ipython/ipython
-.. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev
-
-.. dipy
-.. _dipy: http://nipy.org/dipy
-.. _`dipy github`: http://github.com/Garyfallidis/dipy
-.. _`dipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
-
-.. nibabel
-.. _nibabel: http://nipy.org/nibabel
-.. _`nibabel github`: http://github.com/nipy/nibabel
-.. _`nibabel mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
-
-.. marsbar
-.. _marsbar: http://marsbar.sourceforge.net
-.. _`marsbar github`: http://github.com/matthew-brett/marsbar
-.. _`MarsBaR mailing list`: https://lists.sourceforge.net/lists/listinfo/marsbar-users
-
 .. git stuff
 .. _git: http://git-scm.com/
 .. _github: http://github.com
@@ -75,7 +45,7 @@
 .. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git 
 .. _git management: http://kerneltrap.org/Linux/Git_Management
 .. _linux git workflow: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html
-.. _ipython git workflow: http://mail.scipy.org/pipermail/ipython-dev/2010-October/006746.html
+.. _ipython git workflow: http://mail.python.org/pipermail/ipython-dev/2010-October/006746.html
 .. _git parable: http://tom.preston-werner.com/2009/05/19/the-git-parable.html
 .. _git foundation: http://matthew-brett.github.com/pydagogue/foundation.html
 .. _numpy/master: https://github.com/numpy/numpy
diff --git a/doc/source/reference/swig.interface-file.rst b/doc/source/reference/swig.interface-file.rst
index 22b5f757a..6dd74f4ec 100644
--- a/doc/source/reference/swig.interface-file.rst
+++ b/doc/source/reference/swig.interface-file.rst
@@ -1003,7 +1003,7 @@ helpful when you encounter them.
   * Writing typemaps can be a bit nonintuitive.  If you have specific
     questions about writing `SWIG`_ typemaps for NumPy, the
     developers of ``numpy.i`` do monitor the
-    `Numpy-discussion <mailto:Numpy-discussion@scipy.org>`_ and
+    `Numpy-discussion <mailto:Numpy-discussion@python.org>`_ and
     `Swig-user <mailto:Swig-user@lists.sourceforge.net>`_ mail lists.
 
 A Final Note