diff --git a/language-snippets.ent b/language-snippets.ent
index 4ba0f81d1826..86d703de5102 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -4753,6 +4753,18 @@ local: {
   </simpara>
 '>
 
+<!ENTITY uri.normalization '
+  <simpara>
+   Hexadecimal triplets are converted to uppercase, percent-encoded unreserved characters are decoded, and the scheme and host components are normalized to lowercase per RFC 3986.
+  </simpara>
+'>
+
+<!ENTITY uri.non-normalization '
+  <simpara>
+   Components are returned in their original form; hexadecimal triplets are not converted to uppercase, unreserved characters remain encoded, and case folding is not applied.
+  </simpara>
+'>
+
 <!-- UOPZ snippets -->
 
 <!ENTITY uopz.warn.removed.function-5-0-0 '<warning
diff --git a/reference/uri/uri.whatwg.urlvalidationerrortype.xml b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
index f2e58f029701..eb4bf52a071b 100644
--- a/reference/uri/uri.whatwg.urlvalidationerrortype.xml
+++ b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
@@ -105,7 +105,7 @@
 
      <enumitem>
       <enumidentifier>Ipv4InIpv6InvalidCodePoint</enumidentifier>
-      <enumitemdescription>An IPv6 address with IPv4 address syntax.</enumitemdescription>
+      <enumitemdescription>An IPv6 address with IPv4 address syntax: an IPv4 part contains an invalid code point.</enumitemdescription>
      </enumitem>
 
      <enumitem>
diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 0fecabee30e8..58b2aad53c9e 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized fragment component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com#%5bfoo%2db%61r%5d");
 
 echo $uri->getFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+%5Bfoo-bar%5D
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/gethost.xml b/reference/uri/uri/rfc3986/uri/gethost.xml
index 4a033e4bfea9..b1e5df80d806 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized host component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://ex%61mple.com");
 
 echo $uri->getHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getpassword.xml b/reference/uri/uri/rfc3986/uri/getpassword.xml
index a5a6d271745f..1a0ff8b8fff7 100644
--- a/reference/uri/uri/rfc3986/uri/getpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getpassword.xml
@@ -15,6 +15,7 @@
    Retrieves the normalized password part (the text after the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getpath.xml b/reference/uri/uri/rfc3986/uri/getpath.xml
index e302667ff34f..0e2a641a06d2 100644
--- a/reference/uri/uri/rfc3986/uri/getpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getpath.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized path component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r");
 
 echo $uri->getPath();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getport.xml b/reference/uri/uri/rfc3986/uri/getport.xml
index f62387858b9c..1e4f93e5bdb1 100644
--- a/reference/uri/uri/rfc3986/uri/getport.xml
+++ b/reference/uri/uri/rfc3986/uri/getport.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-rfc3986-uri.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getPort</refname>
-  <refpurpose>Retrieve the normalized port component</refpurpose>
+  <refpurpose>Retrieve the port component</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <void/>
   </methodsynopsis>
   <simpara>
-   Retrieves the normalized port component.
+   Retrieves the port component.
   </simpara>
  </refsect1>
 
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the normalized port component as an &integer; if the port component exists, &null; is returned otherwise.
+   Returns the port component as an &integer; if the port component exists, &null; is returned otherwise.
   </simpara>
  </refsect1>
 
@@ -35,10 +35,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com:443");
 
 echo $uri->getPort();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getquery.xml b/reference/uri/uri/rfc3986/uri/getquery.xml
index 2ae16d783772..3887289fb54e 100644
--- a/reference/uri/uri/rfc3986/uri/getquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getquery.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized query component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=b%61r");
 
 echo $uri->getQuery();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getrawfragment.xml b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
index f2e6256bfc3d..2d467387d9ac 100644
--- a/reference/uri/uri/rfc3986/uri/getrawfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) fragment component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=b%61r");
 
 echo $uri->getRawFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+foo=b%61r
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawhost.xml b/reference/uri/uri/rfc3986/uri/getrawhost.xml
index 66798f2af8e8..dc2e431a31f4 100644
--- a/reference/uri/uri/rfc3986/uri/getrawhost.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawhost.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) host component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://ex%61mple.com");
 
 echo $uri->getRawHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+ex%61mple.com
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawpassword.xml b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
index cbf4a8367347..1d5f5625d531 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
@@ -15,6 +15,7 @@
    Retrieves the raw (non-normalized) password part (the text after the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the raw (non-normalized) password as a &string; if the userinfo component contains a <literal>:</literal> character.
+   Returns the raw password as a &string; if the userinfo component contains a <literal>:</literal> character.
    An empty string is returned when the userinfo component doesn't contain a <literal>:</literal> character.
    &null; is returned when the userinfo component doesn't exist.
   </simpara>
@@ -38,16 +39,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getRawPassword();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-password
+p%61ssword
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawpath.xml b/reference/uri/uri/rfc3986/uri/getrawpath.xml
index 82779af66927..2a07926478d1 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpath.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) path component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r");
 
 echo $uri->getRawPath();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-/foo/bar
+/foo/b%61r
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawquery.xml b/reference/uri/uri/rfc3986/uri/getrawquery.xml
index 7b0323f79f27..342666617b81 100644
--- a/reference/uri/uri/rfc3986/uri/getrawquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawquery.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) query component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=b%61r");
 
 echo $uri->getRawQuery();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+foo=b%61r
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawscheme.xml b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
index ff6130f94537..26b822fc5481 100644
--- a/reference/uri/uri/rfc3986/uri/getrawscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) scheme component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("httpS://example.com");
 
 echo $uri->getRawScheme();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https
+httpS
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
index 57a32f30a165..7b0080c88848 100644
--- a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getRawUserInfo();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-user:password
+user:p%61ssword
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getrawusername.xml b/reference/uri/uri/rfc3986/uri/getrawusername.xml
index 5dff1a6903af..bf2e8fe17764 100644
--- a/reference/uri/uri/rfc3986/uri/getrawusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawusername.xml
@@ -15,6 +15,7 @@
    Retrieves the raw (non-normalized) username part (the text before the first <literal>:</literal> character)
    from userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the raw (non-normalized) username as a &string; if the userinfo component exists, &null; is returned otherwise.
+   Returns the raw username as a &string; if the userinfo component exists, &null; is returned otherwise.
   </simpara>
  </refsect1>
 
@@ -36,16 +37,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://us%65r:password@example.com");
 
 echo $uri->getRawUsername();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-user
+us%65r
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/getscheme.xml b/reference/uri/uri/rfc3986/uri/getscheme.xml
index 81ad886924a7..1bce56e0f24b 100644
--- a/reference/uri/uri/rfc3986/uri/getscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getscheme.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized scheme component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("httpS://example.com");
 
 echo $uri->getScheme();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getuserinfo.xml b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
index cd8cf4b9975e..1b4321ff67c5 100644
--- a/reference/uri/uri/rfc3986/uri/getuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getUserInfo();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/getusername.xml b/reference/uri/uri/rfc3986/uri/getusername.xml
index 717753632e8b..d3eca5ea32cd 100644
--- a/reference/uri/uri/rfc3986/uri/getusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getusername.xml
@@ -15,6 +15,7 @@
    Retrieves the normalized username part (the text before the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -36,10 +37,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://us%65r:password@example.com");
 
 echo $uri->getUsername();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/parse.xml b/reference/uri/uri/rfc3986/uri/parse.xml
index dfd03e2aebaa..80e68a4070a8 100644
--- a/reference/uri/uri/rfc3986/uri/parse.xml
+++ b/reference/uri/uri/rfc3986/uri/parse.xml
@@ -56,14 +56,14 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = \Uri\Rfc3986\Uri::parse("https://example.com");
 
 if ($uri !== null) {
     echo "Valid URI: " . $uri->toString();
 } else {
-    echo "Invalid URI"
+    echo "Invalid URI";
 }
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/resolve.xml b/reference/uri/uri/rfc3986/uri/resolve.xml
index 68f162ba0ee2..4e028cf14294 100644
--- a/reference/uri/uri/rfc3986/uri/resolve.xml
+++ b/reference/uri/uri/rfc3986/uri/resolve.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-rfc3986-uri.resolve" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::resolve</refname>
-  <refpurpose>Resolve a URI with the current object as the base URL</refpurpose>
+  <refpurpose>Resolve a URI with the current object as the base URI</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <methodparam><type>string</type><parameter>uri</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Resolves a URI - which may potentially be a relative reference - with the current object as the base URL.
+   Resolves a URI - which may potentially be a relative reference - with the current object as the base URI.
   </simpara>
  </refsect1>
 
@@ -49,11 +49,11 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com");
 $uri = $uri->resolve("/foo");
 
 echo $uri->toRawString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/torawstring.xml b/reference/uri/uri/rfc3986/uri/torawstring.xml
index b8ccbe91d6d2..b7bb60bd5f4f 100644
--- a/reference/uri/uri/rfc3986/uri/torawstring.xml
+++ b/reference/uri/uri/rfc3986/uri/torawstring.xml
@@ -14,6 +14,7 @@
   <simpara>
    Recomposes the raw (non-normalized) URI to a &string;.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,7 +25,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the recomposed raw (non-normalized) URI as a &string;.
+   Returns the recomposed raw URI as a &string;.
   </simpara>
  </refsect1>
 
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar?baz");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r?baz");
 
 echo $uri->toRawString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://example.com/foo/b%61r?baz
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/rfc3986/uri/tostring.xml b/reference/uri/uri/rfc3986/uri/tostring.xml
index 713d44c50181..b370c128a7ad 100644
--- a/reference/uri/uri/rfc3986/uri/tostring.xml
+++ b/reference/uri/uri/rfc3986/uri/tostring.xml
@@ -14,6 +14,7 @@
   <simpara>
    Recomposes the normalized URI to a &string;.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar?baz");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r?baz");
 
 echo $uri->toString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/rfc3986/uri/withfragment.xml b/reference/uri/uri/rfc3986/uri/withfragment.xml
index 287bcf812b77..b0345bb362df 100644
--- a/reference/uri/uri/rfc3986/uri/withfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/withfragment.xml
@@ -48,11 +48,12 @@
    <title><methodname>Uri\Rfc3986\Uri::withFragment</methodname> basic example</title>
    <programlisting role="php">
 <![CDATA[
+<?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com/#foo");
 $uri = $uri->withFragment("bar");
 
 echo $uri->getFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/whatwg/url/construct.xml b/reference/uri/uri/whatwg/url/construct.xml
index 3eb638ca6930..ed65edc96713 100644
--- a/reference/uri/uri/whatwg/url/construct.xml
+++ b/reference/uri/uri/whatwg/url/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>array</type><parameter role="reference">softErrors</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <simpara>
-   Constructs the <classname>Uri\Rfc3986\Uri</classname> object.
+   Constructs the <classname>Uri\WhatWg\Url</classname> object.
   </simpara>
  </refsect1>
 
@@ -25,7 +25,7 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      A valid URL string to parse (e.g. <literal>/foo</literal> or (e.g. <literal>https://example.com/foo</literal>).
+      A valid URL string to parse (e.g. <literal>/foo</literal> or <literal>https://example.com/foo</literal>).
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/uri/uri/whatwg/url/getasciihost.xml b/reference/uri/uri/whatwg/url/getasciihost.xml
index 0f239f583868..0b4cbf6275bd 100644
--- a/reference/uri/uri/whatwg/url/getasciihost.xml
+++ b/reference/uri/uri/whatwg/url/getasciihost.xml
@@ -35,16 +35,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com");
+
+$url = new \Uri\WhatWg\Url("https://schönbergstylecode.example.com");
 
 echo $url->getAsciiHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+xn--schnbergstylecode-1zb.example.com
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/whatwg/url/parse.xml b/reference/uri/uri/whatwg/url/parse.xml
index 4c3dd96ba909..58977965c42b 100644
--- a/reference/uri/uri/whatwg/url/parse.xml
+++ b/reference/uri/uri/whatwg/url/parse.xml
@@ -25,7 +25,7 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      A valid URL string to parse (e.g. <literal>/foo</literal> or (e.g. <literal>https://example.com/foo</literal>).
+      A valid URL string to parse (e.g. <literal>/foo</literal> or <literal>https://example.com/foo</literal>).
      </simpara>
     </listitem>
    </varlistentry>
@@ -66,14 +66,14 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $url = \Uri\WhatWg\Url::parse("https://example.com");
 
 if ($url !== null) {
     echo "Valid URL: " . $url->toAsciiString();
 } else {
-    echo "Invalid URL"
+    echo "Invalid URL";
 }
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/whatwg/url/toasciistring.xml b/reference/uri/uri/whatwg/url/toasciistring.xml
index f53c6f5b2016..1556c46156d6 100644
--- a/reference/uri/uri/whatwg/url/toasciistring.xml
+++ b/reference/uri/uri/whatwg/url/toasciistring.xml
@@ -36,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com/foo/bar?baz");
+
+$url = new \Uri\WhatWg\Url("https://schönbergstylecode.example.com/foo/bar?baz");
 
 echo $url->toAsciiString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://xn--schnbergstylecode-1zb.example.com/foo/bar?baz
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/whatwg/url/tounicodestring.xml b/reference/uri/uri/whatwg/url/tounicodestring.xml
index c45b34fd134a..8e6c0d86cbe6 100644
--- a/reference/uri/uri/whatwg/url/tounicodestring.xml
+++ b/reference/uri/uri/whatwg/url/tounicodestring.xml
@@ -35,16 +35,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com/foo/bar?baz");
+
+$url = new \Uri\WhatWg\Url("https://xn--schnbergstylecode-1zb.example.com/foo/bar?baz");
 
 echo $url->toUnicodeString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://schönbergstylecode.example.com/foo/bar?baz
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/whatwg/url/unserialize.xml b/reference/uri/uri/whatwg/url/unserialize.xml
index 0a18cacb8718..2f6b3286eba1 100644
--- a/reference/uri/uri/whatwg/url/unserialize.xml
+++ b/reference/uri/uri/whatwg/url/unserialize.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-whatwg-url.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::__unserialize</refname>
-  <refpurpose>Deserialize the data parameter into a Url object</refpurpose>
+  <refpurpose>Deserialize the array from the data parameter into a Url object</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <methodparam><type>array</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Deserializes a data parameter into a <classname>Uri\WhatWg\Url</classname> object.
+   Deserializes the &array; from the <parameter>data</parameter> parameter into a <classname>Uri\WhatWg\Url</classname> object.
   </simpara>
  </refsect1>