X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63acbff6c85683040878057977846170db950ef2..f04cb933da95f9df2da6d58a72a7b1da12582f7d:/docs/source/scenar_config.rst

diff --git a/docs/source/scenar_config.rst b/docs/source/scenar_config.rst
index 69ff7dadfe..192a96c52e 100644
--- a/docs/source/scenar_config.rst
+++ b/docs/source/scenar_config.rst
@@ -118,7 +118,7 @@ Existing Configuration Items
 - **model-check/visited:** :ref:`cfg=model-check/visited`
 
 - **network/bandwidth-factor:** :ref:`cfg=network/bandwidth-factor`
-- **network/crosstraffic:** :ref:`cfg=opt_network/crosstraffic`
+- **network/crosstraffic:** :ref:`cfg=network/crosstraffic`
 - **network/latency-factor:** :ref:`cfg=network/latency-factor`
 - **network/maxmin-selective-update:** :ref:`Network Optimization Level <options_model_optim>`
 - **network/model:** :ref:`options_model_select`
@@ -136,7 +136,7 @@ Existing Configuration Items
 
 - **surf/precision:** :ref:`cfg=surf/precision`
 
-- **For collective operations of SMPI,** please refer to Section :ref:`options_index_smpi_coll`
+- **For collective operations of SMPI,** please refer to Section :ref:`cfg=smpi/coll-selector`
 - **smpi/async-small-thresh:** :ref:`cfg=smpi/async-small-thresh`
 - **smpi/bw-factor:** :ref:`cfg=smpi/bw-factor`
 - **smpi/coll-selector:** :ref:`cfg=smpi/coll-selector`
@@ -171,13 +171,6 @@ Existing Configuration Items
 
 - **vm/model:** :ref:`options_model_select`
 
-.. _options_index_smpi_coll:
-
-Index of SMPI collective algorithms options
-
-.. TODO:: All available collective algorithms will be made available
-          via the ``smpirun --help-coll`` command.
-
 .. _options_model:
 
 Configuring the Platform Models
@@ -381,7 +374,7 @@ thesis
 	  options network/bandwidth-factor, network/latency-factor,
 	  network/weight-S.
 
-.. _opt_network/crosstraffic:
+.. _cfg=network/crosstraffic:
 
 Simulating Cross-Traffic
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -661,13 +654,13 @@ really meaningful: you should expect the contribution of the memory
 consumption of the snapshots to be @f$ @mbox{number of processes}
 @times @mbox{stack size} @times @mbox{number of states} @f$.
 
-The @b model-check/sparse-checkpoint can be used to reduce the memory
+The ``model-check/sparse-checkpoint`` can be used to reduce the memory
 consumption by trying to share memory between the different snapshots.
 
 When compiled against the model checker, the stacks are not
 protected with guards: if the stack size is too small for your
 application, the stack will silently overflow on other parts of the
-memory (see @ref options_virt_guard_size).
+memory (see :ref:`contexts/guard-size <cfg=contexts/guard-size>`).
 
 .. _cfg=model-checker/hash:
 
@@ -811,17 +804,17 @@ stack which are actually used and you might not need to use this in
 most cases. However, this setting is very important when using the
 model checker (see :ref:`options_mc_perf`).
 
-.. _cfg=contexts:guard-size:
+.. _cfg=contexts/guard-size:
 
 Disabling Stack Guard Pages
 ...........................
 
-**Option** ``contexts:guard-size`` **Default** 1 page in most case (0 pages on Windows or with MC)
+**Option** ``contexts/guard-size`` **Default** 1 page in most case (0 pages on Windows or with MC)
 
 A stack guard page is usually used which prevents the stack of a given
 actor from overflowing on another stack. But the performance impact
 may become prohibitive when the amount of actors increases.  The
-option ``contexts:guard-size`` is the number of stack guard pages
+option ``contexts/guard-size`` is the number of stack guard pages
 used.  By setting it to 0, no guard pages will be used: in this case,
 you should avoid using small stacks (with :ref:`contexts/stack-size
 <cfg=contexts/stack-size>`) as the stack will silently overflow on
@@ -1238,6 +1231,9 @@ Each collective operation can be manually selected with a
 ``smpi/collective_name:algo_name``. Available algorithms are listed in
 :ref:`SMPI_use_colls`.
 
+.. TODO:: All available collective algorithms will be made available
+          via the ``smpirun --help-coll`` command.
+
 .. _cfg=smpi/iprobe:
 
 Inject constant times for MPI_Iprobe