Ok, I forgot most of the examples in one of my previous commit. Repaired.

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index ba76e58..0bfdd0f 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -587,6 +587,7 @@ set(USER_GUIDE_SOURCES
   doc/user_guide/doxygen/bindings.doc
   doc/user_guide/doxygen/options.doc
   doc/user_guide/doxygen/use.doc
+  doc/user_guide/doxygen/examples.doc
   doc/user_guide/doxygen/tracing.doc
   doc/user_guide/doxygen/pls.doc
   doc/user_guide/doxygen/index.doc

diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake
index 124fdd2..c3363e3 100644 (file)
--- a/buildtools/Cmake/GenerateUserGuide.cmake
+++ b/buildtools/Cmake/GenerateUserGuide.cmake
@@ -29,13 +29,6 @@ if(FIG2DEV_PATH)
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen
     )
 
-  ADD_CUSTOM_COMMAND(TARGET user_guide
-    DEPENDS ${source_doxygen}
-    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/user_guide/logcategories.doc
-    COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/logcategories.doc
-    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
-    )
-
   foreach(file ${DOC_FIGS})
     string(REPLACE ".fig" ".png" tmp_file ${file})
     string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" tmp_file ${tmp_file})

diff --git a/doc/user_guide/doxygen/UserGuideDoxyfile.in b/doc/user_guide/doxygen/UserGuideDoxyfile.in
index 9051a4f..7927828 100644 (file)
--- a/doc/user_guide/doxygen/UserGuideDoxyfile.in
+++ b/doc/user_guide/doxygen/UserGuideDoxyfile.in
@@ -660,7 +660,8 @@ WARN_LOGFILE           =
 
 INPUT                  = index.doc \
                          install.doc \
-                         use.doc \            
+                         use.doc \   
+                         examples.doc \            
                          options.doc \
                          platform.doc \
                          tracing.doc \

diff --git a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
index e44aa5e..0d81217 100644 (file)
--- a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
+++ b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
@@ -4,7 +4,6 @@
     <tab type="pages" visible="no" title="Table Of Content" intro="Complete pages list">
       <tab type="pages" visible="yes" title="Table Of Content" intro="Complete pages list"/>
     </tab>
-
     <tab type="namespaces" visible="no" title="">
       <tab type="namespaces" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>
@@ -19,7 +18,9 @@
       <tab type="files" visible="yes" title="" intro=""/>
       <tab type="globals" visible="yes" title="" intro=""/>
     </tab>
-
+    <tab type="modules" visible="no" title="Examples" intro="">
+      <tab type="modules" visible="yes" title="Examples" intro="Here you can find additional examples"/>
+    </tab>     
     <tab type="user" visible="yes" url="../../doc/index.html" title="Home"/>
     <tab type="user" url="../../ref_guide/html/index.html" title="Reference Manual"/>
     <tab type="mainpage" visible="no" title="User Guide"/>

diff --git a/doc/user_guide/doxygen/install.doc b/doc/user_guide/doxygen/install.doc
index 5048ab0..9f34aba 100644 (file)
--- a/doc/user_guide/doxygen/install.doc
+++ b/doc/user_guide/doxygen/install.doc
@@ -1,4 +1,4 @@
-/*! \addtogroup SimGrid_install
+/*! 
 \page install Installing Simgrid
 
 \section install_cmake Installing the SimGrid library

diff --git a/doc/user_guide/doxygen/use.doc b/doc/user_guide/doxygen/use.doc
index b612461..4476e19 100644 (file)
--- a/doc/user_guide/doxygen/use.doc
+++ b/doc/user_guide/doxygen/use.doc
@@ -217,8 +217,6 @@ This initializes MSG, runs a simulation, and free all data-structures created by
 
 \include msg/small_platform.xml
 
-
-
 \section using_gras Using GRAS
 
 Here are some examples on how to use GRAS.