From 9465acd691a544c43de6587ec8db409e9145eef5 Mon Sep 17 00:00:00 2001 From: Jon Moss <me@jonathanmoss.me> Date: Wed, 18 Jan 2017 15:21:07 -0500 Subject: Various style + grammar fixes for #27719 [ci skip] --- guides/source/action_cable_overview.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'guides') diff --git a/guides/source/action_cable_overview.md b/guides/source/action_cable_overview.md index ff21319c8a..e929945dd0 100644 --- a/guides/source/action_cable_overview.md +++ b/guides/source/action_cable_overview.md @@ -547,22 +547,24 @@ production: ``` #### Adapter Configuration +Below is a list of the subscription adapters available for end users. + ##### Async Adapter The async adapter is intended for development/testing and should not be used in production. ##### Redis Adapter -The Redis & Evented Redis adapters require a url pointing to the Redis server. Additionally, -a channel_prefix may be provided to avoid channel name collisions when using the same Redis server. -server for multiple applications. See the [Redis PubSub documentation](https://redis.io/topics/pubsub#database-amp-scoping) for more details. - -See the -[Dependencies](#dependencies) section for additional information on adapters. +Action Cable contains two Redis adapters: "normal" Redis and Evented Redis. Both +of the adapters require users to provide a URL pointing to the Redis server. +Additionally, a channel_prefix may be provided to avoid channel name collisions +when using the same Redis server for multiple applications. See the [Redis PubSub documentation](https://redis.io/topics/pubsub#database-amp-scoping) for more details. -##### PostgreSQL adapter +##### PostgreSQL Adapter -The postgres adapter will use the ActiveRecord connection pool for it's connection. This may change in the future. [#27214](https://github.com/rails/rails/issues/27214) +The PostgreSQL adapter uses Active Record's connection pool, and thus the +application's `config/database.yml` database configuration, for its connection. +This may change in the future. [#27214](https://github.com/rails/rails/issues/27214) ### Allowed Request Origins -- cgit v1.2.3