Skip to content

Commit 1f8f8af

Browse files
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 parents 9f8630a + 8cec82b commit 1f8f8af

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ based on `Composer`_.
127127

128128
Composer is the dependency manager used by modern PHP applications and it can
129129
also be used to create new applications based on the Symfony Framework. If you
130-
don't have installed it globally, start by reading the next section.
130+
don't have it installed globally, start by reading the next section.
131131

132132
Installing Composer Globally
133133
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cookbook/email/gmail.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,13 @@ You're done!
7575

7676
The ``gmail`` transport is simply a shortcut that uses the ``smtp`` transport
7777
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

0 commit comments

Comments
 (0)