From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 25 Apr 2012 09:39:07 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_7~63^2~15
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e309683cde8cec6a08da434e7f08584b6a3ff5f8?hp=20309a4613d31aeb742acb0d3c137fb9e3a33b0f

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/doc/use.doc b/doc/use.doc
index cb1cf02365..b32b002b43 100644
--- a/doc/use.doc
+++ b/doc/use.doc
@@ -6,7 +6,12 @@ If you don't know were to look to start with, you should probably have
 a look at the following presentation first to get the basic concepts.
 Afterward, you probably want to proceed to the \ref MSG_API. Of
 course, if you're curious or if you know what you want, you may prefer
-to go to \ref SMPI_API, or even \ref GRAS_API.
+to go to \ref SMPI_API, or even \ref GRAS_API. 
+
+The scientific bases of the SimGrid project are presented in a 3 ou 4
+hours-long tutorial. It can be found at the following locations.
+ - https://gforge.inria.fr/plugins/scmgit/cgi-bin/gitweb.cgi?p=simgrid/propaganda.git;a=blob_plain;f=tutorial/simgrid-tutorial.pdf;hb=HEAD
+ - http://webloria.loria.fr/~quinson/blog/2010/0628/Tutorial_at_HPCS/
 
 \latexonly
 \includepdf[nup=2x4,pages=1-]{../webcruft/simgrid-101.pdf}