merge changes: modify GRAS vs. kill GRAS, kill wins

[simgrid.git] / doc / FAQ.doc

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index a3745b1..fe82f4e 100644 (file)
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -1,6 +1,5 @@
 /*! \page FAQ Frequently Asked Questions
 
-\htmlinclude .FAQ.doc.toc
 
 \section faq_simgrid I'm new to SimGrid. I have some questions. Where should I start?
 
@@ -11,7 +10,7 @@ slides</a>, or to these
 <a href="http://graal.ens-lyon.fr/~alegrand/articles/Simgrid-Introduction.pdf">"obsolete" slides</a>)
 may give you some insights on what SimGrid can help you to do and what
 are its limitations. Then you definitely should read the \ref
-MSG_examples. The \ref GRAS_tut can also help you.
+MSG_examples. 
 
 If you are stuck at any point and if this FAQ cannot help you, please drop us a
 mail to the user mailing list: <simgrid-user@lists.gforge.inria.fr>.
@@ -607,7 +606,7 @@ and it breaks the hack we devised to bypass the parser, as explained in
 \ref pf_flexml_bypassing. Indeed, this is not a classical usage of the
 parser, and Will didn't imagine that we may have used (and even documented)
 such a crude usage of FleXML. So, we now have to repair the bypassing
-functionality to use the lastest FleXML version and fix the memory usage in
+functionality to use the latest FleXML version and fix the memory usage in
 SimGrid.
 
 \subsubsection faq_trouble_gras_transport GRAS spits networking error messages