6 files changed, 87 insertions, 17 deletions

diff --git a/doc/numpy.scipy.org/source/conf.py b/doc/numpy.scipy.org/source/conf.py
index a71b12dcc..4dbd8f301 100644
--- a/doc/numpy.scipy.org/source/conf.py
+++ b/doc/numpy.scipy.org/source/conf.py
@@ -103,7 +103,7 @@ html_theme_path = ["../theme"]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "SciPy.org"
+html_title = "numpy.scipy.org"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -120,7 +120,7 @@ html_title = "SciPy.org"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -147,7 +147,7 @@ html_static_path = ['_static']
 #html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #html_show_sphinx = True
diff --git a/doc/numpy.scipy.org/source/index.rst b/doc/numpy.scipy.org/source/index.rst
index 24e50f56a..f0dc92f61 100644
--- a/doc/numpy.scipy.org/source/index.rst
+++ b/doc/numpy.scipy.org/source/index.rst
@@ -1,12 +1,31 @@
-Contents:
+NumPy is the fundamental package needed for scientific computing with Python.  It contains among other things:
 
-.. toctree::
-   :maxdepth: 2
+- a powerful N-dimensional array object
+- sophisticated (broadcasting) functions
+- tools for integrating C/C++ and Fortran code
+- useful linear algebra, Fourier transform, and random number capabilities. 
 
-Indices and tables
-==================
+Besides its obvious scientific uses, NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases.
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
+Getting Started
+---------------
 
+- `Getting Numpy <http://www.scipy.org/Download>`_
+- `Installing NumPy and SciPy <http://www.scipy.org/Installing_SciPy>`_
+- `NumPy Tutorial <http://www.scipy.org/Tentative_NumPy_Tutorial>`_
+- `NumPy for MATLAB© Users <http://www.scipy.org/NumPy_for_Matlab_Users>`_
+- `NumPy functions by category <http://www.scipy.org/Numpy_Functions_by_Category>`_
+- `NumPy Mailing List <http://www.scipy.org/Mailing_Lists>`_
+
+Documentation
+-------------
+
+The full documentation for both NumPy and SciPy can be found at the `NumPy and SciPy documentation page <http://docs.scipy.org/doc/>`_
+
+More Information
+----------------
+
+- `NumPy Sourceforge Home Page <http://sourceforge.net/projects/numpy/>`_
+- `SciPy Home Page <http://www.scipy.org/>`_
+- `Interfacing with compiled code <http://www.scipy.org/Topical_Software#head-7153b42ac4ea517c7d99ec4f4453555b2302a1f8>`_
+- :doc:`Older python array packages </old_array_packages>`
\ No newline at end of file
diff --git a/doc/numpy.scipy.org/source/old_array_packages.rst b/doc/numpy.scipy.org/source/old_array_packages.rst
new file mode 100644
index 000000000..814083ed6
--- /dev/null
+++ b/doc/numpy.scipy.org/source/old_array_packages.rst
@@ -0,0 +1,40 @@
+====================
+Older Array Packages
+====================
+
+It may take months for the large code base that uses Numeric and/or Numarray 
+to transition to the new NumPy system.  Links to the older packages are 
+provided here.  New users should start out with NumPy.
+
+Much of the documentation for Numeric and Numarray is applicable to the NumPy package.  However, there are `significant feature improvements <http://numpy.scipy.org/new_features.html>`_.  A complete guide to the new system has been written by the primary developer, Travis Oliphant. It is now in the public domain.  Other Documentation is available at `the scipy website <http://www.scipy.org/>`_ and in the docstrings (which can be extracted using pydoc). Free Documentation for Numeric (most of which is still valid) is `here <http://numpy.scipy.org/numpydoc/numdoc.htm>`_ or as a `pdf <http://numpy.scipy.org/numpy.pdf>`_ file.   Obviously you should replace references to Numeric in that document with numpy (i.e. instead of "import Numeric", use "import numpy").  
+
+Upgrading from historical implementations
+=========================================
+
+NumPy derives from the old Numeric code base and can be used as a replacement for Numeric.   It also adds the features introduced by Numarray and can also be used to replace Numarray.  
+
+Numeric users should find the transition relatively easy (although not without some effort).  There is a module (numpy.oldnumeric.alter_code1) that can makemost of the necessary changes to your Python code that used Numeric to work with NumPy's Numeric compatibility module. 
+
+Users of numarray can also transition their code using a similar module (numpy.numarray.alter_code1) and the numpy.numarray compatibility layer. 
+
+C-code written to either package can be easily ported to NumPy using "numpy/oldnumeric.h" and "numpy/libnumarray.h" for the Numeric C-API and the Numarray C-API respectively. `Sourceforge download site <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`_
+
+For about 6 months at the end of 2005, the new package was called SciPy Core (not to be confused with the full SciPy package which remains a `separate <http://www.scipy.org/>`_ package), and so you will occasionally see references to SciPy Core floating around.  It was decided in January 2006 to go with the historical name of NumPy for the new package.  Realize that NumPy (module name numpy) is the new name.   Because of the name-change, there were a lot of dicussions that took place on scipy-dev@scipy.org and scipy-user@scipy.org.  If you have a question about the new system, you may wish to run a search on those mailing lists as well as the main NumPy list (numpy-discussion@lists.sourceforge.net)
+
+Numeric (version 24.2)
+======================
+
+Numeric was the first array object built for Python.  It has been quite successful and is used in a wide variety of settings and applications.   Maintenance has ceased for Numeric, and users should transisition to NumPy as quickly as possible.   There is a module called numpy.oldnumeric.alter_code1 in NumPy that can make the transition to NumPy easier (it will automatically perform the search-and-replace style changes that need to be made to python code that uses Numeric to make it work with NumPy). 
+
+Documentation for Numeric is at http://numpy.scipy.org/numpydoc/numdoc.htm> or as a `pdf <http://numpy.scipy.org/numpy.pdf>`_ file `Sourceforge Numeric Download Page <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=1351>`_
+
+Numarray
+========
+
+Numarray is another implementation of an array object for Python written after 
+Numeric and before NumPy. Sponsors of numarray have indicated they will be 
+moving to NumPy as soon as is feasible for them so that eventually numarray 
+will be phased out (probably sometime in 2007). This project shares some of 
+the resources with the Numeric sourceforge site but maintains its own web page
+at http://www.stsci.edu/resources/software_hardware/numarray
+`Sourceforge Numarray Download Page <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=32367>`_
\ No newline at end of file
diff --git a/doc/numpy.scipy.org/theme/scipy/layout.html b/doc/numpy.scipy.org/theme/scipy/layout.html
index e8f4dac3c..927088ce5 100644
--- a/doc/numpy.scipy.org/theme/scipy/layout.html
+++ b/doc/numpy.scipy.org/theme/scipy/layout.html
@@ -1,18 +1,16 @@
 {% extends "sphinxdoc/layout.html" %}
 
 {% block rootrellink %}
-        <li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
-        <li><a href="{{ pathto('search') }}">search</a>|&nbsp;</li>
-       <li><a href="{{ pathto('contents') }}">documentation </a> &raquo;</li>
 {% endblock %}
 
 {% block relbar1 %}
 <div class="top-logo-header">
-<a href="{{ pathto('index') }}"><img src="{{ pathto("_static/logo.gif", 1) }}" border="0" alt="sampledoc"/></a>
+<a href="{{ pathto('index') }}"><img src="{{ pathto("_static/numpy_logo.png", 1) }}" border="0" alt="NumPy Homepage"/></a>
 </div>
-{{ super() }}
 {% endblock %}
 
+{% block relbar2 %}{% endblock %}
+
 {# put the sidebar before the body #}
-{% block sidebar1 %}{{ sidebar() }}{% endblock %}
+{% block sidebar1 %}{% endblock %}
 {% block sidebar2 %}{% endblock %}
diff --git a/doc/numpy.scipy.org/theme/scipy/static/numpy_logo.png b/doc/numpy.scipy.org/theme/scipy/static/numpy_logo.png
new file mode 100644
index 000000000..5ed48c094
--- /dev/null
+++ b/doc/numpy.scipy.org/theme/scipy/static/numpy_logo.png
diff --git a/doc/numpy.scipy.org/theme/scipy/static/scipy.css b/doc/numpy.scipy.org/theme/scipy/static/scipy.css
index bcc8e0ec1..377c45955 100644
--- a/doc/numpy.scipy.org/theme/scipy/static/scipy.css
+++ b/doc/numpy.scipy.org/theme/scipy/static/scipy.css
@@ -4,6 +4,15 @@
  * Spacing fixes
  */
 
+
+div.body {
+	width: 90%;
+}
+
+div.bodywrapper {
+  width: 100%;
+}
+
 div.body p, div.body dd, div.body li {
   line-height: 125%;
 }
@@ -77,6 +86,10 @@ body {
   border: none;
 }
 
+div.sphinxsidebar {
+  display: none;
+}
+
 div.sphinxsidebar h3 {
   color: rgb(0,102,204);
 }