diff options
| author | Zachary Scott <e@zzak.io> | 2014-05-26 16:45:50 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-05-26 16:45:50 -0700 |
| commit | 415ba0c323993924414fde9a23790f46e2deb259 (patch) | |
| tree | e3ff12f55c7c62e92096a1b322a6ddd113abc516 | |
| parent | 02d048d9262432fd866fd4b4b59a754770cd9596 (diff) | |
| download | rails-415ba0c323993924414fde9a23790f46e2deb259.tar.gz rails-415ba0c323993924414fde9a23790f46e2deb259.tar.bz2 rails-415ba0c323993924414fde9a23790f46e2deb259.zip | |
Pass through AM documentation re: 02d048d [ci skip]
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 9 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 652ce0b3d8..5852aeaec2 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -301,12 +301,13 @@ module ActionMailer # end # end # - # Callbacks in ActionMailer are implemented using AbstractController::Callbacks, so you - # can define and configure callbacks in the same manner that you would use callbacks in - # classes that inherit from ActionController::Base. + # Callbacks in Action Mailer are implemented using + # <tt>AbstractController::Callbacks</tt>, so you can define and configure + # callbacks in the same manner that you would use callbacks in classes that + # inherit from <tt>ActionController::Base</tt>. # # Note that unless you have a specific reason to do so, you should prefer using before_action - # rather than after_action in your ActionMailer classes so that headers are parsed properly. + # rather than after_action in your Action Mailer classes so that headers are parsed properly. # # = Previewing emails # diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index a98aec913f..06f80a8fdc 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,7 +1,8 @@ require_relative 'gem_version' module ActionMailer - # Returns the version of the currently loaded ActionMailer as a <tt>Gem::Version</tt> + # Returns the version of the currently loaded Action Mailer as a + # <tt>Gem::Version</tt>. def self.version gem_version end |