Merge "Improve the wording about logical CPUs" into stable-2.11
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index ab6be9a..fdb9d18 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2152,8 +2152,8 @@
Number of threads to use for indexing in background operations, such as
online schema upgrades.
+
-If not set or set to a negative value, defaults to logical number of CPU
-cores as returned by the JVM (unless
+If not set or set to a negative value, defaults to the number of logical
+CPUs as returned by the JVM (unless
link:#changeMerge.threadPoolSize[changeMerge.threadPoolSize] is set).
==== Lucene configuration
diff --git a/ReleaseNotes/ReleaseNotes-2.11.1.txt b/ReleaseNotes/ReleaseNotes-2.11.1.txt
index eab6d60..427f422 100644
--- a/ReleaseNotes/ReleaseNotes-2.11.1.txt
+++ b/ReleaseNotes/ReleaseNotes-2.11.1.txt
@@ -41,7 +41,7 @@
the target branch.
+
Now, instead of indexing interactively, it falls back to a batch thread pool
-with the logical number of available CPUs.
+with the number of available logical CPUs.
* Reduce unnecessary database access when queryng changes.
+
