DOC: cosmits on tutorials and videos

GaelVaroquaux · GaelVaroquaux · commit bae4e4141844 · 2012-05-06T19:59:46.000+02:00
diff --git a/doc/presentations.rst b/doc/presentations.rst
@@ -2,6 +2,11 @@
 Presentations and Tutorials on Scikit-Learn
 ===========================================
 
+For written tutorials, see the :ref:`Tutorial section <tutorial_menu>` of
+the documentation.
+
+.. _videos:
+
 Videos
 ======
 
@@ -11,23 +16,27 @@ Videos
     A three minute video from a very early stage of the scikit, explaining the
     basic idea and approach we are following.
 
-- `Introduction to machine learning with scikit
+- `Introduction to statistical learning with scikit
   learn <http://archive.org/search.php?query=scikit-learn>`_ by
   `Gael Varoquaux`_ at SciPy 2011
-    An extensive tutorial, consisting of four 90 minute sessions. The tutorial covers basics of machine learning,
-    many algorithms and how to apply them using scikit-learn.
+    An extensive tutorial, consisting of four sessions of one hour.
+    The tutorial covers basics of machine learning,
+    many algorithms and how to apply them using scikit-learn. The
+    material corresponding is now in the scikit-learn documentation
+    section :ref:`stat_learn_tut_index`.
 
 - `Statistical Learning for Text Classification with scikit-learn and NLTK
   <http://blip.tv/pycon-us-videos-2009-2010-2011/pycon-2011-statistical-machine-learning-for-text-classification-with-scikit-learn-4898362>`_
   (and `slides <http://www.slideshare.net/ogrisel/statistical-machine-learning-for-text-classification-with-scikitlearn-and-nltk>`_)
   by `Olivier Grisel`_ at PyCon 2011
 
-- `Statistical Learning for Text Classification with scikit-learn and NLTK
-  <http://blip.tv/pycon-us-videos-2009-2010-2011/pycon-2011-statistical-machine-learning-for-text-classification-with-scikit-learn-4898362>`_
-  by `Olivier Grisel`_ at PyCon 2012
-    Thirty minute introduction to text classification. Explains how to use NLTK and scikit-learn to solve real-world text classification
+    Thirty minute introduction to text classification. Explains how to
+    use NLTK and scikit-learn to solve real-world text classification
     tasks and compares against cloud-based solutions.
 
+- `Introduction to Interactive Predictive Analytics in Python with scikit-learn <http://www.youtube.com/watch?v=Zd5dfooZWG4>`_
+  by `Olivier Grisel`_ at PyCon 2012
+    3-hours long introduction to prediction tasks using the scikit-learn.
 
 - `scikit-learn - Machine Learning in Python <http://marakana.com/s/scikit-learn_machine_learning_in_python,1152/index.html>`_
   by `Jake Vanderplas`_ at the 2012 PyData workshop at Google
diff --git a/doc/tutorial/index.rst b/doc/tutorial/index.rst
@@ -7,11 +7,11 @@
 Tutorials: From the bottom up with scikit-learn
 =======================================================================
 
-.. topic:: Beginner Tutorial
+.. topic:: Quick start
 
     In this section, we introduce the `machine learning 
     <http://en.wikipedia.org/wiki/Machine_learning>`_
-    vocabulary that we use through-out `sklearn` and give a 
+    vocabulary that we use through-out `scikit-learn` and give a 
     simple learning example.
 
 
@@ -29,6 +29,9 @@ Tutorials: From the bottom up with scikit-learn
 
 .. toctree::
    :maxdepth: 2
-   
 
    statistical_inference/index.rst
+
+.. note:: **Videos**
+
+    Videos with tutorials can also be found in the :ref:`videos` section.
