[DOC] Fixed even more errors.

diff --git a/doc/doxygen/FAQ.doc b/doc/doxygen/FAQ.doc
index 2bb4121..f70f833 100644 (file)
--- a/doc/doxygen/FAQ.doc
+++ b/doc/doxygen/FAQ.doc
@@ -498,7 +498,7 @@ libsimgrid are expressed directly in the dynamic library, so it's
 quite impossible that you see this message when doing dynamic linking.
 
 If you compile your code statically (and if you use a pthread version
 quite impossible that you see this message when doing dynamic linking.
 
 If you compile your code statically (and if you use a pthread version

-of SimGrid -- see \ref faq_more_processes), you must absolutely
+of SimGrid), you must absolutely

 specify <tt>-lpthread</tt> on the linker command line. As usual, this should
 come after <tt>-lsimgrid</tt> on this command line.
 
 specify <tt>-lpthread</tt> on the linker command line. As usual, this should
 come after <tt>-lsimgrid</tt> on this command line.
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 5b9f960..6696895 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -228,7 +228,7 @@ public:
   /** @brief Update the latency in seconds of current Link */
   virtual void updateLatency(double value, double date=surf_get_clock())=0;
 
   /** @brief Update the latency in seconds of current Link */
   virtual void updateLatency(double value, double date=surf_get_clock())=0;
 

-  /** @brief The sharing policy is a @{link #e_surf_link_sharing_policy_t} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */
+  /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */

   virtual int sharingPolicy();
 
   /** @brief Check if the Link is used */
   virtual int sharingPolicy();
 
   /** @brief Check if the Link is used */

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 133f501..6e4dc9f 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -49,7 +49,7 @@ In this example, the idle consumption is 95 Watts, 93 Watts and 90 Watts in each
 To change the pstate of a given CPU, use the following functions: #MSG_host_get_nb_pstates(), simgrid#s4u#Host#set_pstate(), #MSG_host_get_power_peak_at().
 
 To simulate the energy-related elements, first call the simgrid#energy#sg_energy_plugin_init() before your #MSG_init(),
 To change the pstate of a given CPU, use the following functions: #MSG_host_get_nb_pstates(), simgrid#s4u#Host#set_pstate(), #MSG_host_get_power_peak_at().
 
 To simulate the energy-related elements, first call the simgrid#energy#sg_energy_plugin_init() before your #MSG_init(),

-and then use the following function to retrieve the consumption of a given host: #MSG_host_get_consumed_energy().
+and then use the following function to retrieve the consumption of a given host: MSG_host_get_consumed_energy().

  */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf,
  */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf,

diff --git a/tools/doxygen/index_create.pl b/tools/doxygen/index_create.pl
index 7d23af0..bad8593 100755 (executable)
--- a/tools/doxygen/index_create.pl
+++ b/tools/doxygen/index_create.pl
@@ -66,7 +66,12 @@ foreach $type (qw(define enumeration enumvalue function typedef)) {
            if($type eq "function") {
                print OUTPUT "\t<LI> $name()</LI>\n";
            } else {
            if($type eq "function") {
                print OUTPUT "\t<LI> $name()</LI>\n";
            } else {

-               print OUTPUT "\t<LI> #$name</LI>\n";
+          if($type eq "enumeration") {
+                   print OUTPUT "\t<LI> ".$name."::EType</LI>\n";
+          }
+          else {
+                   print OUTPUT "\t<LI> #$name</LI>\n";
+          }

            }
        }
        print OUTPUT "\n  </ul>\n";
            }
        }
        print OUTPUT "\n  </ul>\n";