Merge branch '6.4' into 7.0

* 6.4:
  Clearer difference with max and quiet options
  [Lock] small typo

Author: javiereguiluz

components/lock.rst

@@ -921,7 +921,7 @@ have synchronized clocks.
 PostgreSqlStore
 ~~~~~~~~~~~~~~~
 
-The PdoStore relies on the `Advisory Locks`_ properties of the PostgreSQL
+The PostgreSqlStore relies on the `Advisory Locks`_ properties of the PostgreSQL
 database. That means that by using :ref:`PostgreSqlStore <lock-store-pgsql>`
 the locks will be automatically released at the end of the session in case the
 client cannot unlock for any reason.

components/phpunit_bridge.rst

@@ -215,6 +215,8 @@ message, enclosed with ``/``. For example, with:
 `PHPUnit`_ will stop your test suite once a deprecation notice is triggered whose
 message contains the ``"foobar"`` string.
 
+.. _making-tests-fail:
+
 Making Tests Fail
 ~~~~~~~~~~~~~~~~~
 
@@ -349,6 +351,10 @@ It's also possible to change verbosity per deprecation type. For example, using
 ``quiet[]=indirect&quiet[]=other`` will hide details for deprecations of types
 "indirect" and "other".
 
+The ``quiet`` option hides details for the specified deprecation types, but will
+not change the outcome in terms of exit code. That's what :ref:`max <making-tests-fail>`
+is for, and both settings are orthogonal.
+
 Disabling the Deprecation Helper
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~