diff --git a/doc/manual/source/the-configuration-file.rst b/doc/manual/source/the-configuration-file.rst
index a3d2de7ad23526799a0a36b431d58c23da872c87..74ddcb36a19dd0a7f8d6c39fddc0ab52e5015064 100644
--- a/doc/manual/source/the-configuration-file.rst
+++ b/doc/manual/source/the-configuration-file.rst
@@ -161,6 +161,13 @@ For a UNIX grid:
           the master to the slaves can be done without passwords, or
           using an SSH agent.
 
+.. warning:: Compatibility considerations between master and slave
+
+    It is highly recommended to use the same version of Dynare on both the
+    master and all slaves. Different versions regularly cause problems like
+    zero acceptance rates during estimation. When upgrading to a newer Dynare
+    version do not forget to adjust the ``DynarePath``.
+
 We now turn to the description of the configuration directives. Note
 that comments in the configuration file can be provided by separate
 lines starting with a hashtag (#).
diff --git a/doc/manual/source/the-model-file.rst b/doc/manual/source/the-model-file.rst
index f24712da44e43e2dd1c492b2ccf20f72937d7b8a..8d09b4f7c1fad974e03578c79251a54bea337183 100644
--- a/doc/manual/source/the-model-file.rst
+++ b/doc/manual/source/the-model-file.rst
@@ -2734,7 +2734,9 @@ blocks.
       scales DOUBLE | (EXPRESSION)  [[,] DOUBLE | (EXPRESSION) ]...;
 
     NOTE: ``scales`` and ``values`` cannot be simultaneously set for the same shock in the same period, but it is 
-    possible to set ``values`` for some periods and ``scales`` for other periods for the same shock.
+    possible to set ``values`` for some periods and ``scales`` for other periods for the same shock. There can be
+    only one ``scales`` and ``values`` directive each for a given shock, so all affected periods must be set in one
+    statement.
 
     *Example*
 
@@ -2743,21 +2745,17 @@ blocks.
         heteroskedastic_shocks;
 
         var e1;
-        periods 86:87 88:97;
-        scales 0.5 0;
+        periods 86:87, 89:97;
+        scales 0.5, 0;
+
+        var e1;
+        periods 88;
+        values 0.1;
 
         var e2;
         periods 86:87 88:97;
         values 0.04 0.01;
 
-        var e3;
-        periods 86:87;
-        values 0.04;
-
-        var e3;
-        periods 88:97;
-        scales 0;
-
         end;
 
 .. specvar:: Sigma_e