Merge branch '2.6' into 2.7

weaverryan · weaverryan · commit 4561c172caf6 · 2015-07-14T21:00:26.000-04:00
* 2.6:
  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.
diff --git a/book/installation.rst b/book/installation.rst
@@ -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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -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.
diff --git a/cookbook/email/gmail.rst b/cookbook/email/gmail.rst
@@ -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
