Merge branch '5.4' into 6.0

* 5.4:
  [Form] Fix comments
  [docs] typofixes

Author: javiereguiluz

components/cache/adapters/couchbasebucket_adapter.rst

@@ -1,6 +1,6 @@
 .. index::
     single: Cache Pool
-    single: Couchabase Cache
+    single: Couchbase Cache
 
 .. _couchbase-adapter:
 
@@ -56,7 +56,7 @@ helper method allows creating and configuring a `Couchbase Bucket`_ class instan
         'couchbase://localhost'
         // the DSN can include config options (pass them as a query string):
         // 'couchbase://localhost:11210?operationTimeout=10'
-        // 'couchbase://localhost:11210?operationTimeout=10&configTimout=20'
+        // 'couchbase://localhost:11210?operationTimeout=10&configTimeout=20'
     );
 
     // pass an array of DSN strings to register multiple servers with the client

components/serializer.rst

@@ -988,7 +988,7 @@ Option                  Description                                            D
                         and ``$options = ['csv_headers' => ['a', 'b', 'c']]``
                         then ``serialize($data, 'csv', $options)`` returns
                         ``a,b,c\n1,2,3``                                       ``[]``, inferred from input data's keys
-``csv_escape_formulas`` Escapes fields containg formulas by prepending them    ``false``
+``csv_escape_formulas`` Escapes fields containing formulas by prepending them  ``false``
                         with a ``\t`` character
 ``as_collection``       Always returns results as a collection, even if only   ``true``
                         one line is decoded.

form/create_form_type_extension.rst

@@ -35,11 +35,11 @@ First, create the form type extension class extending from
     class ImageTypeExtension extends AbstractTypeExtension
     {
         /**
-         * Return the class of the type being extended.
+         * Returns an array of extended types.
          */
         public static function getExtendedTypes(): iterable
         {
-            // return FormType::class to modify (nearly) every field in the system
+            // return [FormType::class] to modify (nearly) every field in the system
             return [FileType::class];
         }
     }
@@ -145,7 +145,7 @@ For example::
     {
         public static function getExtendedTypes(): iterable
         {
-            // return FormType::class to modify (nearly) every field in the system
+            // return [FormType::class] to modify (nearly) every field in the system
             return [FileType::class];
         }
 

session.rst

@@ -131,7 +131,7 @@ Check out the Symfony config reference to learn more about the other available
 Basic Usage
 -----------
 
-The sessions is available througth the Request and the RequestStack.
+The sessions is available through the Request and the RequestStack.
 Symfony provides a request_stack service that is injected in your services and
 controllers if you type-hint an argument with
 :class:`Symfony\\Component\\HttpFoundation\\RequestStack`::