X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9efa61bd5941f4d58bb736d74b4348942cadb0a..54c944632710ef84463fdf2de37b8f834e561a25:/doc/FAQ.doc

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index a6e162ec4a..1cdeef6ae3 100644
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -108,28 +108,6 @@ CMake needs some prerequists like :
   \li ccmake for graphical used of CMake
   \li cmake <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
 
-For windows only : 
-  \li Visual C++ 2010 Express <a href="http://www.microsoft.com/express/Downloads/#2010-Visual-CPP">(download page)</a>
-  \li cmake <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
-  \li Set CC, CXX, INCLUDE, LIB and RC to environment variables.
-\verbatim
-SET --> CC	TO --> C:\MicrosoftVisualStudio10\VC\bin\cl
-    --> CXX	   --> C:\MicrosoftVisualStudio10\VC\bin\cl
-    --> INCLUDE	   --> C:\MicrosoftVisualStudio10\VC\include;C:\Program Files\Microsoft SDKs\Windows\v7.OA\Include
-    --> LIB	   --> C:\MicrosoftVisualStudio10\VC\lib;C:\Program Files\Microsoft SDKs\Windows\v7.OA\Lib
-    --> RC	   --> C:\Program Files\Microsoft SDKs\Windows\v7.OA\bin\RC
-\endverbatim
-  \li Add to environment variable "Path" the path where to find nmake executable and some needed files.
-\verbatim
-......
-;C\MicrosoftVisualStudio10\VC\bin
-;C\MicrosoftVisualStudio10\Common7\IDE
-;C:\Program Files\Microsoft SDKs\Windows\v7.OA\bin
-;C:\Program Files\Microsoft SDKs\Windows\v7.OA\Lib
-;C:\Program Files\Microsoft SDKs\Windows\v7.OA\bInclude
-\endverbatim  
-\subsection faq_cmakeoption Cmake options
-
 \subsubsection faq_cmakeoption1 Liste of options
 
 \verbatim
@@ -466,9 +444,14 @@ make install
 \subsubsection faq_cmakeinstall2 From a distrib
 
 \verbatim
-cmake -Dprefix=/home/navarrop/Bureau/install_simgrid ./
-make
-make install
+For version 3.4.1 and 3.4
+	cmake -Dprefix=/home/navarrop/Bureau/install_simgrid ./
+	make
+	make install-simgrid
+Since version 3.5
+	cmake -Dprefix=/home/navarrop/Bureau/install_simgrid ./
+	make
+	make install
 \endverbatim
 
 \subsection faq_cmakehowto How to modified sources files for developers
@@ -2055,8 +2038,8 @@ be relative locally.
 For <em>LINK</em> we have:
 \verbatim
   LINK = {
-    src = SrcHost;
-    dst = DstHost;
+    src = source;
+    dst = destination;
     
     size = bandwidth;
     scale = global;
@@ -2065,7 +2048,7 @@ For <em>LINK</em> we have:
 For the types specified in the <em>edge</em> parameter (such as <em>LINK</em>),
 the configuration must contain two additional parameters: <em>src</em> and
 <em>dst</em> that are used to properly identify which nodes this edge is
-connecting. The values <em>SrcHost</em> and <em>DstHost</em> are always present
+connecting. The values <em>source</em> and <em>destination</em> are always present
 in the SimGrid trace file and should not be changed in the configuration. The
 parameter <em>size</em> for the LINK, in this case, is configured as the
 variable <em>bandwidth</em>, with a <em>global</em> scale. The scale meaning
@@ -2103,8 +2086,8 @@ as configuration for HOST and LINK this:
   };
 
   LINK = {
-    src = SrcHost;
-    dst = DstHost;
+    src = source;
+    dst = destination;
     size = bandwidth;
     scale = global;
 
@@ -2166,8 +2149,8 @@ visualization was generated with the following configuration:
     };
   };
   LINK = {
-    src = SrcHost;
-    dst = DstHost;
+    src = source;
+    dst = destination;
     size = bandwidth;
     scale = global;