put back s4u barrier for MC only (untested)

[simgrid.git] / README.md

diff --git a/README.md b/README.md
index ef6d3b1813130cc98a92f90737d5a850b6c937b1..49369d40ca9608f1170f7db3cfc8cbd1b431d377 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com)
 [![Build Status](https://ci.inria.fr/simgrid/buildStatus/icon?job=SimGrid)](https://ci.inria.fr/simgrid/job/SimGrid/)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com)
 [![Build Status](https://ci.inria.fr/simgrid/buildStatus/icon?job=SimGrid)](https://ci.inria.fr/simgrid/job/SimGrid/)

-[![Travis Status](https://img.shields.io/travis/simgrid/simgrid/master.svg?logo=travis)](https://travis-ci.org/simgrid/simgrid)

 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/gvcssh340fwtoc35?svg=true)](https://ci.appveyor.com/project/mquinson/simgrid)
 [![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=simgrid_simgrid&metric=alert_status)](https://sonarcloud.io/dashboard/?id=simgrid_simgrid)
 [![Doc](https://readthedocs.org/projects/pip/badge/?version=stable)](https://simgrid.org/doc/latest/)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/gvcssh340fwtoc35?svg=true)](https://ci.appveyor.com/project/mquinson/simgrid)
 [![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=simgrid_simgrid&metric=alert_status)](https://sonarcloud.io/dashboard/?id=simgrid_simgrid)
 [![Doc](https://readthedocs.org/projects/pip/badge/?version=stable)](https://simgrid.org/doc/latest/)


@@ -9,9 +8,9 @@
 
 # Welcome to the SimGrid project!
 
 
 # Welcome to the SimGrid project!
 

-SimGrid is a scientific instrument to study the behavior of 
+SimGrid is a scientific instrument to study the behavior of

 large-scale distributed systems such as Grids, Clouds, HPC or P2P
 large-scale distributed systems such as Grids, Clouds, HPC or P2P

-systems. It can be used to evaluate heuristics, prototype applications 
+systems. It can be used to evaluate heuristics, prototype applications

 or even assess legacy MPI applications.
 
 ## Installation
 or even assess legacy MPI applications.
 
 ## Installation


@@ -19,19 +18,21 @@ Documentation: [online](https://simgrid.org/doc/latest/Installing_SimGrid.html#i
 [local copy](docs/source/Installing_SimGrid.rst). TL;DR:
 ```
 cmake -DCMAKE_INSTALL_PREFIX=/opt/simgrid .
 [local copy](docs/source/Installing_SimGrid.rst). TL;DR:
 ```
 cmake -DCMAKE_INSTALL_PREFIX=/opt/simgrid .

-# Check the full list of options with `cmake -LH`
+# Check the full list of options with `cmake -LH`

 make
 make install
 ```
 
 ## More information
 make
 make install
 ```
 
 ## More information

-[Online documentation](https://simgrid.org/doc/latest/) or 
+[Online documentation](https://simgrid.org/doc/latest/) or

 [local version](docs/source).
 
 [local version](docs/source).
 

-You can also ask your questions, or simply discuss with other users on 
-to the [user mailing list](http://lists.gforge.inria.fr/mailman/listinfo/simgrid-user)
+You can also ask your questions, or simply discuss with other users on
+to the [SimGrid mattermost](https://framateam.org/simgrid/channels/town-square)

 or on the #simgrid IRC channel of the oftc network.
 
 or on the #simgrid IRC channel of the oftc network.
 

+Last, the main development of SimGrid is done on [Framagit](https://framagit.org/simgrid/simgrid/),
+but we also maintain a [GitHub mirror](https://github.com/simgrid/simgrid/) and an [Inria GitLab mirror](https://gitlab.inria.fr/simgrid/simgrid),

 
 Thanks for using our software. Please do great things with it and tell
 the world about it. Tell us, too, because we love to have positive
 
 Thanks for using our software. Please do great things with it and tell
 the world about it. Tell us, too, because we love to have positive