aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/rails/generators
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-10-10 19:21:11 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-10-10 19:21:11 +0200
commitaffd05d28b3fbd0f6cbbf6e6823e352405f4fd34 (patch)
tree7aa8a2cb20a95aabdad56b9d8aa5845a8056a5b8 /actionmailer/lib/rails/generators
parent1fc795468525d8622cdca474a54c8310a514aa46 (diff)
parentbadc39fb2fed4d100d2a11fa9a1a2c84c6c33df6 (diff)
downloadrails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.tar.gz
rails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.tar.bz2
rails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer/lib/rails/generators')
-rw-r--r--actionmailer/lib/rails/generators/mailer/USAGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index 9f1d6b182e..7470289fd3 100644
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
@@ -13,6 +13,6 @@ Example:
creates a Notifications mailer class, views, test, and fixtures:
Mailer: app/mailers/notifications.rb
Views: app/views/notifications/signup.erb [...]
- Test: test/functional/notifications_test.rb
+ Test: test/mailers/notifications_test.rb
Fixtures: test/fixtures/notifications/signup [...]