Back-merge to dev for doc fixes + cherry-picks

Back-merge these doc fixes: clarify project origin [docs] fix citation bibtex All other changes are spurious commits from cherry-picking.
BVLC · Aug 28, 2014 · c05ba59 · c05ba59
2 parents c01f07a + 9c0b562
commit c05ba59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -66,7 +66,7 @@ Please cite Caffe in your publications if it helps your research:
        Author = {Yangqing Jia},
        Title = { {Caffe}: An Open Source Convolutional Architecture for Fast Feature Embedding},
        Year  = {2013},
-       Howpublished = {\url{http://caffe.berkeleyvision.org/}
+       Howpublished = {\url{http://caffe.berkeleyvision.org/}}
     }
 
 If you do publish a paper where Caffe helped your research, we encourage you to update the [publications wiki](https://github.com/BVLC/caffe/wiki/Publications).

diff --git a/docs/installation.md b/docs/installation.md
@@ -218,7 +218,7 @@ Be sure to set your MATLAB and Python paths in `Makefile.config` first!
 
 *Speed*: for a faster build, compile in parallel by doing `make all -j8` where 8 is the number of parallel threads for compilation (a good choice for the number of threads is the number of cores in your machine).
 
-Now that you have installed Caffe, check out the [MNIST demo](mnist.html) and the pretrained [ImageNet example](imagenet.html).
+Now that you have installed Caffe, check out the [MNIST tutorial](gathered/examples/mnist.html) and the [reference ImageNet model tutorial](gathered/examples/imagenet.html).
 
 ### Compilation using CMake (beta)