Merge branch '5.4' into 6.4

* 5.4:
  add missing word
  Fix typo
  Add a short mention to apache-pack in the web server docs
  remove link to apc documentation

Author: javiereguiluz

components/dependency_injection/compilation.rst

@@ -150,7 +150,7 @@ will look like this::
         ],
     ]
 
-Whilst you can manually manage merging the different files, it is much better
+While you can manually manage merging the different files, it is much better
 to use :doc:`the Config component </components/config>` to
 merge and validate the config values. Using the configuration processing
 you could access the config value this way::

components/workflow.rst

@@ -75,7 +75,7 @@ Here's an example of using the workflow defined above::
 Initialization
 --------------
 
-If the property of your object is ``null`` and you want to set it with the
+If the marking property of your object is ``null`` and you want to set it with the
 ``initial_marking`` from the configuration, you can call the ``getMarking()``
 method to initialize the object property::
 

performance.rst

@@ -98,7 +98,7 @@ Use the OPcache Byte Code Cache
 OPcache stores the compiled PHP files to avoid having to recompile them for
 every request. There are some `byte code caches`_ available, but as of PHP
 5.5, PHP comes with `OPcache`_ built-in. For older versions, the most widely
-used byte code cache is `APC`_.
+used byte code cache is APC.
 
 .. _performance-use-preloading:
 
@@ -398,7 +398,6 @@ Learn more
 .. _`byte code caches`: https://en.wikipedia.org/wiki/List_of_PHP_accelerators
 .. _`OPcache`: https://www.php.net/manual/en/book.opcache.php
 .. _`Composer's autoloader optimization`: https://getcomposer.org/doc/articles/autoloader-optimization.md
-.. _`APC`: https://www.php.net/manual/en/book.apc.php
 .. _`APCu Polyfill component`: https://github.com/symfony/polyfill-apcu
 .. _`APCu PHP functions`: https://www.php.net/manual/en/ref.apcu.php
 .. _`cachetool`: https://github.com/gordalina/cachetool

setup/web_server_configuration.rst

@@ -95,6 +95,14 @@ directive to pass requests for PHP files to PHP FPM:
         CustomLog /var/log/apache2/project_access.log combined
     </VirtualHost>
 
+.. note::
+
+    If you are doing some quick tests with Apache, you can also run
+    ``composer require symfony/apache-pack``. This package creates an ``.htaccess``
+    file in the ``public/`` directory with the necessary rewrite rules needed to serve
+    the Symfony application. However, in production, it's recommended to move these
+    rules to the main Apache configuration file (as shown above) to improve performance.
+
 Nginx
 -----