Merge branch '3.4' into 4.1

* 3.4:
  Clarify a sentence
  Update serializer.rst
  Fix typos and improve wording for the Lock component documentation

Author: javiereguiluz

components/http_kernel.rst

@@ -549,7 +549,7 @@ below for more details).
     There are two main listeners to ``kernel.exception`` when using the
     Symfony Framework.
 
-    **ExceptionListener in HttpKernel**
+    **ExceptionListener in the HttpKernel Component**
 
     The first comes core to the HttpKernel component
     and is called :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener`.
@@ -578,7 +578,7 @@ below for more details).
        controller to render is passed as a constructor argument to this listener.
        This controller will return the final ``Response`` for this error page.
 
-    **ExceptionListener in Security**
+    **ExceptionListener in the Security Component**
 
     The other important listener is the
     :class:`Symfony\\Component\\Security\\Http\\Firewall\\ExceptionListener`.

components/lock.rst

@@ -106,7 +106,7 @@ with the ``release()`` method.
 
 The trickiest part when working with expiring locks is choosing the right TTL.
 If it's too short, other processes could acquire the lock before finishing the
-job; it it's too long and the process crashes before calling the ``release()``
+job; if it's too long and the process crashes before calling the ``release()``
 method, the resource will stay locked until the timeout::
 
     // ...
@@ -388,8 +388,8 @@ Some file systems (such as some types of NFS) do not support locking.
     always be locked on the same machine or to use a well configured shared file
     system.
 
-Files on file system can be removed during a maintenance operation. For instance
-to cleanup the ``/tmp`` directory or after a reboot of the machine when directory
+Files on the file system can be removed during a maintenance operation. For instance,
+to clean up the ``/tmp`` directory or after a reboot of the machine when a directory
 uses tmpfs. It's not an issue if the lock is released when the process ended, but
 it is in case of ``Lock`` reused between requests.
 
@@ -418,7 +418,7 @@ needs space to add new items.
 
 .. caution::
 
-    Number of items stored in the Memcached must be under control. If it's not
+    The number of items stored in Memcached must be under control. If it's not
     possible, LRU should be disabled and Lock should be stored in a dedicated
     Memcached service away from Cache.
 

components/serializer.rst

@@ -185,7 +185,7 @@ when constructing the normalizer::
     $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
     $normalizer = new ObjectNormalizer($classMetadataFactory);
     $serializer = new Serializer([$normalizer]);
-    $person = $serializer->deserialize($data, 'Acme\Person', 'xml', [
+    $person = $serializer->deserialize($data, 'App\Model\Person', 'xml', [
         'allow_extra_attributes' => false,
     ]);