Merge branch '4.4' into 5.2

* 4.4: [DomCrawler] Clarify the ways to add contents [HttpFoundation] Fix IpUtils example
zozs · Apr 12, 2021 · 607ec30 · 607ec30
2 parents 35d498f + a370d63
commit 607ec30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -269,7 +269,9 @@ context of the crawler::
 Adding the Content
 ~~~~~~~~~~~~~~~~~~
 
-The crawler supports multiple ways of adding the content::
+The crawler supports multiple ways of adding the content, but they are mutually
+exclusive, so you can only use one of them to add content (e.g. if you pass the
+content to the ``Crawler`` constructor, you can't call ``addContent()`` later)::
 
     $crawler = new Crawler('<html><body/></html>');
 

diff --git a/components/http_foundation.rst b/components/http_foundation.rst
@@ -346,11 +346,11 @@ analysis purposes. Use the ``anonymize()`` method from the
     use Symfony\Component\HttpFoundation\IpUtils;
 
     $ipv4 = '123.234.235.236';
-    $anonymousIpv4 = IPUtils::anonymize($ipv4);
+    $anonymousIpv4 = IpUtils::anonymize($ipv4);
     // $anonymousIpv4 = '123.234.235.0'
 
     $ipv6 = '2a01:198:603:10:396e:4789:8e99:890f';
-    $anonymousIpv6 = IPUtils::anonymize($ipv6);
+    $anonymousIpv6 = IpUtils::anonymize($ipv6);
     // $anonymousIpv6 = '2a01:198:603:10::'
 
 Accessing other Data