diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-01 23:37:10 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-01 23:37:10 +0000 |
| commit | 7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1 (patch) | |
| tree | e736033782ccfe7fa1baade11be59d589cdb24fd /actionpack | |
| parent | 667d8ea2ea6d3a24009c531fefd6b4a78572ded2 (diff) | |
| download | rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.tar.gz rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.tar.bz2 rails-7aa9eed88fdfb1a8010c4ca7468e9ebd527494f1.zip | |
Deprecation: update docs. Closes #5998.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4898 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 |
4 files changed, 6 insertions, 4 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: # |