documentation cleanups

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index e3c1d9f..b5f7607 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -686,6 +686,7 @@ INPUT                  = @CMAKE_HOME_DIRECTORY@/doc/doxygen/index.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/module-trace.doc \
                          @CMAKE_BINARY_DIR@/doc/doxygen/logcategories.doc \
                          @CMAKE_HOME_DIRECTORY@/include/ \
+                        @CMAKE_HOME_DIRECTORY@/src/plugins/ \
                          @CMAKE_HOME_DIRECTORY@/examples/msg/README.doc \
                          @CMAKE_HOME_DIRECTORY@/examples/s4u/README.doc
 
@@ -1458,6 +1459,7 @@ PREDEFINED             = __cplusplus \
                          XBT_PUBLIC_DATA=extern \
                         XBT_PUBLIC= \
                          XBT_INLINE= \
+                        XBT_ALWAYS_INLINE= \
                         XBT_PRIVATE= \
                         XBT_ATTRIB_NORETURN= \
                         XBT_ATTRIB_UNUSED= \

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 9b50a14..0be8937 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -24,7 +24,6 @@ Welcome to SimGrid's documentation!
    :caption: API Reference:
 
             API <api/library_root.rst>
-            S4U <api/s4u.rst>
 
 Indices and tables
 ==================

diff --git a/examples/msg/README.doc b/examples/msg/README.doc
index 203c249..53ea4d7 100644 (file)
--- a/examples/msg/README.doc
+++ b/examples/msg/README.doc
@@ -1,5 +1,5 @@
-This file follows the Doxygen syntax to be included in the
-documentation, but it should remain readable directly.
+// This file follows the Doxygen syntax to be included in the
+// documentation, but it should remain readable directly.
 
 /** 
  @defgroup msg_examples MSG examples
@@ -114,12 +114,12 @@ TODO: show the XML files instead if it's what is interesting. On a "XML example
 
 */
 
-As a human, you can stop reading at this point. The rest is garbage:
-
-Every example must be listed in the following, but it's not possible
-to move this content upper as each @example directive seems to eat
-everything until the next */ marker (and the content is placed at the
-top of the example file). 
+// As a human, you can stop reading at this point. The rest is garbage:
+// 
+// Every example must be listed in the following, but it's not possible
+// to move this content upper as each @example directive seems to eat
+// everything until the next */ marker (and the content is placed at the
+// top of the example file). 
 
 
 /**

diff --git a/examples/s4u/README.doc b/examples/s4u/README.doc
index 179d325..3d564ca 100644 (file)
--- a/examples/s4u/README.doc
+++ b/examples/s4u/README.doc
@@ -1,12 +1,12 @@
-S4U (Simgrid for you) is the next interface of SimGrid, expected to be released with SimGrid 4.0.
-
-Even if it is not completely rock stable yet, it may well already fit
-your needs. You are welcome to try it and report any interface
-glitches that you see. Be however warned that the interface may change
-until the final release.  You will have to adapt your code on the way.
-
-This file follows the Doxygen syntax to be included in the
-documentation, but it should remain readable directly.
+// S4U (Simgrid for you) is the next interface of SimGrid, expected to be released with SimGrid 4.0.
+//
+// Even if it is not completely rock stable yet, it may well already fit
+// your needs. You are welcome to try it and report any interface
+// glitches that you see. Be however warned that the interface may change
+// until the final release.  You will have to adapt your code on the way.
+// 
+// This file follows the Doxygen syntax to be included in the
+// documentation, but it should remain readable directly.
 
 /** 
  @defgroup s4u_examples S4U examples