Merge branch '5.4' into 6.0

* 5.4:
  Fix bugs seen by `_build/build.php` diagnostics in 5.4
  Restore the contents directive
  Fix bugs seen by `_build/build.php` diagnostics in 4.4
  Add missing symfony server reference

Author: javiereguiluz

components/lock.rst

@@ -340,20 +340,20 @@ Locks are created and managed in ``Stores``, which are classes that implement
 
 The component includes the following built-in store types:
 
-=========================================================  ======  ========  ======== =======
-Store                                                      Scope   Blocking  Expiring Sharing
-=========================================================  ======  ========  ======== =======
-:ref:`FlockStore <lock-store-flock>`                       local   yes       no       yes
-:ref:`MemcachedStore <lock-store-memcached>`               remote  no        yes      no
-:ref:`MongoDbStore <lock-store-mongodb>`                   remote  no        yes      no
-:ref:`PdoStore <lock-store-pdo>`                           remote  no        yes      no
-:ref:`DoctrineDbalStore <lock-store-dbal>`                 remote  no        yes      no
-:ref:`PostgreSqlStore <lock-store-pgsql>`                  remote  yes       no       yes
-:ref:`DoctrineDbalPostgreSqlStore <lock-store-dbal-pgsql>` remote  yes       no       yes
-:ref:`RedisStore <lock-store-redis>`                       remote  no        yes      yes
-:ref:`SemaphoreStore <lock-store-semaphore>`               local   yes       no       no
-:ref:`ZookeeperStore <lock-store-zookeeper>`               remote  no        no       no
-=========================================================  ======  ========  ======== =======
+==========================================================  ======  ========  ======== =======
+Store                                                       Scope   Blocking  Expiring Sharing
+==========================================================  ======  ========  ======== =======
+:ref:`FlockStore <lock-store-flock>`                        local   yes       no       yes
+:ref:`MemcachedStore <lock-store-memcached>`                remote  no        yes      no
+:ref:`MongoDbStore <lock-store-mongodb>`                    remote  no        yes      no
+:ref:`PdoStore <lock-store-pdo>`                            remote  no        yes      no
+:ref:`DoctrineDbalStore <lock-store-dbal>`                  remote  no        yes      no
+:ref:`PostgreSqlStore <lock-store-pgsql>`                   remote  yes       no       yes
+:ref:`DoctrineDbalPostgreSqlStore <lock-store-dbal-pgsql>`  remote  yes       no       yes
+:ref:`RedisStore <lock-store-redis>`                        remote  no        yes      yes
+:ref:`SemaphoreStore <lock-store-semaphore>`                local   yes       no       no
+:ref:`ZookeeperStore <lock-store-zookeeper>`                remote  no        no       no
+==========================================================  ======  ========  ======== =======
 
 .. _lock-store-flock:
 

index.rst

@@ -70,9 +70,9 @@ Components
 .. toctree::
     :hidden:
 
-    components/index
+    components/
 
-Read the :doc:`Components </components/index>` documentation.
+Read the :doc:`Components </components/>` documentation.
 
 Reference Documents
 -------------------

reference/forms/types/enum.rst

@@ -5,7 +5,7 @@ EnumType Field
 ==============
 
 A multi-purpose field used to allow the user to "choose" one or more options
-defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </refernce/forms/types/enum>`
+defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </reference/forms/types/enum>`
 field and defines the same options.
 
 +---------------------------+----------------------------------------------------------------------+

setup/docker.rst

@@ -49,7 +49,7 @@ After installing the package, rebuild your containers by running:
 Symfony Binary Web Server and Docker Support
 --------------------------------------------
 
-If you're using the :ref:`symfony binary web server` (e.g. ``symfony server:start``),
+If you're using the :ref:`symfony binary web server <symfony-local-web-server>` (e.g. ``symfony server:start``),
 then it can automatically detect your Docker services and expose them as environment
 variables. See :ref:`symfony-server-docker`.