diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-08 09:31:26 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-08 09:31:26 -0500 |
| commit | 21efda2edbfa74e80ad0df6f92b52a16880082e3 (patch) | |
| tree | 2c7877d17a3b038a554e429012478a4665f1eed3 /docs/configuration | |
| parent | 5d814f739cd2bb55822e0cfdb9ad2526d10482bb (diff) | |
| parent | 0a05670b4499d170f6bc0eaecfae0d71be022227 (diff) | |
| download | pleroma-21efda2edbfa74e80ad0df6f92b52a16880082e3.tar.gz pleroma-21efda2edbfa74e80ad0df6f92b52a16880082e3.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 2ca4d7351..bffce95e7 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -499,7 +499,7 @@ Settings for HTTP connection pool. * `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries. * `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart. * `:max_connections` - Maximum number of connections in the pool. -* `:await_up_timeout` - Timeout to connect to the host. +* `:connect_timeout` - Timeout to connect to the host. * `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded. ### :pools @@ -518,7 +518,7 @@ There are four pools used: For each pool, the options are: * `:size` - limit to how much requests can be concurrently executed. -* `:timeout` - timeout while `gun` will wait for response +* `:recv_timeout` - timeout while `gun` will wait for response * `:max_waiting` - limit to how much requests can be waiting for others to finish, after this is reached, subsequent requests will be dropped. ## Captcha |