aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-11-13 22:29:26 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-11-13 22:29:26 +0530
commite0efe48c45cb02494b88636a4eefc6b37e419101 (patch)
tree60834e6da2cf4f0620ce1be1222db8fa11e18bcb /railties/lib/rails
parent2591cc66924d3e625ed0dc755751ac0f7c1db2d3 (diff)
parent30122307a1fe6645d6a75dedceca40a440f2f969 (diff)
downloadrails-e0efe48c45cb02494b88636a4eefc6b37e419101.tar.gz
rails-e0efe48c45cb02494b88636a4eefc6b37e419101.tar.bz2
rails-e0efe48c45cb02494b88636a4eefc6b37e419101.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/engine.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1c9627734e..d652c6b7fe 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -296,16 +296,16 @@ module Rails
# If you want to share just a few specific helpers you can add them to application's
# helpers in ApplicationController:
#
- # class ApplicationController < ActionController::Base
- # helper MyEngine::SharedEngineHelper
- # end
+ # class ApplicationController < ActionController::Base
+ # helper MyEngine::SharedEngineHelper
+ # end
#
# If you want to include all of the engine's helpers, you can use #helpers method on an engine's
# instance:
#
- # class ApplicationController < ActionController::Base
- # helper MyEngine::Engine.helpers
- # end
+ # class ApplicationController < ActionController::Base
+ # helper MyEngine::Engine.helpers
+ # end
#
# It will include all of the helpers from engine's directory. Take into account that this does
# not include helpers defined in controllers with helper_method or other similar solutions,