Merge branch '5.1' into 5.2

* 5.1:
  Update lock.rst
  Update testing.rst

Author: javiereguiluz

components/lock.rst

@@ -165,7 +165,7 @@ method, the resource will stay locked until the timeout::
 
 .. tip::
 
-    To avoid letting the lock in a locking state, it's recommended to wrap the
+    To avoid leaving the lock in a locked state, it's recommended to wrap the
     job in a try/catch/finally block to always try to release the expiring lock.
 
 In case of long-running tasks, it's better to start with a not too long TTL and

testing.rst

@@ -63,7 +63,7 @@ If you want to test an entire feature of your application (e.g. registering as a
 user or generating an invoice), see the section about :ref:`Functional Tests <functional-tests>`.
 
 Writing Symfony unit tests is no different from writing standard PHPUnit
-unit tests. Suppose, for example, that you have an class called ``Calculator``
+unit tests. Suppose, for example, that you have a class called ``Calculator``
 in the ``src/Util/`` directory of the app::
 
     // src/Util/Calculator.php