From b873536e68847f94e72d132d1d995274ea101224 Mon Sep 17 00:00:00 2001 From: Lukasz Kusek Date: Wed, 17 Aug 2016 21:05:53 +0100 Subject: [PATCH] =doc fix akka-http timeouts documentation #21214 change akka.http.http-connection-pool -> akka.http.host-connection-pool --- akka-docs/rst/java/http/common/timeouts.rst | 4 ++-- akka-docs/rst/scala/http/common/timeouts.rst | 4 ++-- akka-http-core/src/main/resources/reference.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-docs/rst/java/http/common/timeouts.rst b/akka-docs/rst/java/http/common/timeouts.rst index 9e12cf9df1..69dcade043 100644 --- a/akka-docs/rst/java/http/common/timeouts.rst +++ b/akka-docs/rst/java/http/common/timeouts.rst @@ -24,8 +24,8 @@ independently for each of those using the following keys:: akka.http.server.idle-timeout akka.http.client.idle-timeout - akka.http.http-connection-pool.idle-timeout - akka.http.http-connection-pool.client.idle-timeout + akka.http.host-connection-pool.idle-timeout + akka.http.host-connection-pool.client.idle-timeout .. note:: For the connection pooled client side the idle period is counted only when the pool has no pending requests waiting. diff --git a/akka-docs/rst/scala/http/common/timeouts.rst b/akka-docs/rst/scala/http/common/timeouts.rst index 69b9f07d27..dea4158a9f 100644 --- a/akka-docs/rst/scala/http/common/timeouts.rst +++ b/akka-docs/rst/scala/http/common/timeouts.rst @@ -24,8 +24,8 @@ independently for each of those using the following keys:: akka.http.server.idle-timeout akka.http.client.idle-timeout - akka.http.http-connection-pool.idle-timeout - akka.http.http-connection-pool.client.idle-timeout + akka.http.host-connection-pool.idle-timeout + akka.http.host-connection-pool.client.idle-timeout .. note:: For the connection pooled client side the idle period is counted only when the pool has no pending requests waiting. diff --git a/akka-http-core/src/main/resources/reference.conf b/akka-http-core/src/main/resources/reference.conf index bdc03585ac..bdbf9b6b92 100644 --- a/akka-http-core/src/main/resources/reference.conf +++ b/akka-http-core/src/main/resources/reference.conf @@ -286,7 +286,7 @@ akka.http { # # IMPORTANT: # Please note that this sections settings can be overriden by the corresponding settings in: - # `akka.http.server.parsing`, `akka.http.client.parsing` or `akka.http.http-connection-pool.client.parsing`. + # `akka.http.server.parsing`, `akka.http.client.parsing` or `akka.http.host-connection-pool.client.parsing`. parsing { # The limits for the various parts of the HTTP message parser. max-uri-length = 2k