diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-28 15:50:43 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-28 15:50:43 +0100 |
| commit | 922b5f07953f60b75b5e39b5086bc59e366a0fba (patch) | |
| tree | 3af018128f5e3c308d84b4aba8795909f63b4d22 /guides/source | |
| parent | 2b5d784583b0d75be72cc20bfbc7ebd902461da6 (diff) | |
| parent | 4213825a9ac5111660a7818fff283b9ad659f044 (diff) | |
| download | rails-922b5f07953f60b75b5e39b5086bc59e366a0fba.tar.gz rails-922b5f07953f60b75b5e39b5086bc59e366a0fba.tar.bz2 rails-922b5f07953f60b75b5e39b5086bc59e366a0fba.zip | |
Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflict
Fix merge conflict in Action Cable guide [ci skip]
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/action_cable_overview.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/guides/source/action_cable_overview.md b/guides/source/action_cable_overview.md index 047c163ee2..964cb882c5 100644 --- a/guides/source/action_cable_overview.md +++ b/guides/source/action_cable_overview.md @@ -546,7 +546,6 @@ You can change that in `config/database.yml` through the `pool` attribute. ## Running standalone cable servers -<<<<<<< HEAD ### In App Action Cable can run alongside your Rails application. For example, to @@ -569,10 +568,8 @@ your server spawns, you will also have a new instance of ActionCable, but the use of Redis keeps messages synced across connections. ### Standalone -The cable server(s) can be separated from your normal application server. -======= -The cable servers can be separated from your normal application server. ->>>>>>> Further cleanup of the cable guide + +The cable servers can be separated from your normal application server. It's still a Rack application, but it is its own Rack application. The recommended basic setup is as follows: |