Merge remote-tracking branch 'origin/2.6'

1 files changed, 21 insertions, 6 deletions

diff --git a/docs/modules/ROOT/pages/advanced_usage/configuration_file.adoc b/docs/modules/ROOT/pages/advanced_usage/configuration_file.adoc
index 97cbe63ca..314c52d29 100644
--- a/docs/modules/ROOT/pages/advanced_usage/configuration_file.adoc
+++ b/docs/modules/ROOT/pages/advanced_usage/configuration_file.adoc
@@ -41,18 +41,33 @@ Some interesting values that can be set on the configuration file are:
 | Variable | Default | Meaning 
 
 | `chunkSize` 
-| `5242880` 
-| Specifies the chunk size of uploaded files in bytes. 
+| `10000000` (or 10 MB)
+| Specifies the initial chunk size of uploaded files in bytes.
+The client will dynamically adjust this size within the maximum and minimum bounds (see below).
+
+| `maxChunkSize`
+| `100000000` (or 100 MB)
+| Specifies the maximum chunk size of uploaded files in bytes.
+
+| `minChunkSize`
+| `1000000` (or 1 MB)
+| Specifies the minimum chunk size of uploaded files in bytes.
+
+| `targetChunkUploadDuration`
+| `60000` (1 minute)
+| Target duration in milliseconds for chunk uploads.
+The client adjusts the chunk size until each chunk upload takes approximately this long.
+Set to 0 to disable dynamic chunk sizing.
 
 | `promptDeleteAllFiles` 
 | `true` 
 | If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted.
 
-| `maxLogLines` 
-| `20000` 
-| Specifies the maximum number of log lines displayed in the log window. 
+| `crashReporter`
+| `true`
+| Whether to show the crash reporter when a crash occurs.
 
-| `timeout` 
+| `timeout`
 | `300` 
 | The timeout for network connections in seconds.