diff --git a/CHANGELOG b/CHANGELOG
index 050ac9ca53..4abce2e598 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-v2.3.0-beta2 (2014-11-01)
+2.3.0-beta2 (2014-11-01)
 -------------------
 
 * front-end: new icons for uploading and downloading JSON documents into a collection
@@ -86,22 +86,23 @@ v2.3.0-beta2 (2014-11-01)
   V8 contexts created in arangod.
   
   Previously, the number of V8 contexts was equal to the number of server threads
-  (as specified by option `--server.threads`). However, it may be sensible to  
-  create different amounts of threads and V8 contexts. If the option is not
-  specified, the number of V8 contexts created will be equal to the number of 
-  server threads. Thus no change in configuration is required to keep the old
-  behavior.
-  
-  However, the default configuration files shipped with ArangoDB have been changed. 
-  The number of server threads has been increased in the configuration files, and
-  the number of V8 contexts is now explicitly set in the configuration files (to
-  the same value as the number of server threads was set to in 2.2).
+  (as specified by option `--server.threads`). 
 
-  If you are using the default config files or merge them with your local config files, 
-  please review if the higher default number of server threads is okay in your
+  However, it may be sensible to create different amounts of threads and V8
+  contexts. If the option is not specified, the number of V8 contexts created
+  will be equal to the number of server threads. Thus no change in configuration
+  is required to keep the old behavior.
+  
+  If you are using the default config files or merge them with your local config
+  files, please review if the default number of server threads is okay in your
   environment. Additionally you should verify that the number of V8 contexts
   created (as specified in option `--javascript.v8-contexts`) is okay.
 
+* the number of server.threads specified is now the minimum of threads
+  started. There are situation in which threads are waiting for results of
+  distributed database servers. In this case the number of threads is
+  dynamically increased.
+
 * removed index type "bitarray"
 
   Bitarray indexes were only half-way documented and integrated in previous versions 
diff --git a/Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp b/Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp
index 910a05cf64..3c46a937bd 100644
--- a/Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp
+++ b/Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp
@@ -6,10 +6,15 @@ upgrading to ArangoDB 2.3, and adjust any client programs if necessary.
 
 !SECTION Default configuration file changes
 
-With ArangoDB 2.3, the number of server threads can be configured independently of 
-the number of V8 contexts. The configuration option `--javascript.v8-contexts` was 
-added to arangod to provide better control over the number of V8 contexts created 
-in arangod.
+The number of server threads specified is now the minimum of threads
+started. There are situation in which threads are waiting for results of
+distributed database servers. In this case the number of threads is dynamically
+increased.
+
+With ArangoDB 2.3, the number of server threads can be configured independently
+of the number of V8 contexts. The configuration option
+`--javascript.v8-contexts` was added to arangod to provide better control over
+the number of V8 contexts created in arangod.
   
 Previously, the number of V8 contexts arangod created at startup was equal 
 to the number of server threads (as specified by option `--server.threads`). 
@@ -19,18 +24,13 @@ and V8 contexts. This is because each V8 contexts created will consume memory
 and requires CPU resources for periodic garbage collection. Contrary, server
 threads do not have such high memory or CPU footprint. 
 
-If the option `--javascript.v8-contexts` is not specified, the number of V8 
-contexts created at startup will remain equal to the number of server threads. 
-Thus no change in configuration is required to keep the same behavior as in 
+If the option `--javascript.v8-contexts` is not specified, the number of V8
+contexts created at startup will remain equal to the number of server threads.
+Thus no change in configuration is required to keep the same behavior as in
 previous ArangoDB versions.
 
-However, the default configuration files shipped with ArangoDB have been changed. 
-The number of server threads has been increased in the configuration files, and
-the number of V8 contexts is now explicitly set in the configuration files (to
-the same value as the number of server threads was set to in 2.2).
-
-If you are using the default config files or merge them with your local config files, 
-please review if the higher default number of server threads is okay in your
+If you are using the default config files or merge them with your local config
+files, please review if the default number of server threads is okay in your
 environment. Additionally you should verify that the number of V8 contexts
 created (as specified in option `--javascript.v8-contexts`) is okay.