aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorRajat Bansal <rajat.usict@gmail.com>2016-05-31 13:31:13 +0530
committerRajat Bansal <rajat.usict@gmail.com>2016-05-31 13:31:18 +0530
commit72a0f5e24c0f34c43a220ec50d4f3a62e03cf401 (patch)
tree0c3c65750c01b8d2e4f841b6889ffb48abc3c46b /actioncable
parent3dad1b0cf6ae0062de5996a1b84986ddc441292e (diff)
downloadrails-72a0f5e24c0f34c43a220ec50d4f3a62e03cf401.tar.gz
rails-72a0f5e24c0f34c43a220ec50d4f3a62e03cf401.tar.bz2
rails-72a0f5e24c0f34c43a220ec50d4f3a62e03cf401.zip
fix grammar
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/README.md2
-rw-r--r--actioncable/lib/action_cable/channel/streams.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/README.md b/actioncable/README.md
index 71fec714f5..fa6a3ed0df 100644
--- a/actioncable/README.md
+++ b/actioncable/README.md
@@ -430,7 +430,7 @@ For every instance of your server you create and for every worker your server sp
### Notes
-Beware that currently the cable server will _not_ auto-reload any changes in the framework. As we've discussed, long-running cable connections mean long-running objects. We don't yet have a way of reloading the classes of those objects in a safe manner. So when you change your channels, or the model your channels use, you must restart the cable server.
+Beware that currently, the cable server will _not_ auto-reload any changes in the framework. As we've discussed, long-running cable connections mean long-running objects. We don't yet have a way of reloading the classes of those objects in a safe manner. So when you change your channels, or the model your channels use, you must restart the cable server.
We'll get all this abstracted properly when the framework is integrated into Rails.
diff --git a/actioncable/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb
index 0a0a95f453..561750d713 100644
--- a/actioncable/lib/action_cable/channel/streams.rb
+++ b/actioncable/lib/action_cable/channel/streams.rb
@@ -138,7 +138,7 @@ module ActionCable
end
# May be overridden to change the default stream handling behavior
- # which decodes JSON and transmits to client.
+ # which decodes JSON and transmits to the client.
#
# TODO: Tests demonstrating this.
#