Merge branch '5.4' into 6.0

* 5.4:
  Minor reword
  [Mailer] Remove duplicate semicolon
  Update symfony_server.rst
  [Finder] Add note about .gitignore rules precedence

Author: javiereguiluz

components/finder.rst

@@ -148,6 +148,15 @@ can reuse those rules to exclude files and directories from the results with the
     // excludes files/directories matching the .gitignore patterns
     $finder->ignoreVCSIgnored(true);
 
+The rules of a directory always override the rules of its parent directories.
+
+.. note::
+
+    Git looks for ``.gitignore`` files starting from the repository root directory.
+    Symfony's Finder behavior is different and it looks for ``.gitignore`` files
+    starting from the directory used to search files/directories. To be consistent
+    with Git behavior, you should explicitly search from the Git repository root.
+
 File Name
 ~~~~~~~~~
 

mailer.rst

@@ -379,7 +379,7 @@ header, etc.) but most of the times you'll set text headers::
         ->getHeaders()
             // this header tells auto-repliers ("email holiday mode") to not
             // reply to this message because it's an automated email
-            ->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply');
+            ->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply')
 
         // ...
     ;

setup/symfony_server.rst

@@ -114,10 +114,10 @@ root directory:
     $ cd my-project/
 
     # use a specific PHP version
-    $ echo 7.2 > .php-version
+    $ echo 7.4 > .php-version
 
-    # use any PHP 7.x version available
-    $ echo 7 > .php-version
+    # use any PHP 8.x version available
+    $ echo 8 > .php-version
 
 .. tip::