removes dead file, sync HTML

vedaldi · Nov 23, 2017 · f182c3b · f182c3b
1 parent 80a9203
commit f182c3b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/doc/instructions.html b/doc/instructions.html
@@ -75,9 +75,9 @@ <h1 id="vgg-convolutional-neural-networks-practical">VGG Convolutional Neural Ne
 <h2 id="getting-started">Getting started</h2>
 <p>Read and understand the <a href="../overview/index.html#installation">requirements and installation instructions</a>. The download links for this practical are:</p>
 <ul>
-<li>Code and data: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2016a.tar.gz">practical-cnn-2016a.tar.gz</a></li>
-<li>Code only: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2016a-code-only.tar.gz">practical-cnn-2016a-code-only.tar.gz</a></li>
-<li>Data only: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2016a-data-only.tar.gz">practical-cnn-2016a-data-only.tar.gz</a></li>
+<li>Code and data: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2017a.tar.gz">practical-cnn-2017a.tar.gz</a></li>
+<li>Code only: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2017a-code-only.tar.gz">practical-cnn-2017a-code-only.tar.gz</a></li>
+<li>Data only: <a href="http://www.robots.ox.ac.uk/~vgg/share/practical-cnn-2017a-data-only.tar.gz">practical-cnn-2017a-data-only.tar.gz</a></li>
 <li><a href="https://github.com/vedaldi/practical-cnn">Git repository</a> (for lab setters and developers)</li>
 </ul>
 <p>After the installation is complete, open and edit the script <code>exercise1.m</code> in the MATLAB editor. The script contains commented code and a description for all steps of this exercise, for <a href="#part1">Part I</a> of this document. You can cut and paste this code into the MATLAB window to run it, and will need to modify it as you go through the session. Other files <code>exercise2.m</code>, <code>exercise3.m</code>, and <code>exercise4.m</code> are given for <a href="#part2">Part II</a>, <a href="#part3">III</a>, and <a href="part4">IV</a>.</p>

diff --git a/extra/prepareLabData.m b/extra/prepareLabData.m
diff --git a/setup.m b/setup.m
@@ -1,6 +1,5 @@
 function setup(varargin)
-
-%run vlfeat/toolbox/vl_setup ;
+% SETUP  Add the required search paths to MATLAB
 run matconvnet/matlab/vl_setupnn ;
 addpath matconvnet/examples ;