Merge branch '4.4' into 5.2

* 4.4:
  Tweak
  Fixed invalid alias definition in "Deprecating Service Aliases" YAML example
  [Mailer] fix ses+smtp credentials format
  Update workflow.rst

Author: javiereguiluz

mailer.rst

@@ -155,6 +155,7 @@ transport, but you can force to use one:
 This table shows the full list of available DSN formats for each third
 party provider:
 
+<<<<<<< HEAD
 ==================== ==================================================== =========================================== ========================================
  Provider             SMTP                                                 HTTP                                        API
 ==================== ==================================================== =========================================== ========================================
@@ -167,6 +168,18 @@ party provider:
  Sendgrid             sendgrid+smtp://KEY@default                          n/a                                         sendgrid+api://KEY@default
  Sendinblue           sendinblue+smtp://USERNAME:PASSWORD@default          n/a                                         sendinblue+api://KEY@default
 ==================== ==================================================== =========================================== ========================================
+=======
+==================== ========================================== =========================================== ========================================
+ Provider             SMTP                                       HTTP                                        API
+==================== ========================================== =========================================== ========================================
+ Amazon SES           ses+smtp://USERNAME:PASSWORD@default       ses+https://ACCESS_KEY:SECRET_KEY@default   ses+api://ACCESS_KEY:SECRET_KEY@default
+ Google Gmail         gmail+smtp://USERNAME:PASSWORD@default     n/a                                         n/a
+ Mailchimp Mandrill   mandrill+smtp://USERNAME:PASSWORD@default  mandrill+https://KEY@default                mandrill+api://KEY@default
+ Mailgun              mailgun+smtp://USERNAME:PASSWORD@default   mailgun+https://KEY:DOMAIN@default          mailgun+api://KEY:DOMAIN@default
+ Postmark             postmark+smtp://ID@default                 n/a                                         postmark+api://KEY@default
+ Sendgrid             sendgrid+smtp://KEY@default                n/a                                         sendgrid+api://KEY@default
+==================== ========================================== =========================================== ========================================
+>>>>>>> 4.4
 
 .. caution::
 

service_container/alias_private.rst

@@ -172,7 +172,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:
     .. code-block:: yaml
 
         app.mailer:
-            alias: '@App\Mail\PhpMailer'
+            alias: 'App\Mail\PhpMailer'
 
             # this outputs the following generic deprecation message:
             # Since acme/package 1.2: The "app.mailer" service alias is deprecated. You should stop using it, as it will be removed in the future

workflow.rst

@@ -240,7 +240,8 @@ Accessing the Workflow in a Class
 
 You can use the workflow inside a class by using
 :doc:`service autowiring </service_container/autowiring>` and using
-``camelCased workflow name + Workflow`` as parameter name::
+``camelCased workflow name + Workflow`` as parameter name. If it is a state
+machine type, use ``camelCased workflow name + StateMachine``::
 
     use App\Entity\BlogPost;
     use Symfony\Component\Workflow\WorkflowInterface;