fix docs for merging and throttling

elastic · May 5, 2014 · c57be49 · c57be49
1 parent 7326d77
commit c57be49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/reference/index-modules/merge.asciidoc b/docs/reference/index-modules/merge.asciidoc
@@ -201,8 +201,9 @@ The scheduler supports the following settings:
 
 `index.merge.scheduler.max_thread_count`::
 
-The maximum number of threads to perform the merge operation. Defaults to
-`Math.max(1, Math.min(3, Runtime.getRuntime().availableProcessors() / 2))`.
+The maximum number of concurrent merge threads that may run at once. Defaults
+to `1` which works best with spinning-magnets disks.  If you are using
+a good solid-state disk (SSD) instead then try setting this to `3`.
 
 [float]
 ==== SerialMergeScheduler

diff --git a/docs/reference/modules/indices.asciidoc b/docs/reference/modules/indices.asciidoc
@@ -69,7 +69,7 @@ The following settings can be set to control the store throttling:
 
 [horizontal]
 `indices.store.throttle.type`::
-    could be `merge` (default), `not` or `all`. See <<index-modules-store>>.
+    could be `merge` (default), `none` or `all`. See <<index-modules-store>>.
 
 `indices.store.throttle.max_bytes_per_sec`::
     defaults to `50mb`.