Merge branch 'master' of github.com:rails/docrails

activerecord/test/cases/validations/uniqueness_validation_test.rb

@@ -385,7 +385,7 @@ def test_validate_uniqueness_with_limit
 
   def test_validate_uniqueness_with_limit_and_utf8
     if current_adapter?(:SQLite3Adapter)
-      # Event.title has limit 5, but does SQLite doesn't truncate.
+      # Event.title has limit 5, but SQLite doesn't truncate.
       e1 = Event.create(title: "一二三四五六七八")
       assert e1.valid?, "Could not create an event with a unique 8 characters title"
 

guides/source/active_record_querying.md

@@ -1547,7 +1547,7 @@ SELECT people.id, people.name, comments.text
 FROM people
 INNER JOIN comments
   ON comments.person_id = people.id
-WHERE comments.created_at = '2015-01-01'
+WHERE comments.created_at > '2015-01-01'
 ```
 
 ### Retrieving specific data from multiple tables