Put the description in correct order plus little extension to the description

Author: andsel

CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 6.1.7
  - [DOC] Remove limitations topic and link [#428](https://github.com/logstash-plugins/logstash-input-http/pull/428)
 
@@ -9,6 +10,10 @@
 
 ## 6.1.4
  - Fix: reduce error logging on connection resets [#424](https://github.com/logstash-plugins/logstash-input-beats/pull/424)
+=======
+## x.y.z
+ - [DOC] described `executor_threads` configuration parameter [#421](https://github.com/logstash-plugins/logstash-input-beats/pull/421)
+>>>>>>> Put the description in correct order plus little extension to the description
 
 ## 6.1.3
  - Fix: safe-guard byte buf allocation [#420](https://github.com/logstash-plugins/logstash-input-beats/pull/420) 

docs/index.asciidoc

@@ -163,10 +163,15 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-cipher_suites>> |<<array,array>>|No
 | <<plugins-{type}s-{plugin}-client_inactivity_timeout>> |<<number,number>>|No
 <<<<<<< HEAD
+<<<<<<< HEAD
 | <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
 =======
 | <<plugins-{type}s-{plugin}-executor_threads>> |<<number,number>>|No
 >>>>>>> added documentation for executor_threads
+=======
+| <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
+| <<plugins-{type}s-{plugin}-executor_threads>> |<<number,number>>|No
+>>>>>>> Put the description in correct order plus little extension to the description
 | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-include_codec_tag>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-port>> |<<number,number>>|Yes
@@ -215,6 +220,9 @@ The list of ciphers suite to use, listed by priorities.
 Close Idle clients after X seconds of inactivity.
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Put the description in correct order plus little extension to the description
 [id="plugins-{type}s-{plugin}-ecs_compatibility"]
 ===== `ecs_compatibility`
 
@@ -237,6 +245,14 @@ Refer to <<plugins-{type}s-{plugin}-ecs_metadata,ECS mapping>> for detailed info
 The number of parallel executor threads.
 >>>>>>> added documentation for executor_threads
 
+[id="plugins-{type}s-{plugin}-executor_threads"]
+===== `executor_threads`
+
+  * Value type is <<number,number>>
+  * Default value is 1 executor thread per CPU core
+
+The number of parallel executor threads to be used to process incoming beats requests.
+
 [id="plugins-{type}s-{plugin}-host"]
 ===== `host`