diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-04-04 02:43:12 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-04-04 02:43:12 +0530 |
| commit | 4ac719686c0075b6ad6896becfe0f058efdb97ff (patch) | |
| tree | 6255a8fc483436dc0fc89c0a2bc2755a51ecc329 /actionmailer | |
| parent | 4c76f6894889e8e3f5cc3722d928954c79422542 (diff) | |
| parent | 3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (diff) | |
| download | rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.tar.gz rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.tar.bz2 rails-4ac719686c0075b6ad6896becfe0f058efdb97ff.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionmailer/actionmailer.gemspec | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index 0fa18d751b..14d20bb08d 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -32,7 +32,7 @@ This can be as simple as: end The body of the email is created by using an Action View template (regular -ERb) that has the instance variables that are declared in the mailer action. +ERB) that has the instance variables that are declared in the mailer action. So the corresponding body template for the method above could look like this: diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 2ae85f8b57..ee02cf6945 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -17,8 +17,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.has_rdoc = true - s.add_dependency('actionpack', version) s.add_dependency('mail', '~> 2.2.15') end |