diff options
author | Neeraj Singh <neerajdotname@gmail.com> | 2014-12-07 22:02:02 -0500 |
---|---|---|
committer | Neeraj Singh <neerajdotname@gmail.com> | 2014-12-07 22:02:02 -0500 |
commit | 6125221da6052d0021367bb8a653c7890ece0a87 (patch) | |
tree | 822fa103b66a179c5d625a9a37c513609dc10449 /activerecord | |
parent | 9eb4869f80107be19b6d161a7f2e05449afee85a (diff) | |
download | rails-6125221da6052d0021367bb8a653c7890ece0a87.tar.gz rails-6125221da6052d0021367bb8a653c7890ece0a87.tar.bz2 rails-6125221da6052d0021367bb8a653c7890ece0a87.zip |
minor sentences fixes
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 3a9db4a109..0fa00d03a3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -122,13 +122,13 @@ module ActiveRecord # greater than the number of threads currently waiting (that # is, don't jump ahead in line). Otherwise, return nil. # - # If +timeout+ is given, block if it there is no element + # If +timeout+ is given, block if there is no element # available, waiting up to +timeout+ seconds for an element to # become available. # # Raises: # - ConnectionTimeoutError if +timeout+ is given and no element - # becomes available after +timeout+ seconds, + # becomes available within +timeout+ seconds, def poll(timeout = nil) synchronize do if timeout @@ -151,7 +151,7 @@ module ActiveRecord end # A thread can remove an element from the queue without - # waiting if an only if the number of currently available + # waiting if and only if the number of currently available # connections is strictly greater than the number of waiting # threads. def can_remove_no_wait? |