Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix plugin's documentation after 8fb718b

Change-Id: I36251e52671cb376c2ef873de9d2be7a60ad58a8

src/main/resources/Documentation/config.md

diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 4ca2db7..e4055cb 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -160,13 +160,6 @@
 :   The interval of time in milliseconds between the subsequent auto-retries.
     When not specified, the default value is set to 10000ms.
 
-```index.waitTimeout```
-:   Maximum interval of time in milliseconds the plugin waits to acquire the lock for
-    an indexing call. When not specified, the default value is set to 5000ms.
-
-NOTE: the default settings for `http.timeout`, `http.maxTries` and `http.lockAcquireTimeout`
-ensure that the plugin will keep retrying to forward a message for one hour.
-
 ```cache.synchronize```
 :   Whether to synchronize cache evictions.
     Defaults to true.
@@ -219,6 +212,9 @@
     the lock for an indexing call. When not specified, the default value
     is set to 5000ms.
 
+NOTE: the default settings for `http.socketTimeout`, `http.maxTries` and `index.waitTimeout`
+ensure that the plugin will keep retrying to forward a message for one hour.
+
 ```websession.synchronize```
 :   Whether to synchronize web sessions.
     Defaults to true.