Updating index page, but not yet removing notebook links

docs/index.rst

@@ -1,22 +1,27 @@
 Vienna Python/Astropy Workshop
 ==============================
 
-These notes are for a Python/Astropy workshop held at the University of
-Vienna by `Thomas Robitaille <http://www.mpia.de/~robitaille>`_ from June
-1st-3rd 2015.
+These notes are for a Astropy workshop held at the Institute of Astronomy of
+the University of
+Cambridge by `Thomas Robitaille <http://www.mpia.de/~robitaille>`_ on the
+28th of April 2016.
 
 .. note:: Please bring your laptop to the workshop!
 
-The purpose of this workshop is to get you started with Python and learn
-about Packages you can use for your research, such as Astropy.
+The purpose of this workshop is to give you an overview of functionality in
+Astropy, and get you started with some simple problems. There is a lot of
+functionality that we cannot cover in this workshop, so I encourage you to
+browse the Astropy `Documentation <http://docs.astropy.org>`_  to get a
+sense of what it can be used for!
 
-Installing Python
------------------
+
+Installing Python and Astropy
+-----------------------------
 
 If you don't already have a Scientific Python Installation, install the
 `Anaconda Python Distribution <https://store.continuum.io/cshop/anaconda/>`_
-(works for MacOS X, Linux, and Windows). I recommend downloading the Python
-3.4 version (you will still be able to set up Python 2 environments if
+(works for MacOS X, Linux, and Windows). We recommend downloading the Python
+3.5 version (you will still be able to set up Python 2 environments if
 needed).
 
 Useful links
@@ -27,56 +32,21 @@ Useful links
 * `Matplotlib <http://www.matplotlib.org>`_
 * `Astropy <http://www.astropy.org>`_
 * More about the `IPython notebook <http://ipython.org/notebook.html>`_
-* UTF-8 error on MacOS X: see `here <http://docs.astropy.org/en/stable/known_issues.html#locale-errors-in-macos-x-and-linux>`__ for how to fix it.
-
-Monday: Getting started with Python
------------------------------------
-
-Download the notebooks from `here <_static/python4vienna_part1.tgz>`__ before starting (Windows users: use `this <_static/python4vienna_part1.zip>`__ instead).
-
-Part 1
-^^^^^^
-
-* `What is Python? <_static/00.%20What%20is%20Python.html>`_
-* `Running Python code <_static/00.%20How%20to%20run%20Python%20code.html>`_
-* `Using the IPython notebook <_static/00.%20Using%20the%20IPython%20notebook.html>`_
-
-Part 2
-^^^^^^
-
-* `Numbers, Strings, and Lists <_static/01.%20Numbers,%20String,%20and%20Lists.html>`_
-* `Booleans, Tuples, and Dictionaries <_static/01.%20Booleans,%20Tuples,%20and%20Dictionaries.html>`_
-* `Control Flow <_static/02.%20Control%20Flow.html>`_
-* `Functions <_static/03.%20Functions.html>`_
-
-Part 3
-^^^^^^
-
-* `Modules <_static/03.%20Modules.html>`_
-* `Introduction to Numpy <_static/04.%20Introduction%20to%20Numpy.html>`_
-* `Introduction to Matplotlib <_static/05.%20Introduction%20to%20Matplotlib.html>`_
+* UTF-8 error on MacOS X: see `http <here://docs.astropy.org/en/stable/known_issues.html#locale-errors-in-macos-x-and-linux>`__ for how to fix it.
 
-You can now find the Exercise Solutions `here <_static/Exercise%20Solutions.html>`__.
+Nootebooks
+----------
 
-Tuesday: Introduction to Astropy
---------------------------------
-
-Download the notebooks from `here <_static/python4vienna_part2.tgz>`__ before starting (Windows users: use `this <_static/python4vienna_part2.zip>`__ instead).
+Download the notebooks from `here <_static/astropy4cambridge.tgz>`__ before starting (Windows users: use `this <_static/astropy4cambridge.zip>`__ instead).
 
 * `Units and Quantities <_static/Astropy%20-%20Unit%20Conversion.html>`_ [`Problem solutions <_static/Astropy%20-%20Unit%20Conversion%20-%20Solutions.html>`_]
 * `Tables <_static/Astropy%20-%20Tables.html>`_ [`Problem solutions <_static/Astropy%20-%20Tables%20-%20Solutions.html>`_]
 * `Celestial Coordinates <_static/Astropy%20-%20Celestial%20Coordinates.html>`_ [`Problem solutions <_static/Astropy%20-%20Celestial%20Coordinates%20-%20Solutions.html>`_]
 * `Handling FITS files <_static/Astropy%20-%20Handling%20FITS%20files.html>`_ [`Problem solutions <_static/Astropy%20-%20Handling%20FITS%20files%20-%20Solutions.html>`_]
 * `Modeling <_static/Astropy%20-%20Modeling.html>`_ [`Problem solutions <_static/Astropy%20-%20Modeling%20-%20Solutions.html>`_]
-
-Wednesday: Advanced Astropy and affiliated packages
----------------------------------------------------
-
-Download the notebooks from `here <_static/python4vienna_part3.tgz>`__ before starting (Windows users: use `this <_static/python4vienna_part3.zip>`__ instead).
-
-* `Handling FITS files <_static/Astropy%20-%20Handling%20FITS%20files.html>`_ [`Problem solutions <_static/Astropy%20-%20Handling%20FITS%20files%20-%20Solutions.html>`_]
 * `WCS Transformations <_static/Astropy%20-%20WCS%20Transformations.html>`_ [`Problem solutions <_static/Astropy%20-%20WCS%20Transformations%20-%20Solutions.html>`_]
 * `Astropy Affiliated Packages: APLpy and WCSAxes <_static/Affiliated%20Package%20-%20APLpy%20and%20WCSAxes.html>`_
+* `Astropy Affiliated Packages: Photutils <_static/Affiliated%20Package%20-%20Photutils.html>`_
 * `Astropy Affiliated Packages: Astroquery <_static/Affiliated%20Package%20-%20Astroquery.html>`_
 * `Astropy Affiliated Packages: Image reprojection <_static/Affiliated%20Package%20-%20Image%20reprojection.html>`_
 
@@ -98,4 +68,10 @@ Astropy help
 * `StackOverflow <http://stackoverflow.com>`_ - use tag #astropy
 * `IRC <http://webchat.freenode.net/?channels=astropy>`_
 * `Twitter <https://twitter.com/astropy>`_
-* `Private feedback <mailto:astropy-feedback@googlegroups.com>`_
+
+
+Feedback
+^^^^^^^^
+
+* `Proposing future features for Astropy <astropy.userecho.com>`_
+* `Private feedback on astropy <mailto:astropy-feedback@googlegroups.com>`_