Skip to content

Commit 55a841d

Browse files
committed
Merge branch '2.8'
* 2.8: Reworded a note about BC Added a note about the implementation of the verbosity semantic methods Fixed some minor syntax issues. Reflect links correctly in gmail.rst Revisions to the gmail.rst doc Update gmail.rst Minor grammar fix. Fix RST
2 parents 2bb0d16 + 7c967ed commit 55a841d

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

Diff for: book/installation.rst

+1-1
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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Diff for: components/console/introduction.rst

+7
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,13 @@ verbosity levels::
223223
// ...
224224
}
225225

226+
.. note::
227+
228+
These semantic methods are defined in the ``OutputInterface`` starting from
229+
Symfony 3.0. In previous Symfony versions they are defined in the different
230+
implementations of the interface (e.g. :class:`Symfony\\Component\\Console\\Output\\Output`)
231+
in order to keep backwards compatibility.
232+
226233
When the quiet level is used, all output is suppressed as the default
227234
:method:`Symfony\\Component\\Console\\Output\\Output::write` method returns
228235
without actually printing.

Diff for: cookbook/email/gmail.rst

+10
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

Diff for: create_framework/routing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ With this knowledge in mind, let's write the new version of our framework::
158158

159159
$response->send();
160160

161-
There are a few new things in the code::
161+
There are a few new things in the code:
162162

163163
* Route names are used for template names;
164164

0 commit comments

Comments
 (0)