9 files changed, 24 insertions, 16 deletions
diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md
index e52264f296..a270ec7a7e 100644
--- a/guides/source/caching_with_rails.md
+++ b/guides/source/caching_with_rails.md
@@ -99,14 +99,14 @@ end
 
 This method generates a cache key that depends on all products and can be used in the view:
 
-```ruby
+```erb
 <% cache(cache_key_for_products) do %>
   All available products:
 <% end %>
 ```
 You can also use an Active Record model as the cache key:
 
-```ruby
+```erb
 <% Product.all.each do |p| %>
   <% cache(p) do %>
     <%= link_to p.name, product_url(p) %>
@@ -118,7 +118,7 @@ Behind the scenes, a method called `cache_key` will be invoked on the model and
 
 You can also combine the two schemes which is called "Russian Doll Caching":
 
-```ruby
+```erb
 <% cache(cache_key_for_products) do %>
   All available products:
   <% Product.all.each do |p| %>
diff --git a/guides/source/command_line.md b/guides/source/command_line.md
index 2790a4740a..9d1fb03fab 100644
--- a/guides/source/command_line.md
+++ b/guides/source/command_line.md
@@ -378,7 +378,7 @@ Active Record version     4.0.0.beta
 Action Pack version       4.0.0.beta
 Action Mailer version     4.0.0.beta
 Active Support version    4.0.0.beta
-Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::Migration::CheckPending, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::EncryptedCookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, Rack::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport
+Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::Migration::CheckPending, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::EncryptedCookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, Rack::Head, Rack::ConditionalGet, Rack::ETag
 Application root          /home/foobar/commandsapp
 Environment               development
 Database adapter          sqlite3
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index c1f31fd2b0..be46e15078 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -207,7 +207,6 @@ Every Rails application comes with a standard set of middleware which it uses in
 * `ActionDispatch::ParamsParser` parses out parameters from the request into `params`.
 * `Rack::MethodOverride` allows the method to be overridden if `params[:_method]` is set. This is the middleware which supports the PATCH, PUT, and DELETE HTTP method types.
 * `ActionDispatch::Head` converts HEAD requests to GET requests and serves them as so.
-* `ActionDispatch::BestStandardsSupport` enables "best standards support" so that IE8 renders some elements correctly.
 
 Besides these usual middleware, you can add your own by using the `config.middleware.use` method:
 
@@ -230,13 +229,13 @@ config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns
 Middlewares can also be completely swapped out and replaced with others:
 
 ```ruby
-config.middleware.swap ActionDispatch::BestStandardsSupport, Magical::Unicorns
+config.middleware.swap ActionController::Failsafe, Lifo::Failsafe
 ```
 
 They can also be removed from the stack completely:
 
 ```ruby
-config.middleware.delete ActionDispatch::BestStandardsSupport
+config.middleware.delete "Rack::MethodOverride"
 ```
 
 ### Configuring i18n
diff --git a/guides/source/engines.md b/guides/source/engines.md
index 459aa8d57e..58c6870d4a 100644
--- a/guides/source/engines.md
+++ b/guides/source/engines.md
@@ -28,7 +28,7 @@ Engines can also be isolated from their host applications. This means that an ap
 
 It's important to keep in mind at all times that the application should **always** take precedence over its engines. An application is the object that has final say in what goes on in the universe (with the universe being the application's environment) where the engine should only be enhancing it, rather than changing it drastically.
 
-To see demonstrations of other engines, check out [Devise](https://github.com/plataformatec/devise), an engine that provides authentication for its parent applications, or [Forem](https://github.com/radar/forem), an engine that provides forum functionality. There's also [Spree](https://github.com/spree/spree) which provides an e-commerce platform, and [RefineryCMS](https://github.com/resolve/refinerycms), a CMS engine.
+To see demonstrations of other engines, check out [Devise](https://github.com/plataformatec/devise), an engine that provides authentication for its parent applications, or [Forem](https://github.com/radar/forem), an engine that provides forum functionality. There's also [Spree](https://github.com/spree/spree) which provides an e-commerce platform, and [RefineryCMS](https://github.com/refinery/refinerycms), a CMS engine.
 
 Finally, engines would not have been possible without the work of James Adam, Piotr Sarnacki, the Rails Core Team, and a number of other people. If you ever meet them, don't forget to say thanks!
 
diff --git a/guides/source/generators.md b/guides/source/generators.md
index 8b91dfc5a5..1a08eb420a 100644
--- a/guides/source/generators.md
+++ b/guides/source/generators.md
@@ -310,7 +310,7 @@ In Rails 3.0 and above, generators don't just look in the source root for templa
 
 ```erb
 module <%= class_name %>Helper
-  attr_reader :<%= plural_name %>, <%= plural_name.singularize %>
+  attr_reader :<%= plural_name %>, :<%= plural_name.singularize %>
 end
 ```
 
diff --git a/guides/source/plugins.md b/guides/source/plugins.md
index f8f04c3c67..695f25f8a9 100644
--- a/guides/source/plugins.md
+++ b/guides/source/plugins.md
@@ -86,7 +86,7 @@ Run `rake` to run the test. This test should fail because we haven't implemented
 
 Great - now you are ready to start development.
 
-Then in `lib/yaffle.rb` require `lib/core_ext`:
+Then in `lib/yaffle.rb` add `require "yaffle/core_ext"`:
 
 ```ruby
 # yaffle/lib/yaffle.rb
diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md
index a6119eb433..d8477d89e3 100644
--- a/guides/source/rails_on_rack.md
+++ b/guides/source/rails_on_rack.md
@@ -137,7 +137,6 @@ use ActionDispatch::ParamsParser
 use Rack::Head
 use Rack::ConditionalGet
 use Rack::ETag
-use ActionDispatch::BestStandardsSupport
 run MyApp::Application.routes
 ```
 
@@ -215,7 +214,6 @@ And to remove browser related middleware,
 
 ```ruby
 # config/application.rb
-config.middleware.delete "ActionDispatch::BestStandardsSupport"
 config.middleware.delete "Rack::MethodOverride"
 ```
 
@@ -307,10 +305,6 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
 
 * Adds ETag header on all String bodies. ETags are used to validate cache.
 
- **`ActionDispatch::BestStandardsSupport`**
-
-* Enables “best standards support” so that IE8 renders some elements correctly.
-
 TIP: It's possible to use any of the above middlewares in your custom Rack stack.
 
 ### Using Rack Builder
diff --git a/guides/source/routing.md b/guides/source/routing.md
index 14f23d4020..4614169653 100644
--- a/guides/source/routing.md
+++ b/guides/source/routing.md
@@ -832,6 +832,19 @@ will recognize incoming paths beginning with `/photos` but route to the `Images`
 
 NOTE: Use `photos_path`, `new_photo_path`, etc. to generate paths for this resource.
 
+For namespaced controllers you can use the directory notation. For example:
+
+```ruby
+resources :user_permissions, controller: 'admin/user_permissions'
+```
+
+This will route to the `Admin::UserPermissions` controller.
+
+NOTE: Only the directory notation is supported. specifying the
+controller with ruby constant notation (eg. `:controller =>
+'Admin::UserPermissions'`) can lead to routing problems and results in
+a warning.
+
 ### Specifying Constraints
 
 You can use the `:constraints` option to specify a required format on the implicit `id`. For example:
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index b4a59fe3da..59e21e9be2 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -82,6 +82,8 @@ becomes
 get 'こんにちは', controller: 'welcome', action: 'index'
 ```
 
+* Rails 4.0 has removed ActionDispatch::BestStandardsSupport middleware, !DOCTYPE html already triggers standards mode per http://msdn.microsoft.com/en-us/library/jj676915(v=vs.85).aspx and ChromeFrame header has been moved to `config.action_dispatch.default_headers`
+
 ### Active Support
 
 Rails 4.0 removes the `j` alias for `ERB::Util#json_escape` since `j` is already used for `ActionView::Helpers::JavaScriptHelper#escape_javascript`.