Merge branch 'master' into treewip

* master: (113 commits)
  remove useless method
  Updated file documentation [ci skip]
  changes caching guide to add note on weak etags
  Don't put config.action_mailer.perform_caching entry twice in development.rb
  Fix wording and wrong reference
  Add Ruby formatting to CHANGELOG entry
  Fix ActionView's cache section reference
  Do not define methods in the included block
  Add caching guide in ActionMailer basics
  Add ActionMailer configuration options
  Preparing for 5.0.0.beta3 release
  Update 5.0 release notes
  Enable tmp_restart plugin for puma
  Prep release for Rails 5 beta3
  [ci skip] Move collection caching changelog entry.
  Ensure `drop_table` even if tests failure or interrupted
  :bomb: run the test @rafaelfranca :angry:
  Remove changelog entry for reverted commit
  Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]
  No need CHANGELOG entry for #23849.
  ...

1 files changed, 28 insertions, 21 deletions

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 461a26b10b..d084f2b1e0 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,4 +1,31 @@
-*   Fix `button_to`'s `:params` option support to correctly generated input names for nested hashes/arrays.
+## Rails 5.0.0.beta3 (February 24, 2016) ##
+
+*   Collection rendering can cache and fetch multiple partials at once.
+
+    Collections rendered as:
+
+    ```ruby
+    <%= render partial: 'notifications/notification', collection: @notifications, as: :notification, cached: true %>
+    ```
+
+    will read several partials from cache at once. The templates in the collection
+    that haven't been cached already will automatically be written to cache. Works
+    great alongside individual template fragment caching. For instance if the
+    template the collection renders is cached like:
+
+    ```ruby
+    # notifications/_notification.html.erb
+    <% cache notification do %>
+      <%# ... %>
+    <% end %>
+    ```
+
+    Then any collection renders shares that cache when attempting to read multiple
+    ones at once.
+
+    *Kasper Timm Hansen*
+
+*   Add support for nested hashes/arrays to `:params` option of `button_to` helper.
 
     *James Coleman*
 
@@ -197,26 +224,6 @@
 
     *Ulisses Almeida*
 
-*   Collection rendering automatically caches and fetches multiple partials.
-
-    Collections rendered as:
-
-    ```ruby
-    <%= render @notifications %>
-    <%= render partial: 'notifications/notification', collection: @notifications, as: :notification %>
-    ```
-
-    will now read several partials from cache at once, if the template starts with a cache call:
-
-    ```ruby
-    # notifications/_notification.html.erb
-    <% cache notification do %>
-      <%# ... %>
-    <% end %>
-    ```
-
-    *Kasper Timm Hansen*
-
 *   Fixed a dependency tracker bug that caused template dependencies not
     count layouts as dependencies for partials.