Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit b33e01d28eb2 · 2019-06-14T15:32:48.000+02:00
* 3.4:
  Uncomment code and add info
diff --git a/email.rst b/email.rst
@@ -73,16 +73,15 @@ sending an email is pretty straightforward::
                 ),
                 'text/html'
             )
-            /*
-             * If you also want to include a plaintext version of the message
+
+            // you can remove the following code if you don't define a text version for your emails
             ->addPart(
                 $this->renderView(
                     'emails/registration.txt.twig',
                     ['name' => $name]
                 ),
                 'text/plain'
             )
-            */
         ;
 
         $mailer->send($message);

Original file line number	Diff line number	Diff line change
`@@ -73,16 +73,15 @@ sending an email is pretty straightforward::`
`73`	`73`	`),`
`74`	`74`	`'text/html'`
`75`	`75`	`)`
`76`		`- /*`
`77`		`- * If you also want to include a plaintext version of the message`
	`76`	`+`
	`77`	`+ // you can remove the following code if you don't define a text version for your emails`
`78`	`78`	`->addPart(`
`79`	`79`	`$this->renderView(`
`80`	`80`	`'emails/registration.txt.twig',`
`81`	`81`	`['name' => $name]`
`82`	`82`	`),`
`83`	`83`	`'text/plain'`
`84`	`84`	`)`
`85`		`- */`
`86`	`85`	`;`
`87`	`86`
`88`	`87`	`$mailer->send($message);`