Back-merge to dev for slides
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Mon, 8 Sep 2014 10:47:47 +0000 (12:47 +0200)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Mon, 8 Sep 2014 10:47:47 +0000 (12:47 +0200)
1  2 
docs/index.md

diff --cc docs/index.md
@@@ -34,20 -33,16 +34,20 @@@ Consult performance [details](/performa
  
  ## Documentation
  
- - [Introductory slides](http://dl.caffe.berkeleyvision.org/caffe-presentation.pdf)<br>
- Slides about the Caffe architecture, *updated 03/14*.
 -- [DIY Deep Learning for Vision with Caffe](https://docs.google.com/presentation/d/1UeKXVgRvvxg9OUdh_UiC5G71UMscNPlvArsWER41PsU/edit#slide=id.p)<br />
++- [DIY Deep Learning for Vision with Caffe](https://docs.google.com/presentation/d/1UeKXVgRvvxg9OUdh_UiC5G71UMscNPlvArsWER41PsU/edit#slide=id.p)<br>
+ Caffe tutorial slides.
 -- [ACM MM paper](http://ucb-icsi-vision-group.github.io/caffe-paper/caffe.pdf)<br />
 +- [ACM MM paper](http://ucb-icsi-vision-group.github.io/caffe-paper/caffe.pdf)<br>
  A 4-page report for the ACM Multimedia Open Source competition.
 -- [Installation instructions](/installation.html)<br />
 +- [Caffe Tutorial](/tutorial)<br>
 +DIY deep learning with this hands-on tutorial to Caffe.
 +- [Installation instructions](/installation.html)<br>
  Tested on Ubuntu, Red Hat, OS X.
 -* [Pre-trained models](/getting_pretrained_models.html)<br />
 -BVLC provides ready-to-use models for non-commercial use.
 -* [Developing & Contributing](/development.html)<br />
 +* [Model Zoo](/model_zoo.html)<br>
 +BVLC suggests a standard distribution format for Caffe models, and provides trained models.
 +* [Developing & Contributing](/development.html)<br>
  Guidelines for development and contributing to Caffe.
 +* [API Documentation](/doxygen/)<br>
 +Developer documentation automagically generated from code comments.
  
  ### Examples