diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-16 21:05:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-16 21:49:50 -0300 |
| commit | 99cdad6d9c06ff11770390c2ff01d69a1259066f (patch) | |
| tree | 3d1df9058826246aa98405d561c45a0e4c1990fe | |
| parent | 7c32db180f9ae9363303a1bb96f892a10092c94a (diff) | |
| download | rails-99cdad6d9c06ff11770390c2ff01d69a1259066f.tar.gz rails-99cdad6d9c06ff11770390c2ff01d69a1259066f.tar.bz2 rails-99cdad6d9c06ff11770390c2ff01d69a1259066f.zip | |
Fix typo [ci skip]
| -rw-r--r-- | actionmailer/lib/action_mailer/preview.rb | 2 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb index fde0e86f5b..33a9faa7e7 100644 --- a/actionmailer/lib/action_mailer/preview.rb +++ b/actionmailer/lib/action_mailer/preview.rb @@ -20,7 +20,7 @@ module ActionMailer interceptors.flatten.compact.each { |interceptor| register_preview_interceptor(interceptor) } end - # Register am Interceptor which will be called before mail is previewed. + # Register an Interceptor which will be called before mail is previewed. # Either a class or a string can be passed in as the Interceptor. If a # string is passed in it will be <tt>constantize</tt>d. def register_preview_interceptor(interceptor) diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 83347b4a26..e49a0f1323 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -763,7 +763,7 @@ * Raise `ActiveRecord::RecordNotDestroyed` when a replaced child marked with `dependent: destroy` fails to be destroyed. - Fixex #12812. + Fixes #12812. *Brian Thomas Storti* |