aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/configuring.md
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-09-06 22:31:57 +0530
committerGitHub <noreply@github.com>2016-09-06 22:31:57 +0530
commit0c91b166e612d8dba0ededec99cfb39b85d31fbb (patch)
tree4f4dfb81b3b9976c0342dfe6d1aa8cba6b02244e /guides/source/configuring.md
parent1722397f9a63f74bc7ff633895aec7109568a25b (diff)
parentb9e98d62c24b04937a219285aef69c2a8344beab (diff)
downloadrails-0c91b166e612d8dba0ededec99cfb39b85d31fbb.tar.gz
rails-0c91b166e612d8dba0ededec99cfb39b85d31fbb.tar.bz2
rails-0c91b166e612d8dba0ededec99cfb39b85d31fbb.zip
Merge pull request #26408 from tricknotes/bye-mongrel-from-docs
Remove the word "mongrel" from documents [ci skip]
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index a115683134..c54affb70e 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -1198,7 +1198,7 @@ development:
timeout: 5000
```
-Since the connection pooling is handled inside of Active Record by default, all application servers (Thin, mongrel, Unicorn etc.) should behave the same. The database connection pool is initially empty. As demand for connections increases it will create them until it reaches the connection pool limit.
+Since the connection pooling is handled inside of Active Record by default, all application servers (Thin, Puma, Unicorn etc.) should behave the same. The database connection pool is initially empty. As demand for connections increases it will create them until it reaches the connection pool limit.
Any one request will check out a connection the first time it requires access to the database. At the end of the request it will check the connection back in. This means that the additional connection slot will be available again for the next request in the queue.