Updated website (automated commit)

Author: minrk

_images/RS_PoweredBy_OCC_logo-2c.png

@@ -51,4 +51,4 @@ See `the installation documentation <http://ipython.org/ipython-doc/stable/insta
 
 The standard Python installation mechanisms (``setup.py``, ``pip`` or ``easy_install``) all work for installing IPython to use in a terminal. Windows users are best off installing `distribute <http://pypi.python.org/pypi/distribute>`_, then running the .exe installer, to create start menu shortcuts.
 
-To use the notebook or the Qt console, it's easiest to install through a package manager, or download a Python distribution such as `Anaconda <https://store.continuum.io/cshop/anaconda>`_ or `EPD <http://www.enthought.com/products/epd.php>`_. Otherwise, you will need to install pyzmq, along with tornado for the notebook, and PyQt4/PySide and pygments for the Qt console.
+To use the notebook or the Qt console, it's easiest to install through a package manager, or download a Python distribution such as `Anaconda <https://store.continuum.io/cshop/anaconda>`_ or `Enthought Canopy <https://www.enthought.com/downloads/>`_. Otherwise, you will need to install pyzmq, along with tornado for the notebook, and PyQt4/PySide and pygments for the Qt console.

_sources/faq.txt

@@ -78,7 +78,7 @@ We have given a number of talks and presentations about IPython:
 ---------
 
 * A `talk <http://ipython.scipy.org/talks/0809_23andme_ipython.pdf>`__ at
-  `23andMe <http://23andme.com>`__ where I spoke about ipython in general, with
+  `23andMe <http://23andme.com>`__ where Fernando spoke about ipython in general, with
   some details about its facilities for distributed computing.
 
 ---------
@@ -135,18 +135,18 @@ We have given a number of talks and presentations about IPython:
 ---------
 
 * Two talks at SciPy'05: one about `parallel computing
-  <http://ipython.scipy.org/moin/About/Presentations?action=AttachFile&do=get&target=ipython_scipy05_parallel.pdf>`__
+  <http://ipython.scipy.org/misc/scipy05_parallel.pdf>`__
   and one about `interactive notebooks
-  <http://ipython.scipy.org/moin/About/Presentations?action=AttachFile&do=get&target=ipython_scipy05_notebook.pdf>`__.
+  <http://ipython.scipy.org/misc/ipython-notebooks-scipy05.pdf>`__.
 
 -----------
   2004 
 -----------
 
-* A `talk <http://ipython.scipy.org/moin/About/Presentations?action=AttachFile&do=get&target=ipython_scipy04.pdf>`__ at SciPy'04.
+* A `talk <http://ipython.scipy.org/misc/ipython_scipy04.pdf>`__ at SciPy'04.
 
 -------
  2003 
 -------
 
-* An `overview of IPython <http://ipython.scipy.org/moin/About/Presentations?action=AttachFile&do=get&target=ipython_scipy03.pdf>`__ at SciPy'03.
+* An `overview of IPython <http://ipython.scipy.org/misc/ipython_scipy03.pdf>`__ at SciPy'03.

_sources/presentation.txt

@@ -17,6 +17,17 @@ In December 2012, IPython was awarded a `$1.15 million grant
 <sloan-grant.html>`_ from the `Alfred P. Sloan Foundation`_ that will fund the
 core team for the 2013-2014 period.
 
+.. image:: _static/RS_PoweredBy_OCC_logo-2c.png
+    :target: http://www.rackspace.com
+    :width: 400px
+
+As of Summer 2013, `Rackspace <http://www.rackspace.com>`_ generously provides
+cloud hosting for the project. This is used for development and the hosting of
+IPython related services, such as the `IPython Notebook Viewer
+<http://nbviewer.ipython.org>`_. We thank Jesse Noller and Kyle Kelley at
+Rackspace for setting up this sponsorship and helping with deployment
+respectively.
+
 
 Contributing
 ============