Commit1f8f8af

committed

Merge branch '2.3' into 2.6

* 2.3: Fixed some minor syntax issues. Reflect links correctly in gmail.rst Revisions to the gmail.rst doc Update gmail.rst Minor grammar fix.

2 parents9f8630a +8cec82b commit1f8f8afCopy full SHA for 1f8f8af

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -127,7 +127,7 @@ based on `Composer`_.
`127`	`127`
`128`	`128`	`Composer is the dependency manager used by modern PHP applications and it can`
`129`	`129`	`also be used to create new applications based on the Symfony Framework. If you`
`130`		`-don't haveinstalled it globally, start by reading the next section.`
	`130`	`+don't haveit installed globally, start by reading the next section.`
`131`	`131`
`132`	`132`	`Installing Composer Globally`
`133`	`133`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,3 +75,13 @@ You're done!`
`75`	`75`
`76`	`76`	The ``gmail`` transport is simply a shortcut that uses the ``smtp`` transport
`77`	`77`	and sets ``encryption``, ``auth_mode`` and ``host`` to work with Gmail.
	`78`	`+`
	`79`	`+..note::`
	`80`	`+`
	`81`	`+ Depending on your Gmail account settings, you may get authentication errors`
	`82`	`+ within your app. If your Gmail account uses 2-Step-Verification, you should`
	`83`	+ `generate an App password`_ to use for your ``mailer_password`` parameter.
	`84`	+ You should also ensure that you `allow less secure apps to access your Gmail account`_.
	`85`	`+`
	`86`	+.. _`generate an App password`:https://support.google.com/accounts/answer/185833
	`87`	+.. _`allow less secure apps to access your Gmail account`:https://support.google.com/accounts/answer/6010255

Comments

(0)