From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 28 Nov 2016 20:27:38 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_14~140
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5045b9c72e64d6dedf60d8bf51038c3f05d874e2?hp=103bca762ad0b1163ff856766caa1e7599a53477

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc
index 49fd264021..9bc8121094 100644
--- a/doc/doxygen/options.doc
+++ b/doc/doxygen/options.doc
@@ -168,7 +168,7 @@ details).
 The network and CPU models that are based on lmm_solve (that
 is, all our analytical models) accept specific optimization
 configurations.
-  - items \b network/optim and \b CPU/optim (both default to 'Lazy'):
+  - items \b network/optim and \b cpu/optim (both default to 'Lazy'):
     - \b Lazy: Lazy action management (partial invalidation in lmm +
       heap in action remaining).
     - \b TI: Trace integration. Highly optimized mode when using