Changelog and doc updates for the previous changes.

2 files changed, 27 insertions, 9 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c9f131c74c..49eb266143 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,24 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   `Model.all` now returns an `ActiveRecord::Relation`, rather than an
+    array of records. Use `Model.to_a` or `Relation#to_a` if you really
+    want an array.
+
+    In some specific cases, this may cause breakage when upgrading.
+    However in most cases the `ActiveRecord::Relation` will just act as a
+    lazy-loaded array and there will be no problems.
+
+    Note that calling `Model.all` with options (e.g.
+    `Model.all(conditions: '...')` was already deprecated, but it will
+    still return an array in order to make the transition easier.
+
+    `Model.scoped` is deprecated in favour of `Model.all`.
+
+    `Relation#all` still returns an array, but is deprecated (since it
+    would serve no purpose if we made it return a `Relation`).
+
+    *Jon Leighton*
+
 *   Deprecate `update_column` method in favor of `update_columns`.
 
     *Rafael Mendonça França*
@@ -249,13 +268,12 @@
 
     Note that as an interim step, it is possible to rewrite the above as:
 
-        Post.scoped(:where => { :comments_count => 10 }, :limit => 5)
+        Post.all.merge(:where => { :comments_count => 10 }, :limit => 5)
 
     This could save you a lot of work if there is a lot of old-style
     finder usage in your application.
 
-    Calling `Post.scoped(options)` is a shortcut for
-    `Post.scoped.merge(options)`. `Relation#merge` now accepts a hash of
+    `Relation#merge` now accepts a hash of
     options, but they must be identical to the names of the equivalent
     finder method. These are mostly identical to the old-style finder
     option names, except in the following cases:
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index edde37446a..a58f02098b 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -129,7 +129,7 @@ module ActiveRecord
     #
     # First: takes a block so it can be used just like Array#select.
     #
-    #   Model.scoped.select { |m| m.field == value }
+    #   Model.all.select { |m| m.field == value }
     #
     # This will build an array of objects from the database for the scope,
     # converting them into an array and iterating through them using Array#select.
@@ -503,7 +503,7 @@ module ActiveRecord
     # Like #create_with but modifies the relation in place. Raises
     # +ImmutableRelation+ if the relation has already been loaded.
     #
-    #   users = User.scoped.create_with!(name: 'Oscar')
+    #   users = User.all.create_with!(name: 'Oscar')
     #   users.new.name # => 'Oscar'
     def create_with!(value)
       self.create_with_value = value ? create_with_value.merge(value) : {}
@@ -566,16 +566,16 @@ module ActiveRecord
     #     end
     #   end
     #
-    #   scope = Model.scoped.extending(Pagination)
+    #   scope = Model.all.extending(Pagination)
     #   scope.page(params[:page])
     #
     # You can also pass a list of modules:
     #
-    #   scope = Model.scoped.extending(Pagination, SomethingElse)
+    #   scope = Model.all.extending(Pagination, SomethingElse)
     #
     # === Using a block
     #
-    #   scope = Model.scoped.extending do
+    #   scope = Model.all.extending do
     #     def page(number)
     #       # pagination code goes here
     #     end
@@ -584,7 +584,7 @@ module ActiveRecord
     #
     # You can also use a block and a module list:
     #
-    #   scope = Model.scoped.extending(Pagination) do
+    #   scope = Model.all.extending(Pagination) do
     #     def per_page(number)
     #       # pagination code goes here
     #     end