Skip to content

Commit 0a968bd

Browse files
committed
Merge pull request #340 from fxn/patch-1
s/ActiveRecord/Active Record/g
2 parents e599266 + 76aac3f commit 0a968bd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ while ( client.next_result)
123123
end
124124
```
125125

126-
See https://gist.github.com/1367987 for using MULTI_STATEMENTS with ActiveRecord.
126+
See https://gist.github.com/1367987 for using MULTI_STATEMENTS with Active Record.
127127

128128
## Cascading config
129129

@@ -267,15 +267,15 @@ There are a few things that need to be kept in mind while using streaming:
267267

268268
Read more about the consequences of using `mysql_use_result` (what streaming is implemented with) here: http://dev.mysql.com/doc/refman/5.0/en/mysql-use-result.html.
269269

270-
## ActiveRecord
270+
## Active Record
271271

272-
To use the ActiveRecord driver (with or without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
272+
To use the Active Record driver (with or without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
273273
That was easy right? :)
274274

275-
NOTE: as of 0.3.0, and ActiveRecord 3.1 - the ActiveRecord adapter has been pulled out of this gem and into ActiveRecord itself. If you need to use mysql2 with
275+
NOTE: as of 0.3.0, and Active Record 3.1 - the Active Record adapter has been pulled out of this gem and into Active Record itself. If you need to use mysql2 with
276276
Rails versions < 3.1 make sure and specify `gem "mysql2", "~> 0.2.7"` in your Gemfile
277277

278-
## Asynchronous ActiveRecord
278+
## Asynchronous Active Record
279279

280280
Please see the [em-synchrony](https://github.com/igrigorik/em-synchrony) project for details about using EventMachine with mysql2 and Rails.
281281

@@ -331,7 +331,7 @@ The specs pass on my system (SL 10.6.3, x86_64) in these rubies:
331331
* ruby-trunk
332332
* rbx-head - broken at the moment, working with the rbx team for a solution
333333

334-
The ActiveRecord driver should work on 2.3.5 and 3.0
334+
The Active Record driver should work on 2.3.5 and 3.0
335335

336336
## Yeah... but why?
337337

@@ -390,6 +390,6 @@ though.
390390
## Special Thanks
391391

392392
* Eric Wong - for the contribution (and the informative explanations) of some thread-safety, non-blocking I/O and cleanup patches. You rock dude
393-
* Yury Korolev (http://github.com/yury) - for TONS of help testing the ActiveRecord adapter
393+
* Yury Korolev (http://github.com/yury) - for TONS of help testing the Active Record adapter
394394
* Aaron Patterson (http://github.com/tenderlove) - tons of contributions, suggestions and general badassness
395-
* Mike Perham (http://github.com/mperham) - Async ActiveRecord adapter (uses Fibers and EventMachine)
395+
* Mike Perham (http://github.com/mperham) - Async Active Record adapter (uses Fibers and EventMachine)

0 commit comments

Comments
 (0)