From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 30 Mar 2018 22:15:57 +0000 (+0200)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3.20~572
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/95199f4ffa751d3614a07fefe6b3caa6deca1b97?hp=88fad0aaff9eb463f048bfdfe4ad6218aba44ddb

Merge branch 'master' of github.com:simgrid/simgrid
---

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 1ce01c3b2b..236d87f962 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -157,7 +157,7 @@ bindFlag(T& value, const char* name, const char* description,
  *
  *  <pre><code>
  *  static int x;
- *  simgrid::config::bindFlag(a, "x", [](int x) { return return x > 0; });
+ *  simgrid::config::bindFlag(a, "x", [](int x) { return x > 0; });
  *  </code></pre>
  */
 // F is a predicate, F : T const& -> bool
@@ -172,7 +172,7 @@ bindFlag(T& value, const char* name, const char* description,
   declareFlag(name, description, value,
     std::function<void(const T&)>([&value, callback](const T& val) {
       if (not callback(val))
-        throw std::range_error("invalid value");
+        throw std::range_error("invalid value.");
         value = std::move(val);
     })
   );
@@ -182,7 +182,7 @@ bindFlag(T& value, const char* name, const char* description,
  *
  *  <pre><code>
  *  static simgrid::config::flag<int> answer("answer", "Expected answer", 42);
- *  static simgrid::config::flag<std::string> name("name", "Ford Prefect", "John Doe");
+ *  static simgrid::config::flag<std::string> name("name", "Ford Perfect", "John Doe");
  *  static simgrid::config::flag<double> gamma("gamma", "Gamma factor", 1.987);
  *  </code></pre>
  */