Merge pull request #22619 from akshay-vishnoi/grammar-fixes

[ci skip] Fix grammar and sentence framing

1 files changed, 6 insertions, 6 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index cbbf480da8..bb3cb1be45 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -658,18 +658,18 @@ module ActionMailer
     #
     #  mail.attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
     #
-    # If you do this, then Mail will take the file name and work out the mime type
-    # set the Content-Type, Content-Disposition, Content-Transfer-Encoding and
-    # base64 encode the contents of the attachment all for you.
+    # If you do this, then Mail will take the file name and work out the mime type.
+    # It will also set the Content-Type, Content-Disposition, Content-Transfer-Encoding
+    # and encode the contents of the attachment in Base64.
     #
     # You can also specify overrides if you want by passing a hash instead of a string:
     #
     #  mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip',
     #                                      content: File.read('/path/to/filename.jpg')}
     #
-    # If you want to use a different encoding than Base64, you can pass an encoding in,
-    # but then it is up to you to pass in the content pre-encoded, and don't expect
-    # Mail to know how to decode this data:
+    # If you want to use encoding other than Base64 then you will need to pass encoding
+    # type along with the pre-encoded content as Mail doesn't know how to decode the
+    # data:
     #
     #  file_content = SpecialEncode(File.read('/path/to/filename.jpg'))
     #  mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip',