Skip to content

Commit

Permalink
Merge branch '2.7' into 2.8
Browse files Browse the repository at this point in the history
* 2.7:
  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
  • Loading branch information
weaverryan committed Jul 15, 2015
2 parents 8fadb17 + 4561c17 commit 7c967ed
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion book/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ based on `Composer`_.

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

Installing Composer Globally
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
7 changes: 7 additions & 0 deletions components/console/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,13 @@ verbosity levels::
// ...
}

.. note::

These semantic methods are defined in the ``OutputInterface`` starting from
Symfony 3.0. In previous Symfony versions they are defined in the different
implementations of the interface (e.g. :class:`Symfony\\Component\\Console\\Output\\Output`)
in order to keep backwards compatibility.

When the quiet level is used, all output is suppressed as the default
:method:`Symfony\\Component\\Console\\Output\\Output::write` method returns
without actually printing.
Expand Down
10 changes: 10 additions & 0 deletions cookbook/email/gmail.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,13 @@ You're done!

The ``gmail`` transport is simply a shortcut that uses the ``smtp`` transport
and sets ``encryption``, ``auth_mode`` and ``host`` to work with Gmail.

.. note::

Depending on your Gmail account settings, you may get authentication errors
within your app. If your Gmail account uses 2-Step-Verification, you should
`generate an App password`_ to use for your ``mailer_password`` parameter.
You should also ensure that you `allow less secure apps to access your Gmail account`_.

.. _`generate an App password`: https://support.google.com/accounts/answer/185833
.. _`allow less secure apps to access your Gmail account`: https://support.google.com/accounts/answer/6010255
2 changes: 1 addition & 1 deletion create_framework/routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ With this knowledge in mind, let's write the new version of our framework::

$response->send();

There are a few new things in the code::
There are a few new things in the code:

* Route names are used for template names;

Expand Down

0 comments on commit 7c967ed

Please sign in to comment.