aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-10-10 19:41:25 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-10-10 19:41:25 +0530
commitfcb70f364ccb087f672a85d4d18cc79736503a13 (patch)
treeb149bb433c5ca3dcc46b0ed826cd420cd7b9f6c8 /railties/lib
parente9413b5de34615948b9092fe6976272a36cc2fef (diff)
parent9c9583fa9be215875e6eacee3290dc46280f9a20 (diff)
downloadrails-fcb70f364ccb087f672a85d4d18cc79736503a13.tar.gz
rails-fcb70f364ccb087f672a85d4d18cc79736503a13.tar.bz2
rails-fcb70f364ccb087f672a85d4d18cc79736503a13.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/base.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index b9dc31457a..911f80cf3a 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -91,7 +91,7 @@ module Rails
#
# The lookup in this case for test_unit as input is:
#
- # "test_unit:awesome", "test_unit"
+ # "test_framework:awesome", "test_framework"
#
# Which is not the desired the lookup. You can change it by providing the
# :as option:
@@ -102,7 +102,7 @@ module Rails
#
# And now it will lookup at:
#
- # "test_unit:controller", "test_unit"
+ # "test_framework:controller", "test_framework"
#
# Similarly, if you want it to also lookup in the rails namespace, you just
# need to provide the :base value:
@@ -113,7 +113,7 @@ module Rails
#
# And the lookup is exactly the same as previously:
#
- # "rails:test_unit", "test_unit:controller", "test_unit"
+ # "rails:test_framework", "test_framework:controller", "test_framework"
#
# ==== Switches
#