Merge branch '6.0' into 6.1

* 6.0:
  minor #17325 Fix typo (cafferata)
  Change 'ignore' element to attribute in Serializer XML example

Author: javiereguiluz

components/serializer.rst

@@ -468,9 +468,7 @@ Option 1: Using ``@Ignore`` Annotation
                 https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
         >
             <class name="App\Model\MyClass">
-                <attribute name="bar">
-                    <ignore>true</ignore>
-                </attribute>
+                <attribute name="bar" ignore="true"/>
             </class>
         </serializer>
 

components/string.rst

@@ -301,7 +301,7 @@ Methods to Pad and Trim
     u('template.html.twig')->trimSuffix('.html');            // 'template.html.twig'
     u('template.html.twig')->trimSuffix('.twig');            // 'template.html'
     u('template.html.twig')->trimSuffix('.html.twig');       // 'template'
-    // when passing an array of prefix/sufix, only the first one found is trimmed
+    // when passing an array of prefix/suffix, only the first one found is trimmed
     u('file-image-0001.png')->trimPrefix(['file-', 'image-']); // 'image-0001.png'
     u('template.html.twig')->trimSuffix(['.twig', '.html']);   // 'template.html'