1 files changed, 10 insertions, 14 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index e9966c7ff5..19408f2a48 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -544,9 +544,9 @@ module ActionMailer
         end
       end
 
-    protected
+    private
 
-      def set_payload_for_mail(payload, mail) #:nodoc:
+      def set_payload_for_mail(payload, mail)
         payload[:mailer]     = name
         payload[:message_id] = mail.message_id
         payload[:subject]    = mail.subject
@@ -558,7 +558,7 @@ module ActionMailer
         payload[:mail]       = mail.encoded
       end
 
-      def method_missing(method_name, *args) # :nodoc:
+      def method_missing(method_name, *args)
         if action_methods.include?(method_name.to_s)
           MessageDelivery.new(self, method_name, *args)
         else
@@ -566,9 +566,7 @@ module ActionMailer
         end
       end
 
-    private
-
-      def respond_to_missing?(method, include_all = false) #:nodoc:
+      def respond_to_missing?(method, include_all = false)
         action_methods.include?(method.to_s)
       end
     end
@@ -601,7 +599,7 @@ module ActionMailer
       def body; "" end
       def header; {} end
 
-      def respond_to?(string, include_all=false)
+      def respond_to?(string, include_all = false)
         true
       end
 
@@ -830,7 +828,7 @@ module ActionMailer
       message
     end
 
-    protected
+    private
 
       # Used by #mail to set the content type of the message.
       #
@@ -841,7 +839,7 @@ module ActionMailer
       # If there is no content type passed in via headers, and there are no
       # attachments, or the message is multipart, then the default content type is
       # used.
-      def set_content_type(m, user_content_type, class_default)
+      def set_content_type(m, user_content_type, class_default) # :doc:
         params = m.content_type_parameters || {}
         case
         when user_content_type.present?
@@ -863,18 +861,16 @@ module ActionMailer
       # If it does not find a translation for the +subject+ under the specified scope it will default to a
       # humanized version of the <tt>action_name</tt>.
       # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
-      def default_i18n_subject(interpolations = {})
+      def default_i18n_subject(interpolations = {}) # :doc:
         mailer_scope = self.class.mailer_name.tr("/", ".")
         I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
       end
 
       # Emails do not support relative path links.
-      def self.supports_path?
+      def self.supports_path? # :doc:
         false
       end
 
-    private
-
       def apply_defaults(headers)
         default_values = self.class.default.map do |key, value|
           [
@@ -933,7 +929,7 @@ module ActionMailer
 
       def create_parts_from_responses(m, responses)
         if responses.size == 1 && !m.has_attachments?
-          responses[0].each { |k,v| m[k] = v }
+          responses[0].each { |k, v| m[k] = v }
         elsif responses.size > 1 && m.has_attachments?
           container = Mail::Part.new
           container.content_type = "multipart/alternative"