diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a8b3c79e01..ff1b0c111f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -464,7 +464,7 @@ module ActionMailer # custom delivery job. Defaults to +ActionMailer::MailDeliveryJob+. # # * deliver_later_queue_name - The queue name used by deliver_later with the default - # delivery_job. Mailers can set this to use a custom queue. Defaults to :mailers. + # delivery_job. Mailers can set this to use a custom queue name. class Base < AbstractController::Base include DeliveryMethods include QueuedDelivery diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index b4a61fe55f..207e619423 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -63,7 +63,7 @@ def processed? # * :priority - Enqueues the email with the specified priority # # By default, the email will be enqueued using ActionMailer::MailDeliveryJob on - # the +:mailers+ queue. Mailer classes can customize the queue name used for the default + # the default queue. Mailer classes can customize the queue name used for the default # job by assigning a +deliver_later_queue_name+ class variable, or provide a custom job # by assigning a +delivery_job+. When a custom job is used, it controls the queue name. # @@ -90,7 +90,7 @@ def deliver_later!(options = {}) # * :priority - Enqueues the email with the specified priority # # By default, the email will be enqueued using ActionMailer::MailDeliveryJob on - # the +:mailers+ queue. Mailer classes can customize the queue name used for the default + # the default queue. Mailer classes can customize the queue name used for the default # job by assigning a +deliver_later_queue_name+ class variable, or provide a custom job # by assigning a +delivery_job+. When a custom job is used, it controls the queue name. # diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md index 7f1071f298..dc2c3042a5 100644 --- a/guides/source/action_mailer_basics.md +++ b/guides/source/action_mailer_basics.md @@ -818,7 +818,7 @@ files (environment.rb, production.rb, etc...) |`perform_deliveries`|Determines whether deliveries are actually carried out when the `deliver` method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing. If this value is `false`, `deliveries` array will not be populated even if `delivery_method` is `:test`.| |`deliveries`|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.| |`delivery_job`|The job class used with `deliver_later`. Defaults to `ActionMailer::MailDeliveryJob`.| -|`deliver_later_queue_name`|The name of the queue used with the default `delivery_job`. Defaults to `:mailers`| +|`deliver_later_queue_name`|The name of the queue used with the default `delivery_job`. Defaults to the default Active Job queue.| |`default_options`|Allows you to set default values for the `mail` method options (`:from`, `:reply_to`, etc.).| For a complete writeup of possible configurations see the