Merge branch '5.2' into 5.x

* 5.2:
  Fix typo
  [Uid] Fix typos

Author: javiereguiluz

components/uid.rst

@@ -204,7 +204,7 @@ of the UUID parameters::
         {
             $qb = $this->createQueryBuilder('p')
                 // ...
-                // add 'uuid' as the third argument to tell Doctrine that this is an UUID
+                // add 'uuid' as the third argument to tell Doctrine that this is a UUID
                 ->setParameter('user', $user->getUuid(), 'uuid')
 
                 // alternatively, you can convert it to a value compatible with
@@ -358,7 +358,7 @@ of the ULID parameters::
         {
             $qb = $this->createQueryBuilder('p')
                 // ...
-                // add 'ulid' as the third argument to tell Doctrine that this is an ULID
+                // add 'ulid' as the third argument to tell Doctrine that this is a ULID
                 ->setParameter('user', $user->getUlid(), 'ulid')
 
                 // alternatively, you can convert it to a value compatible with

configuration/secrets.rst

@@ -208,9 +208,9 @@ Listing the secrets will now also display the local variable:
       DATABASE_PASSWORD   "dev value"   "root"
      ------------------- ------------- -------------
 
-Symfony also provides the ``secrets:decrypt-to-local`` command to decrypts
-all secrets and stores them in the local vault and ``secrets:encrypt-from-local``
-to encrypt all local secrets to the vault.
+Symfony also provides the ``secrets:decrypt-to-local`` command which decrypts
+all secrets and stores them in the local vault and the ``secrets:encrypt-from-local``
+command to encrypt all local secrets to the vault.
 
 Secrets in the test Environment
 -------------------------------