Changed all references to scipy to numpy

8 files changed, 61 insertions, 61 deletions

diff --git a/numpy/f2py/docs/FAQ.txt b/numpy/f2py/docs/FAQ.txt
index e2ed79445..416560e92 100644
--- a/numpy/f2py/docs/FAQ.txt
+++ b/numpy/f2py/docs/FAQ.txt
@@ -93,30 +93,30 @@ If upgrading from F2PY version 2.3.321 or earlier then remove all f2py
 specific files from ``/path/to/python/bin`` directory before
 running installation command.
 
-Q: How to get/upgrade scipy_distutils when using F2PY from CVS?
+Q: How to get/upgrade numpy_distutils when using F2PY from CVS?
 ---------------------------------------------------------------
 
-To get scipy_distutils from SciPy CVS repository, run
+To get numpy_distutils from SciPy CVS repository, run
 ::
 
   cd cvs/f2py2e/
-  make scipy_distutils
+  make numpy_distutils
 
-This will checkout scipy_distutils to the current directory.
+This will checkout numpy_distutils to the current directory.
 
-You can upgrade scipy_distutils by executing
+You can upgrade numpy_distutils by executing
 ::
 
-  cd cvs/f2py2e/scipy_distutils
+  cd cvs/f2py2e/numpy_distutils
   cvs update -Pd
 
 and install it by executing
 ::
 
-  cd cvs/f2py2e/scipy_distutils
-  python setup_scipy_distutils.py install
+  cd cvs/f2py2e/numpy_distutils
+  python setup_numpy_distutils.py install
 
-In most of the time, f2py2e and scipy_distutils can be upgraded
+In most of the time, f2py2e and numpy_distutils can be upgraded
 independently.
 
 Testing
@@ -210,9 +210,9 @@ See the section `Setting up environment`__ for Cygwin and MinGW.
 
 __ http://cygwin.com/
 __ http://www.mingw.org/
-__ http://cens.ioc.ee/~pearu/scipy/BUILD_WIN32.html#setting-up-environment
+__ http://cens.ioc.ee/~pearu/numpy/BUILD_WIN32.html#setting-up-environment
 
-Install scipy_distutils and F2PY. Win32 installers of these packages
+Install numpy_distutils and F2PY. Win32 installers of these packages
 are provided in `F2PY Download`__ section.
 
 __ http://cens.ioc.ee/projects/f2py2e/#download
@@ -412,14 +412,14 @@ This question may be releavant when using F2PY in Makefiles.  Here
 follows a script demonstrating how to determine which Fortran compiler
 and flags F2PY will use::
 
-  # Using post-0.2.2 scipy_distutils
-  from scipy_distutils.fcompiler import new_fcompiler
+  # Using post-0.2.2 numpy_distutils
+  from numpy_distutils.fcompiler import new_fcompiler
   compiler = new_fcompiler() # or new_fcompiler(compiler='intel')
   compiler.dump_properties()
 
-  # Using pre-0.2.2 scipy_distutils
+  # Using pre-0.2.2 numpy_distutils
   import os
-  from scipy_distutils.command.build_flib import find_fortran_compiler
+  from numpy_distutils.command.build_flib import find_fortran_compiler
   def main():
       fcompiler = os.environ.get('FC_VENDOR')
       fcompiler_exec = os.environ.get('F77')
@@ -513,7 +513,7 @@ __ https://geodoc.uchicago.edu/climatewiki/WrappingBenchmarks
 
 + `Performance Python with Weave`__ by Prabhu Ramachandran.
 
-__ http://www.scipy.org/documentation/weave/weaveperformance.html
+__ http://www.numpy.org/documentation/weave/weaveperformance.html
 
 + `How To Install py-f2py on Mac OSX`__
 
@@ -527,7 +527,7 @@ Q: What projects use F2PY?
 
 + `SciPy: Scientific tools for Python`__
 
-__ http://www.scipy.org/
+__ http://www.numpy.org/
 
 + `The Bolometer Data Analysis Project`__
 
@@ -573,7 +573,7 @@ Here are some comments people have posted to f2py mailing list and c.l.py:
 + Fernando Perez: Anyway, many many thanks for this amazing tool.
 
   I haven't used pyfort, but I can definitely vouch for the amazing quality of 
-  f2py.  And since f2py is actively used by scipy, it won't go unmaintained.  
+  f2py.  And since f2py is actively used by numpy, it won't go unmaintained.  
   It's quite impressive, and very easy to use.
 
 + Kevin Mueller: First off, thanks to those responsible for F2PY; 
diff --git a/numpy/f2py/docs/HISTORY.txt b/numpy/f2py/docs/HISTORY.txt
index 876ab2362..72b683eb0 100644
--- a/numpy/f2py/docs/HISTORY.txt
+++ b/numpy/f2py/docs/HISTORY.txt
@@ -27,7 +27,7 @@ Release 2.46.243
 
 * f2py2e.py
 
-  - Added support for scipy.distutils version 0.4.0.
+  - Added support for numpy.distutils version 0.4.0.
 
 * Documentation
 
@@ -111,8 +111,8 @@ Release 2.45.241_1926
 * setup.py
 
   - Clean up.
-  - Disabled ``need_scipy_distutils`` function. From now on it is assumed
-    that proper version of ``scipy_distutils`` is already installed.
+  - Disabled ``need_numpy_distutils`` function. From now on it is assumed
+    that proper version of ``numpy_distutils`` is already installed.
 
 * capi_maps.py
 
@@ -168,7 +168,7 @@ Release 2.43.239_1831
 
   - Intoduced ``--help-link`` and ``--link-<resource>``
     switches to link generated extension module with system
-    ``<resource>`` as defined by scipy_distutils/system_info.py.
+    ``<resource>`` as defined by numpy_distutils/system_info.py.
 
 * fortranobject.c
 
@@ -356,7 +356,7 @@ Release 2.39.235_1644
 * docs
 
   - Initial f2py manpage file f2py.1.
-  - Updated usersguide and other docs when using scipy_distutils 0.2.2
+  - Updated usersguide and other docs when using numpy_distutils 0.2.2
     and up.
 
 * capi_maps.py
@@ -383,7 +383,7 @@ Release 2.39.235_1644
 
 * diagnose.py
 
-  - Updated for scipy_distutils 0.2.2 and up.
+  - Updated for numpy_distutils 0.2.2 and up.
   - Added numarray support to diagnose.
 
 * fortranobject.c
@@ -394,7 +394,7 @@ Release 2.39.235_1644
 
 * f2py2e.py
 
-  - Applying new hooks for scipy_distutils 0.2.2 and up, keeping
+  - Applying new hooks for numpy_distutils 0.2.2 and up, keeping
     backward compatibility with depreciation messages.
   - Using always os.system on non-posix platforms in f2py2e.compile
     function.
@@ -410,8 +410,8 @@ Release 2.39.235_1644
 * setup.py
 
   - Installing f2py.py instead of f2py.bat under NT.   
-  - Introduced ``--with-scipy_distutils`` that is useful when making
-    f2py tar-ball with scipy_distutils included.
+  - Introduced ``--with-numpy_distutils`` that is useful when making
+    f2py tar-ball with numpy_distutils included.
 
 Release 2.37.233-1545
 =====================
@@ -466,7 +466,7 @@ Release 2.35.229-1505
 
 * setup.py
 
-  - Updated the CVS location of scipy_distutils.
+  - Updated the CVS location of numpy_distutils.
 
 * auxfuncs.py
 
@@ -566,7 +566,7 @@ Public Release 2.32.225-1419
 
 * setup.py
 
-  - Install scipy_distutils only if it is missing or is too old
+  - Install numpy_distutils only if it is missing or is too old
     for f2py.
 
 * f90modrules.py
@@ -667,7 +667,7 @@ Public Release 2.32.225-1419
   - Introduced dummy routine feature.
   - F77 and F90 wrapper subroutines (if any) as saved to different
     files, <modulename>-f2pywrappers.f and <modulename>-f2pywrappers2.f90,
-    respectively. Therefore, wrapping F90 requires scipy_distutils >= 
+    respectively. Therefore, wrapping F90 requires numpy_distutils >= 
     0.2.0_alpha_2.229.
   - Fixed compiler warnings about meaningless ``const void (*f2py_func)(..)``.
   - Improved error messages for ``*_from_pyobj``.
@@ -739,7 +739,7 @@ Older Releases
  *** Cleaned up the output of 'f2py -h': removed obsolete items,
     added build_flib options section. 
  *** Added --help-compiler option: it lists available Fortran compilers
-    as detected by scipy_distutils/command/build_flib.py. This option
+    as detected by numpy_distutils/command/build_flib.py. This option
     is available only with -c option.
 
 
@@ -789,7 +789,7 @@ Older Releases
 
 ::
 
- *** Updated f2py for the latest scipy_distutils.
+ *** Updated f2py for the latest numpy_distutils.
  *** A nasty bug with multi-dimensional Fortran arrays is fixed
     (intent(out) arrays had wrong shapes). (Thanks to Eric for 
     pointing out this bug).
@@ -801,7 +801,7 @@ Older Releases
 
 ::
 
- *** Updated f2py for the latest scipy_distutils.
+ *** Updated f2py for the latest numpy_distutils.
  *** Fixed raise error when f2py missed -m flag.
  *** Script name `f2py' now depends on the name of python executable.
     For example, `python2.2 setup.py install' will create a f2py
@@ -924,7 +924,7 @@ Older Releases
  *** Fixed -c process. Removed pyf_extensions function and pyf_file class.
  *** Reorganized setup.py. It generates f2py or f2py.bat scripts
     depending on the OS and the location of the python executable.
- *** Started to use update_version from scipy_distutils that makes
+ *** Started to use update_version from numpy_distutils that makes
     f2py startup faster. As a side effect, the version number system
     changed.
  *** Introduced test-site/test_f2py2e.py script that runs all
@@ -933,20 +933,20 @@ Older Releases
     when run_main is called several times.
  *** Added 'import Numeric' to C/API init<module> function.
  *** Fixed f2py.bat in setup.py.
- *** Switched over to scipy_distutils and dropped fortran_support.
+ *** Switched over to numpy_distutils and dropped fortran_support.
  *** On Windows create f2py.bat file.
  *** Introduced -c option: read fortran or pyf files, construct extension
     modules, build, and save them to current directory. 
     In one word: do-it-all-in-one-call.
  *** Introduced pyf_extensions(sources,f2py_opts) function. It simplifies
     the extension building process considerably. Only for internal use.
- *** Converted tests to use scipy_distutils in order to improve portability:
+ *** Converted tests to use numpy_distutils in order to improve portability:
     a,b,c
  *** f2py2e.run_main() returns a pyf_file class instance containing
     information about f2py generated files.
  *** Introduced `--build-dir <dirname>' command line option.
  *** Fixed setup.py for bdist_rpm command.
- *** Added --scipy-setup command line option.
+ *** Added --numpy-setup command line option.
  *** Fixed crackfortran that did not recognized capitalized type
     specification with --no-lower flag.
  *** `-h stdout' writes signature to stdout.
diff --git a/numpy/f2py/docs/OLDNEWS.txt b/numpy/f2py/docs/OLDNEWS.txt
index b21215464..401d2dcee 100644
--- a/numpy/f2py/docs/OLDNEWS.txt
+++ b/numpy/f2py/docs/OLDNEWS.txt
@@ -19,7 +19,7 @@
 
   February 24, 2004
     Latest F2PY release (version 2.39.235-1644).
-    Support for scipy_distutils 0.2.2 and up (e.g. compiler flags can be
+    Support for numpy_distutils 0.2.2 and up (e.g. compiler flags can be
     changed via f2py command line options). Implemented support for
     character arrays and arrays of strings (e.g. ``character*(*) a(m,..)``).
     *Important bug fixes regarding complex arguments, upgrading is
diff --git a/numpy/f2py/docs/README.txt b/numpy/f2py/docs/README.txt
index fc7149645..bc1aa6943 100644
--- a/numpy/f2py/docs/README.txt
+++ b/numpy/f2py/docs/README.txt
@@ -82,7 +82,7 @@ facilitate:
   multi-dimensional Fortran and Numerical Python (i.e. C) arrays.
 
 In addition, F2PY can build the generated extension modules to shared
-libraries with one command. F2PY uses the ``scipy_distutils`` module
+libraries with one command. F2PY uses the ``numpy_distutils`` module
 from SciPy_ that supports number of major Fortran compilers.
 
 ..
@@ -196,17 +196,17 @@ and/or Fortran compilers installed.
  Download
 ==========
 
-You can download the sources for the latest F2PY and scipy_distutils
+You can download the sources for the latest F2PY and numpy_distutils
 releases as:
 
 * `2.x`__/`F2PY-2-latest.tar.gz`__
-* `2.x`__/`scipy_distutils-latest.tar.gz`__
+* `2.x`__/`numpy_distutils-latest.tar.gz`__
 
 Windows users might be interested in Win32 installer for F2PY and
 Scipy_distutils (these installers are built using Python 2.3):
 
 * `2.x`__/`F2PY-2-latest.win32.exe`__
-* `2.x`__/`scipy_distutils-latest.win32.exe`__
+* `2.x`__/`numpy_distutils-latest.win32.exe`__
 
 Older releases are also available in the directories
 `rel-0.x`__, `rel-1.x`__, `rel-2.x`__, `rel-3.x`__, `rel-4.x`__, `rel-5.x`__,
@@ -215,11 +215,11 @@ if you need them.
 .. __: 2.x/
 .. __: 2.x/F2PY-2-latest.tar.gz
 .. __: 2.x/
-.. __: 2.x/scipy_distutils-latest.tar.gz
+.. __: 2.x/numpy_distutils-latest.tar.gz
 .. __: 2.x/
 .. __: 2.x/F2PY-2-latest.win32.exe
 .. __: 2.x/
-.. __: 2.x/scipy_distutils-latest.win32.exe
+.. __: 2.x/numpy_distutils-latest.win32.exe
 .. __: rel-0.x
 .. __: rel-1.x
 .. __: rel-2.x
@@ -250,7 +250,7 @@ See also Installation__ section in `F2PY FAQ`_.
 
 .. __: FAQ.html#installation
 
-Similarly, to install ``scipy_distutils``, unpack its tar-ball and run::
+Similarly, to install ``numpy_distutils``, unpack its tar-ball and run::
 
   python setup.py install
 
@@ -433,7 +433,7 @@ __ http://jrfonseca.dyndns.org/debian/
 
 .. _CVS: http://www.cvshome.org/
 .. _Python: http://www.python.org/
-.. _SciPy: http://www.scipy.org/
+.. _SciPy: http://www.numpy.org/
 .. _NumPy: http://www.numpy.org/
 .. _Numarray: http://www.stsci.edu/resources/software_hardware/numarray
 .. _docutils: http://docutils.sourceforge.net/
diff --git a/numpy/f2py/docs/TESTING.txt b/numpy/f2py/docs/TESTING.txt
index feae18dc6..d90521175 100644
--- a/numpy/f2py/docs/TESTING.txt
+++ b/numpy/f2py/docs/TESTING.txt
@@ -98,7 +98,7 @@ scripts:
     f2py -c --help-fcompiler
 
   to find out what compilers are available (or more precisely, which
-  ones are recognized by ``scipy_distutils``).
+  ones are recognized by ``numpy_distutils``).
 
 Reporting failures
 ------------------
diff --git a/numpy/f2py/docs/THANKS.txt b/numpy/f2py/docs/THANKS.txt
index cbaa083fc..737e17134 100644
--- a/numpy/f2py/docs/THANKS.txt
+++ b/numpy/f2py/docs/THANKS.txt
@@ -43,7 +43,7 @@ out and let me know, I'll add your name.)
 Special thanks are due to ...
 
 Eric Jones - he and Travis O. are responsible for starting the
-scipy_distutils project that allowed to move most of the platform and
+numpy_distutils project that allowed to move most of the platform and
 compiler specific codes out from F2PY. This simplified maintaining the
 F2PY project considerably.
 
diff --git a/numpy/f2py/docs/usersguide/index.txt b/numpy/f2py/docs/usersguide/index.txt
index 9fafb99fb..5a8d12c68 100644
--- a/numpy/f2py/docs/usersguide/index.txt
+++ b/numpy/f2py/docs/usersguide/index.txt
@@ -56,7 +56,7 @@ following steps:
 
 * F2PY compiles all sources and builds an extension module containing
   the wrappers. In building extension modules, F2PY uses
-  ``scipy_distutils`` that supports a number of Fortran 77/90/95
+  ``numpy_distutils`` that supports a number of Fortran 77/90/95
   compilers, including Gnu, Intel,
   Sun Fortre, SGI MIPSpro, Absoft, NAG, Compaq etc. compilers.
 
@@ -1458,7 +1458,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches:
     Search include files from given directories.
 
   ``--help-link [<list of resources names>]`` 
-    List system resources found by ``scipy_distutils/system_info.py``.
+    List system resources found by ``numpy_distutils/system_info.py``.
     For example, try ``f2py --help-link lapack_opt``.
 
 3. To build an extension module, use
@@ -1529,7 +1529,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches:
   ``link-<resource>``
 
     Link extension module with <resource> as defined by
-    ``scipy_distutils/system_info.py``. E.g. to link with optimized
+    ``numpy_distutils/system_info.py``. E.g. to link with optimized
     LAPACK libraries (vecLib on MacOSX, ATLAS elsewhere), use
     ``--link-lapack_opt``. See also ``--help-link`` switch.
 
@@ -1612,10 +1612,10 @@ The following functions are provided by the ``f2py2e`` module:
     :literal:
 
 ==========================
-Using ``scipy_distutils``
+Using ``numpy_distutils``
 ==========================
 
-``scipy_distutils`` is part of the SciPy_ project and aims to extend
+``numpy_distutils`` is part of the SciPy_ project and aims to extend
 standard Python ``distutils`` to deal with Fortran sources and F2PY
 signature files, e.g. compile Fortran sources, call F2PY to construct
 extension modules, etc. 
@@ -1638,7 +1638,7 @@ extension modules, etc.
 
   __ setup_example.py
 
-``scipy_distutils`` extends ``distutils`` with the following features:
+``numpy_distutils`` extends ``distutils`` with the following features:
 
 * ``Extension`` class argument ``sources`` may contain Fortran source
   files. In addition, the list ``sources`` may contain at most one
@@ -1654,7 +1654,7 @@ extension modules, etc.
   Additional options to F2PY process can be given using ``Extension``
   class argument ``f2py_options``.
 
-``scipy_distutils`` 0.2.2 and up
+``numpy_distutils`` 0.2.2 and up
 ================================
 
 * The following new ``distutils`` commands are defined:
@@ -1682,14 +1682,14 @@ extension modules, etc.
  
     absoft sun mips intel intelv intele intelev nag compaq compaqv gnu vast pg hpux
 
-  See ``scipy_distutils/fcompiler.py`` for up-to-date list of
+  See ``numpy_distutils/fcompiler.py`` for up-to-date list of
   supported compilers or run
 
   ::
 
      f2py -c --help-fcompiler
 
-``scipy_distutils`` pre 0.2.2
+``numpy_distutils`` pre 0.2.2
 =============================
 
 * The following new ``distutils`` commands are defined:
@@ -1715,7 +1715,7 @@ extension modules, etc.
  
     Absoft Sun SGI Intel Itanium NAG Compaq Digital Gnu VAST PG
 
-  See ``scipy_distutils/command/build_flib.py`` for up-to-date list of
+  See ``numpy_distutils/command/build_flib.py`` for up-to-date list of
   supported compilers.
 
 ======================
@@ -1769,4 +1769,4 @@ In Python:
 .. _F2PY: http://cens.ioc.ee/projects/f2py2e/
 .. _Python: http://www.python.org/
 .. _NumPy: http://www.numpy.org/
-.. _SciPy: http://www.scipy.org/
+.. _SciPy: http://www.numpy.org/
diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py
index a7d27403a..e5f5e8441 100644
--- a/numpy/f2py/docs/usersguide/setup_example.py
+++ b/numpy/f2py/docs/usersguide/setup_example.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # File: setup_example.py
 
-from scipy_distutils.core import Extension
+from numpy_distutils.core import Extension
 
 ext1 = Extension(name = 'scalar',
                  sources = ['scalar.f'])
@@ -9,7 +9,7 @@ ext2 = Extension(name = 'fib2',
                  sources = ['fib2.pyf','fib1.f'])
 
 if __name__ == "__main__":
-    from scipy_distutils.core import setup
+    from numpy_distutils.core import setup
     setup(name = 'f2py_example',
           description       = "F2PY Users Guide examples",
           author            = "Pearu Peterson",