diff options
| author | Zachary Scott <zachary@zacharyscott.net> | 2014-02-23 20:19:15 +1100 |
|---|---|---|
| committer | Zachary Scott <zachary@zacharyscott.net> | 2014-02-23 20:24:23 +1100 |
| commit | f302079d97b5c139b56f1acd2d516be52351c4fe (patch) | |
| tree | fd38853bd92e8f63d86d39f3051ea88526880b68 | |
| parent | b91d76131b2dd5fbd4d73f6e1e925c9e6f9880f6 (diff) | |
| download | rails-f302079d97b5c139b56f1acd2d516be52351c4fe.tar.gz rails-f302079d97b5c139b56f1acd2d516be52351c4fe.tar.bz2 rails-f302079d97b5c139b56f1acd2d516be52351c4fe.zip | |
:scissors:
This commit also addresses rails/docrails#169 and rails/rails#14159
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index e425282fa8..67b64fe469 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -102,7 +102,7 @@ Example: ) if email.has_attachments? - email.attachments.each do |attachment| + email.attachments.each do |attachment| page.attachments.create({ file: attachment, description: email.subject }) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 18a41ba7a4..951a3e5fb5 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -94,7 +94,7 @@ module ActionMailer # Hi <%= @account.name %>, # Thanks for joining our service! Please check back often. # - # You can even use Action Pack helpers in these views. For example: + # You can even use Action View helpers in these views. For example: # # You got a new note! # <%= truncate(@note.body, length: 25) %> diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 18e64704f6..8b05cd6e11 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -74,7 +74,7 @@ module ActionDispatch # # domain: nil # Does not sets cookie domain. (default) # domain: :all # Allow the cookie for the top most level - # domain and subdomains. + # # domain and subdomains. # # * <tt>:expires</tt> - The time at which this cookie expires, as a \Time object. # * <tt>:secure</tt> - Whether this cookie is only transmitted to HTTPS servers. |