Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 19 Apr 2011 15:59:42 +0000 (17:59 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 19 Apr 2011 15:59:42 +0000 (17:59 +0200)
doc/Doxyfile.in
doc/contrib.doc
doc/module-msg.doc
src/xbt/config.c

index 2a07cd3..255096d 100644 (file)
@@ -630,6 +630,7 @@ INPUT                  = index.doc \
                          gtut-main.doc \
                          gtut-introduction.doc \
                          gtut-tour.doc \
+                         gtut-tour-00-install.doc \
                          gtut-tour-01-bones.doc \
                          gtut-tour-02-simple.doc \
                          gtut-tour-03-args.doc \
@@ -649,7 +650,6 @@ INPUT                  = index.doc \
                          gtut-tour-16-exchangecb.doc \
                          gtut-howto.doc \
                          gtut-howto-design.doc \
-                         @top_srcdir@/doc/logcategories.doc \
                          @top_srcdir@/include/ \
                          @top_srcdir@/include/msg \
                          @top_srcdir@/include/gras \
index 60ec6ee..e85ae94 100644 (file)
@@ -68,7 +68,7 @@ This program simulates the behavior of a batch scheduler managing a
 cluster. 
 
 This program is maintained by Jean-Sebastien Gay
-(Jean-Sebastien.Gay::ens-lyon.fr), and is part of the SimGrid SVN
+(Jean-Sebastien.Gay at ens-lyon.fr), and is part of the SimGrid SVN
 (directory contrib/Simbatch).
 
 
index d05ddb5..7c7eec6 100644 (file)
        - \ref MSG_ext_ms_platform
        
        
-      \dontinclude lua/master_slave.lua
+      \dontinclude lua/masterslave/master_slave.lua
       
       \section MSG_ext_ms_code_lua Code of the application
       
        - \ref MSG_ext_ms_core_lua
        
        
-      \dontinclude lua/master_slave_bypass.lua
+      \dontinclude lua/console/master_slave_bypass.lua
       
       \section MSG_ext_ms_code_lua Code of the application
       
index a5207db..b71e69c 100644 (file)
@@ -292,7 +292,7 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
  * Each of them must use the following syntax: \<name\>:\<min nb\>_to_\<max nb\>_\<type\>
  * with type being one of  'string','int', 'peer' or 'double'.
  *
- * @fixme: this does not allow to set the description
+ * FIXME: this does not allow to set the description
  */
 
 void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)