X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e3fec2a3365f64f544f1ae5d06312e39fc12c87e..3ac78ee4899aa382d3288876a0157e392ec6ab8e:/docs/source/application.rst

diff --git a/docs/source/application.rst b/docs/source/application.rst
index e2b087a5a2..2cd7745754 100644
--- a/docs/source/application.rst
+++ b/docs/source/application.rst
@@ -5,7 +5,7 @@ Describing your Application
 
 .. raw:: html
 
-   <object id="TOC" data="graphical-toc.svg" width="100%" type="image/svg+xml"></object>
+   <object id="TOC" data="graphical-toc.svg" type="image/svg+xml"></object>
    <script>
    window.onload=function() { // Wait for the SVG to be loaded before changing it
      var elem=document.querySelector("#TOC").contentDocument.getElementById("ApplicationBox")
@@ -20,27 +20,29 @@ virtually executes on the simulated platform. You can express this
 application using one of the following interfaces. It is even possible
 to mix several interfaces in the same simulation.
 
- - :ref:`Describing Algorithms with the S4U interface <S4U_doc>` (in C++)
- - Simulating existing MPI programs with the SMPI toolsuite (in C, C++,
-   or Fortran)
+ - :ref:`Describing Algorithms with the S4U interface <S4U_doc>` (in C++ or Python)
+ - :ref:`Simulating existing MPI programs with the SMPI toolsuite <SMPI_doc>`
+   (in C, C++, or Fortran)
  - In some cases, you may want to replay an execution trace in the simulator. This
    trace lists the events of your application or of your workload, and
    your application is decomposed as a list of event handlers that are
-   fired according to the trace. SimGrid comes with a build-in support
+   fired according to the trace. SimGrid comes with a built-in support
    for MPI traces (with solutions to import traces captured by several
-   MPI profilers). You can reuse this mecanism for any kind of trace
+   MPI profilers). You can reuse this mechanism for any kind of trace
    that you want to replay, for example to study how a P2P DHT overlay
    reacts to a given workload.
- - Simulating algorithms with one of the legacy interfaces: MSG and
-   SimDAG (in C or Java). SimGrid was founded in 1998, and many
-   interfaces were proposed along the way. MSG, introduced around
-   2002, is still present in SimGrid. It does not evolve anymore, but
-   given its popularity, it will not be removed until at least 2020.
+ - Simulating algorithms with the legacy interface: :ref:`MSG for distributed
+   algorithms <MSG_doc>` (in :ref:`C <MSG_doc>` or :ref:`Java
+   <Java_doc>`). SimGrid was founded in 1998, and many interfaces were proposed
+   along the way. MSG (introduced around 2002) is still present in SimGrid. It
+   does not evolve anymore, but given its popularity, it will not be removed
+   until at least 2020. That being said, our goal is to make S4U so useful that
+   this legacy API becomes useless and obsolete.
  - We are currently working on the ability to modify any existing
    application so that it can run on top of SimGrid. This project,
    called `Remote-SimGrid
-   <git@framagit.org:simgrid/remote-simgrid.git>`_, is highly
-   experimental at this point.
+   <https://framagit.org/simgrid/remote-simgrid>`_, is somewhat
+   experimental but should be already usable.
 
 As you can see, SimGrid is very modular and can be used in many
 ways. We are working to improve it along two main directions. First,
@@ -57,13 +59,3 @@ additional work.
 
 .. The old documentation of the obsolete MSG replay module was removed in
 ..  https://github.com/simgrid/simgrid/commit/e05361c201fb95d2b7605e59001cd0a49a489739
-
-
-.. include:: app_smpi.rst
-
-.. include:: app_legacy.rst
-
-.. toctree::
-   :hidden:
-
-      The S4U Interface <app_s4u.rst>