Merge branch 'master' of framagit.org:simgrid/simgrid

diff --git a/COPYING b/COPYING
index 2b176f7..cd8b514 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -12,18 +12,18 @@ License: Artistic
 Comment: Heavily adapted by the SimGrid team but remains under the original license
 
 Files: src/xbt/mmalloc/* src/include/xbt/mmalloc.h
-Copyright: 
+Copyright:
   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
   Copyright (C) 2003-2021. The SimGrid team.
 License: LGPL-2.1
 Comment: these files used to be part of gdb, but were removed there
 
-Files: 
+Files:
  teshsuite/smpi/mpich3-test/*
-Copyright: 
+Copyright:
  (C) 2001-2014 by Argonne National Laboratory.
  (C) 2008 by University of Illinois.
- (C) 2011-2012 Intel Corporation. 
+ (C) 2011-2012 Intel Corporation.
 License: other
                                   COPYRIGHT
  .
@@ -185,6 +185,12 @@ Copyright:
   Copyright (c) 2018 Two Blue Cubes Ltd. 
 License: BSL-1.0
 
+Files: src/include/xxhash.hpp
+Copyright:
+  Copyright (C) 2012-2018, Yann Collet.
+  Copyright (C) 2017-2018, Piotr Pliszka.
+License: BSD 2-Clause
+
 License: BSL-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
@@ -251,9 +257,3 @@ License: NON COMMERCIAL
  Commercialization of this product is prohibited without notifying the
  Department of Energy (DOE) or Lawrence Livermore National Laboratory
  (LLNL).
-
-Files: src/include/xxhash.hpp
-Copyright:
-  Copyright (C) 2012-2018, Yann Collet.
-  Copyright (C) 2017-2018, Piotr Pliszka.
-License: BSD 2-Clause

diff --git a/docs/source/Configuring_SimGrid.rst b/docs/source/Configuring_SimGrid.rst
index f048a73..08e9d63 100644 (file)
--- a/docs/source/Configuring_SimGrid.rst
+++ b/docs/source/Configuring_SimGrid.rst
@@ -646,11 +646,11 @@ graphviz dot tool to generate a corresponding graphical representation.
 Exploration Depth Limit
 .......................
 
-The ``model-checker/max-depth`` can set the maximum depth of the
+The ``model-check/max-depth`` can set the maximum depth of the
 exploration graph of the model checker. If this limit is reached, a
 logging message is sent and the results might not be exact.
 
-By default, there is no depth limit.
+By default, the exploration is limited to the depth of 1000.
 
 .. _cfg=model-check/timeout: