From: Christophe Thiéry <christopho128@gmail.com>
Date: Mon, 18 Apr 2011 09:09:40 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~30
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eb3aab21bef7315d8d2b8481b9c0c7800049c10c?hp=9bc4b8f3fa071cfe0add60fb18c1e81d9cbd2094

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

diff --git a/src/xbt/log.c b/src/xbt/log.c
index fac60e04ce..78008223e2 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -298,7 +298,15 @@ displayed by setting a threshold to each category through the
 For example, \verbatim --log=root.thres:debug\endverbatim will make
 SimGrid <b>extremely</b> verbose while \verbatim
 --log=root.thres:critical\endverbatim should shut it almost
-completely off.
+completely off. The full list of recognized thresholds is the following:
+
+ - trace: enter and return of some functions
+ - debug: crufty output
+ - verbose: verbose output for the user wanting more
+ - info: output about the regular functionning
+ - warning: minor issue encountered
+ - error: issue encountered
+ - critical: major issue encountered 
 
 \subsection log_use_conf_multi 3.1.2 Passing several settings