Merge remote branch 'docrails/master'

5 files changed, 18 insertions, 18 deletions

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 4f384d1ec5..c12e5797ae 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -145,7 +145,7 @@ module ActionController #:nodoc:
     # and accept Rails' defaults, life will be much easier.
     #
     # If you need to use a MIME type which isn't supported by default, you can register your own handlers in
-    # environment.rb as follows.
+    # config/initializers/mime_types.rb as follows.
     #
     #   Mime::Type.register "image/jpg", :jpg
     #
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index dce47c63bc..ca1494425f 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -35,7 +35,7 @@ module ActionDispatch
     #   such as 'MD5', 'RIPEMD160', 'SHA256', etc.
     #
     # To generate a secret key for an existing application, run
-    # "rake secret" and set the key in config/environment.rb.
+    # "rake secret" and set the key in config/initializers/secret_token.rb.
     #
     # Note that changing digest or secret invalidates all existing sessions!
     class CookieStore < AbstractStore
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index c664fb0bc2..da62b14f9b 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -31,7 +31,7 @@ module ActionDispatch
   # Think of creating routes as drawing a map for your requests. The map tells
   # them where to go based on some predefined pattern:
   #
-  #   AppName::Application.routes.draw do |map|
+  #   AppName::Application.routes.draw do
   #     Pattern 1 tells some request to go to one place
   #     Pattern 2 tell them to go to another
   #     ...
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index cb5a1404ff..8e7cf2e701 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -10,7 +10,7 @@ module ActionView
       # Full usage example:
       #
       #   config/routes.rb:
-      #     Basecamp::Application.routes.draw do |map|
+      #     Basecamp::Application.routes.draw do
       #       resources :posts
       #       root :to => "posts#index"
       #     end
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index b47818a22a..63f6154ec4 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -32,13 +32,13 @@ module ActionView
       #
       # Add table tags to the default allowed tags
       #
-      #   Rails::Initializer.run do |config|
+      #   class Application < Rails::Application
       #     config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
       #   end
       #
       # Remove tags to the default allowed tags
       #
-      #   Rails::Initializer.run do |config|
+      #   class Application < Rails::Application
       #     config.after_initialize do
       #       ActionView::Base.sanitized_allowed_tags.delete 'div'
       #     end
@@ -46,7 +46,7 @@ module ActionView
       #
       # Change allowed default attributes
       #
-      #   Rails::Initializer.run do |config|
+      #   class Application < Rails::Application
       #     config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style'
       #   end
       #
@@ -143,7 +143,7 @@ module ActionView
         # Gets the HTML::FullSanitizer instance used by +strip_tags+.  Replace with
         # any object that responds to +sanitize+.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.full_sanitizer = MySpecialSanitizer.new
         #   end
         #
@@ -154,7 +154,7 @@ module ActionView
         # Gets the HTML::LinkSanitizer instance used by +strip_links+.  Replace with
         # any object that responds to +sanitize+.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.link_sanitizer = MySpecialSanitizer.new
         #   end
         #
@@ -165,7 +165,7 @@ module ActionView
         # Gets the HTML::WhiteListSanitizer instance used by sanitize and +sanitize_css+.
         # Replace with any object that responds to +sanitize+.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.white_list_sanitizer = MySpecialSanitizer.new
         #   end
         #
@@ -175,7 +175,7 @@ module ActionView
 
         # Adds valid HTML attributes that the +sanitize+ helper checks for URIs.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_uri_attributes = 'lowsrc', 'target'
         #   end
         #
@@ -185,7 +185,7 @@ module ActionView
 
         # Adds to the Set of 'bad' tags for the +sanitize+ helper.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_bad_tags = 'embed', 'object'
         #   end
         #
@@ -195,7 +195,7 @@ module ActionView
 
         # Adds to the Set of allowed tags for the +sanitize+ helper.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
         #   end
         #
@@ -205,7 +205,7 @@ module ActionView
 
         # Adds to the Set of allowed HTML attributes for the +sanitize+ helper.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_attributes = 'onclick', 'longdesc'
         #   end
         #
@@ -215,7 +215,7 @@ module ActionView
 
         # Adds to the Set of allowed CSS properties for the #sanitize and +sanitize_css+ helpers.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_css_properties = 'expression'
         #   end
         #
@@ -225,7 +225,7 @@ module ActionView
 
         # Adds to the Set of allowed CSS keywords for the +sanitize+ and +sanitize_css+ helpers.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_css_keywords = 'expression'
         #   end
         #
@@ -235,7 +235,7 @@ module ActionView
 
         # Adds to the Set of allowed shorthand CSS properties for the +sanitize+ and +sanitize_css+ helpers.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_shorthand_css_properties = 'expression'
         #   end
         #
@@ -245,7 +245,7 @@ module ActionView
 
         # Adds to the Set of allowed protocols for the +sanitize+ helper.
         #
-        #   Rails::Initializer.run do |config|
+        #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_protocols = 'ssh', 'feed'
         #   end
         #