aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/action_mailer_basics.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-02-26 21:53:38 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-02-26 21:53:38 +0530
commit7184e3e02ecd155cb26f4755dab980f2ce6582d2 (patch)
tree04cb126b730c7fd98cb37ce68adb5320481db9af /guides/source/action_mailer_basics.md
parentb1dee8c2535b2bca6ebe69d18c24d29f9ba19470 (diff)
parentb21a73d02576b7cd5ec88193065b3aa21c2d2407 (diff)
downloadrails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.tar.gz
rails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.tar.bz2
rails-7184e3e02ecd155cb26f4755dab980f2ce6582d2.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/action_mailer_basics.md')
-rw-r--r--guides/source/action_mailer_basics.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md
index 513ae1272f..a5058aa749 100644
--- a/guides/source/action_mailer_basics.md
+++ b/guides/source/action_mailer_basics.md
@@ -116,7 +116,7 @@ Setting this up is painfully simple.
First off, we need to create a simple `User` scaffold:
```bash
-$ rails generate scaffold user name:string email:string login:string
+$ rails generate scaffold user name email login
$ rake db:migrate
```
@@ -447,7 +447,7 @@ end
Action Mailer Callbacks
---------------------------
-Action Mailer allows for you to specify a `before_action`, `after_action` and 'around_action'.
+Action Mailer allows for you to specify a `before_action`, `after_action` and `around_action`.
* Filters can be specified with a block or a symbol to a method in the mailer class similar to controllers.