From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 9 Jan 2012 15:11:11 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: exp_20120216~177
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/06fa9a32fb59c32c0d40ed6caf4af776347e0ed4?hp=4d470ade00f7a30a8ed5a9add5d6a7f37683cba6

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

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index 583e80dfdd..010990b204 100644
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -464,7 +464,7 @@ released a very comparable tool, and called it GridG.
 \subsubsection faq_SURF_multicore Modeling multi-core resources 
 
 Since version 3.6 of simgrid we can specify the core number of a resource.
-To use this feature use tag 'host' with 'core' parameter.
+To use this feature use tag 'host' with 'core' attribute. 
 \verbatim
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
@@ -475,6 +475,13 @@ To use this feature use tag 'host' with 'core' parameter.
 </platform>
 \endverbatim
 
+The specified computing power will be available to up to 6 sequential
+tasks without sharing. If more tasks are placed on this host, the
+resource will be shared accordingly. For example, if you schedule 12
+tasks on the host, each will get half of the computing power. Please
+note that although sound, this model were never scientifically
+assessed. Please keep this fact in mind when using it.
+
 \subsubsection faq_SURF_dynamic Modeling dynamic resource availability 
 
 A nice feature of SimGrid is that it enables you to seamlessly have