Merge branch '6.4' into 7.0

* 6.4:
  [Format] Add `tabs` directive
  fix typo

Author: javiereguiluz

configuration.rst

@@ -847,7 +847,7 @@ by default, so you must register first in your services:
             - '%kernel.project_dir%/.env'
             - '%kernel.environment%'
 
-In PHP >= 8, you can remove the the two arguments when autoconfiguration is enabled
+In PHP >= 8, you can remove the two arguments when autoconfiguration is enabled
 (which is the default):
 
 .. code-block:: yaml

contributing/documentation/format.rst

@@ -124,6 +124,31 @@ Markup Format        Use It to Display
 ``php-standalone``   PHP code to be used in any PHP application using standalone Symfony components
 ===================  ==============================================================================
 
+Displaying Tabs
+~~~~~~~~~~~~~~~
+
+It is possible to display tabs in the documentation. They look similar to
+configuration blocks when rendered, but tabs can hold any type of content:
+
+.. code-block:: rst
+
+    .. tabs:: UX Installation
+
+        .. tab:: Webpack Encore
+
+            Introduction to Webpack
+
+            .. code-block:: yaml
+
+                webpack:
+                    # ...
+
+        .. tab:: AssetMapper
+
+            Introduction to AssetMapper
+
+            Something else about AssetMapper
+
 Adding Links
 ~~~~~~~~~~~~