diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/verification.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 4 | ||||
| -rw-r--r-- | actionwebservice/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionwebservice/lib/action_web_service/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/README | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
9 files changed, 13 insertions, 7 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d7cec7c7d4..e8a729e8f5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark] + * Make auto_link parse a greater subset of valid url formats. [Jamis Buck] * Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. [Mike Clark] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 7eecb15e9b..cc3d9daaa3 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -266,7 +266,7 @@ module ActionController #:nodoc: # <b>Hello <%= @name %></b> # <% cache do %> # All the topics in the system: - # <%= render_collection_of_partials "topic", Topic.find_all %> + # <%= render :partial => "topic", :collection => Topic.find(:all) %> # <% end %> # # This cache will bind to the name of action that called it. So you would be able to invalidate it using diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb index ebf30becac..57dc5b86f9 100644 --- a/actionpack/lib/action_controller/verification.rb +++ b/actionpack/lib/action_controller/verification.rb @@ -43,7 +43,7 @@ module ActionController #:nodoc: # be in the <tt>params</tt> hash in order for the action(s) to be safely # called. # * <tt>:session</tt>: a single key or an array of keys that must - # be in the @session in order for the action(s) to be safely called. + # be in the <tt>session</tt> in order for the action(s) to be safely called. # * <tt>:flash</tt>: a single key or an array of keys that must # be in the flash in order for the action(s) to be safely called. # * <tt>:method</tt>: a single key or an array of keys--any one of which diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 12a5f7f0f1..98c60fab5b 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -26,7 +26,7 @@ module ActionView # # Another common case is a select tag for an <tt>belongs_to</tt>-associated object. For example, # - # select("post", "person_id", Person.find_all.collect {|p| [ p.name, p.id ] }) + # select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }) # # could become: # @@ -43,7 +43,7 @@ module ActionView # See options_for_select for the required format of the choices parameter. # # Example with @post.person_id => 1: - # select("post", "person_id", Person.find_all.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) + # select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, { :include_blank => true }) # # could become: # diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index 8b120360f6..7077e807cb 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark] + * ActionWebService WSDL generation ignores HTTP_X_FORWARDED_HOST [Paul Butcher <paul@paulbutcher.com>] * Tighten rescue clauses. #5985 [james@grayproductions.net] diff --git a/actionwebservice/lib/action_web_service/base.rb b/actionwebservice/lib/action_web_service/base.rb index 43c7b6fa26..b409377b6a 100644 --- a/actionwebservice/lib/action_web_service/base.rb +++ b/actionwebservice/lib/action_web_service/base.rb @@ -12,7 +12,7 @@ module ActionWebService # :nodoc: # web_service_api PersonAPI # # def find_person(criteria) - # Person.find_all [...] + # Person.find(:all) [...] # end # # def delete_person(id) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index beac6b3940..9b633d5674 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark] + * Add some XmlSerialization tests for ActiveRecord [Rick Olson] * has_many :through conditions are sanitized by the associating class. #5971 [martin.emde@gmail.com] diff --git a/activerecord/README b/activerecord/README index 1be4df6189..265d8cc61e 100755 --- a/activerecord/README +++ b/activerecord/README @@ -264,7 +264,7 @@ Lots of different finders next_angle = Firm.find(1) # SQL: SELECT * FROM companies WHERE id = 1 AND name = 'Next Angle' - next_angle = Company.find_first "name = 'Next Angle'" + next_angle = Company.find(:first, :conditions => "name = 'Next Angle'") next_angle = Firm.find_by_sql("SELECT * FROM companies WHERE id = 1").first diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 65db5f9b23..b2ea56be4c 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -84,7 +84,7 @@ module ActiveRecord # * <tt>Project#portfolio, Project#portfolio=(portfolio), Project#portfolio.nil?</tt> # * <tt>Project#project_manager, Project#project_manager=(project_manager), Project#project_manager.nil?,</tt> # * <tt>Project#milestones.empty?, Project#milestones.size, Project#milestones, Project#milestones<<(milestone),</tt> - # <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find_all(conditions),</tt> + # <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find(:all, options),</tt> # <tt>Project#milestones.build, Project#milestones.create</tt> # * <tt>Project#categories.empty?, Project#categories.size, Project#categories, Project#categories<<(category1),</tt> # <tt>Project#categories.delete(category1)</tt> |