diff --git a/language-snippets.ent b/language-snippets.ent
index 8816669f7..080ad8f40 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 8648d1cda141537b5dbd403a0bf0e6eb8c086e9d Maintainer: argosback Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: argosback Status: ready -->
 
 <!ENTITY installation.enabled.disable 'Esta extensión está activada por defecto. Puede ser desactivada utilizando la opción de configuración: '>
 
@@ -4457,6 +4457,18 @@ local: {
   </simpara>
 '>
 
+<!ENTITY uri.normalization '
+  <simpara>
+   Los tripletes hexadecimales se convierten a mayúsculas, los caracteres no reservados codificados con porcentaje se decodifican, los componentes de esquema y de host se normalizan a minúsculas y los segmentos de punto se eliminan de la ruta, conforme a la RFC 3986.
+  </simpara>
+'>
+
+<!ENTITY uri.non-normalization '
+  <simpara>
+   Los tripletes hexadecimales no se convierten a mayúsculas, los caracteres no reservados codificados con porcentaje permanecen codificados, los componentes de esquema y de host conservan las mayúsculas y minúsculas con las que se proporcionaron y los segmentos de punto se mantienen en la ruta.
+  </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 2d67e20cd..999b93841 100644
--- a/reference/uri/uri.whatwg.urlvalidationerrortype.xml
+++ b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 8352249a84d0b91b38c741ff1c256061127dbfbb Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <reference xml:id="enum.uri-whatwg-urlvalidationerrortype" role="enum" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook">
  <title>La enumeración Uri\WhatWg\UrlValidationErrorType</title>
  <titleabbrev>Uri\WhatWg\UrlValidationErrorType</titleabbrev>
@@ -106,7 +106,7 @@
 
      <enumitem>
       <enumidentifier>Ipv4InIpv6InvalidCodePoint</enumidentifier>
-      <enumitemdescription>Una dirección IPv6 con sintaxis de dirección IPv4.</enumitemdescription>
+      <enumitemdescription>Una dirección IPv6 con sintaxis de dirección IPv4: una parte IPv4 está vacía, contiene un dígito no ASCII o un cero inicial, o hay demasiadas partes IPv4.</enumitemdescription>
      </enumitem>
 
      <enumitem>
diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 00c368659..6bb4f47db 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getFragment</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de fragmento normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/gethost.xml b/reference/uri/uri/rfc3986/uri/gethost.xml
index ef6dbc1bc..44758b069 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getHost</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de host normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getpassword.xml b/reference/uri/uri/rfc3986/uri/getpassword.xml
index 75b0f3ee4..8220bdbee 100644
--- a/reference/uri/uri/rfc3986/uri/getpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getpassword.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getpassword" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getPassword</refname>
@@ -16,6 +16,7 @@
    Recupera la parte de contraseña normalizada (el texto después del primer carácter <literal>:</literal>)
    del componente userinfo.
   </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 084fd56fb..24b0e199c 100644
--- a/reference/uri/uri/rfc3986/uri/getpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getPath</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de ruta normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getquery.xml b/reference/uri/uri/rfc3986/uri/getquery.xml
index 59c49a07b..90b735e86 100644
--- a/reference/uri/uri/rfc3986/uri/getquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getquery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getQuery</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de consulta normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawfragment.xml b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
index 3cc517e2f..6a71c6e67 100644
--- a/reference/uri/uri/rfc3986/uri/getrawfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawFragment</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de fragmento sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawhost.xml b/reference/uri/uri/rfc3986/uri/getrawhost.xml
index 1db3b8177..23922f960 100644
--- a/reference/uri/uri/rfc3986/uri/getrawhost.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawhost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawhost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawHost</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de host sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawpassword.xml b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
index 794f8e472..673a7d799 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawpassword" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawPassword</refname>
@@ -16,6 +16,7 @@
    Recupera la parte de contraseña sin procesar (no normalizada) (el texto después del primer carácter <literal>:</literal>)
    del componente userinfo.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Devuelve la contraseña sin procesar (no normalizada) como un &string; si el componente userinfo contiene un carácter <literal>:</literal>.
+   Devuelve la contraseña sin procesar como un &string; si el componente userinfo contiene un carácter <literal>:</literal>.
    Se devuelve una cadena vacía cuando el componente userinfo no contiene un carácter <literal>:</literal>.
    Se devuelve &null; cuando el componente userinfo no existe.
   </simpara>
diff --git a/reference/uri/uri/rfc3986/uri/getrawpath.xml b/reference/uri/uri/rfc3986/uri/getrawpath.xml
index 6ebcbb595..1b12b82f4 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawPath</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de ruta sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawquery.xml b/reference/uri/uri/rfc3986/uri/getrawquery.xml
index 78ad5cf3f..1ccafc5ae 100644
--- a/reference/uri/uri/rfc3986/uri/getrawquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawquery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawQuery</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de consulta sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawscheme.xml b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
index 32d75bd5e..eee2d7cc9 100644
--- a/reference/uri/uri/rfc3986/uri/getrawscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawscheme" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawScheme</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de esquema sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
index 617839710..cf410e114 100644
--- a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawuserinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawUserInfo</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente userinfo sin procesar (no normalizado).
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawusername.xml b/reference/uri/uri/rfc3986/uri/getrawusername.xml
index f7c1fe5f5..46bfe21fa 100644
--- a/reference/uri/uri/rfc3986/uri/getrawusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawusername.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getrawusername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getRawUsername</refname>
@@ -16,6 +16,7 @@
    Recupera la parte del nombre de usuario sin procesar (no normalizado) (el texto antes del primer carácter <literal>:</literal>)
    del componente userinfo.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -26,7 +27,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Devuelve el nombre de usuario sin procesar (no normalizado) como un &string; si el componente userinfo existe; de lo contrario, se devuelve &null;.
+   Devuelve el nombre de usuario sin procesar como un &string; si el componente userinfo existe; de lo contrario, se devuelve &null;.
   </simpara>
  </refsect1>
 
diff --git a/reference/uri/uri/rfc3986/uri/getscheme.xml b/reference/uri/uri/rfc3986/uri/getscheme.xml
index 7e5d44797..301e46a4b 100644
--- a/reference/uri/uri/rfc3986/uri/getscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getscheme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getscheme" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getScheme</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente de esquema normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getuserinfo.xml b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
index e172d5a64..19e9cb254 100644
--- a/reference/uri/uri/rfc3986/uri/getuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getuserinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getUserInfo</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recupera el componente userinfo normalizado.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getusername.xml b/reference/uri/uri/rfc3986/uri/getusername.xml
index 261360bb3..5ac3b292c 100644
--- a/reference/uri/uri/rfc3986/uri/getusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getusername.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.getusername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getUsername</refname>
@@ -16,6 +16,7 @@
    Recupera la parte del nombre de usuario normalizado (el texto antes del primer carácter <literal>:</literal>)
    del componente userinfo.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/parse.xml b/reference/uri/uri/rfc3986/uri/parse.xml
index 1223c7825..c4396695d 100644
--- a/reference/uri/uri/rfc3986/uri/parse.xml
+++ b/reference/uri/uri/rfc3986/uri/parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::parse</refname>
@@ -57,6 +57,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = \Uri\Rfc3986\Uri::parse("https://example.com");
 
 if ($uri !== null) {
@@ -64,7 +65,6 @@ if ($uri !== null) {
 } else {
     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 a028454db..cbd4287f2 100644
--- a/reference/uri/uri/rfc3986/uri/resolve.xml
+++ b/reference/uri/uri/rfc3986/uri/resolve.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <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>Resuelve una URI con el objeto actual como URL base</refpurpose>
+  <refpurpose>Resuelve una URI con el objeto actual como URI base</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,7 +13,7 @@
    <methodparam><type>string</type><parameter>uri</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Resuelve una URI - que puede ser potencialmente una referencia relativa - con el objeto actual como URL base.
+   Resuelve una URI - que puede ser potencialmente una referencia relativa - con el objeto actual como URI base.
   </simpara>
  </refsect1>
 
@@ -50,11 +50,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 6149c7539..3429fcabd 100644
--- a/reference/uri/uri/rfc3986/uri/torawstring.xml
+++ b/reference/uri/uri/rfc3986/uri/torawstring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.torawstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::toRawString</refname>
@@ -15,6 +15,12 @@
   <simpara>
    Recompone la URI sin procesar (no normalizada) en un &string;.
   </simpara>
+  &uri.non-normalization;
+  <simpara>
+   Un host IPv6 constituye una excepción: se recompone a partir de su forma
+   analizada y, por lo tanto, se devuelve completamente expandido y en
+   minúsculas, independientemente de la notación utilizada en la entrada.
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,7 +31,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Devuelve la URI recompuesta sin procesar (no normalizada) como un &string;.
+   Devuelve la URI recompuesta sin procesar como un &string;.
   </simpara>
  </refsect1>
 
diff --git a/reference/uri/uri/rfc3986/uri/tostring.xml b/reference/uri/uri/rfc3986/uri/tostring.xml
index 2474329fb..cfb0b09ff 100644
--- a/reference/uri/uri/rfc3986/uri/tostring.xml
+++ b/reference/uri/uri/rfc3986/uri/tostring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::toString</refname>
@@ -15,6 +15,7 @@
   <simpara>
    Recompone la URI normalizada en un &string;.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/withfragment.xml b/reference/uri/uri/rfc3986/uri/withfragment.xml
index e1efc848e..0dd9b3fd2 100644
--- a/reference/uri/uri/rfc3986/uri/withfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/withfragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-rfc3986-uri.withfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::withFragment</refname>
@@ -50,11 +50,11 @@
    <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 2531ed534..e887ac393 100644
--- a/reference/uri/uri/whatwg/url/construct.xml
+++ b/reference/uri/uri/whatwg/url/construct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::__construct</refname>
@@ -15,7 +15,7 @@
    <methodparam choice="opt"><type>array</type><parameter role="reference">softErrors</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <simpara>
-   Construye el objeto <classname>Uri\Rfc3986\Uri</classname>.
+   Construye el objeto <classname>Uri\WhatWg\Url</classname>.
   </simpara>
  </refsect1>
 
@@ -26,7 +26,10 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      Una cadena de URL válida a analizar (por ejemplo, <literal>/foo</literal> o <literal>https://example.com/foo</literal>).
+      Una cadena de URL a analizar, por ejemplo
+      <literal>https://example.com/foo</literal>. Una cadena de URL relativa como
+      <literal>/foo</literal> solo se acepta cuando se proporciona
+      <parameter>baseUrl</parameter>.
      </simpara>
     </listitem>
    </varlistentry>
diff --git a/reference/uri/uri/whatwg/url/getasciihost.xml b/reference/uri/uri/whatwg/url/getasciihost.xml
index 5e8f81425..30273e3cb 100644
--- a/reference/uri/uri/whatwg/url/getasciihost.xml
+++ b/reference/uri/uri/whatwg/url/getasciihost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.getasciihost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::getAsciiHost</refname>
@@ -36,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com");
+
+$url = new \Uri\WhatWg\Url("https://täst.example.com");
 
 echo $url->getAsciiHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+xn--tst-qla.example.com
 ]]>
    </screen>
   </example>
diff --git a/reference/uri/uri/whatwg/url/parse.xml b/reference/uri/uri/whatwg/url/parse.xml
index 6c0a62d91..5bf21ad44 100644
--- a/reference/uri/uri/whatwg/url/parse.xml
+++ b/reference/uri/uri/whatwg/url/parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 0e06411471a898974e114bd57f624781fe3a0b89 Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::parse</refname>
@@ -26,7 +26,10 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      Una cadena de URL válida a analizar (p.ej. <literal>/foo</literal> o (p.ej. <literal>https://example.com/foo</literal>).
+      Una cadena de URL a analizar, por ejemplo
+      <literal>https://example.com/foo</literal>. Una cadena de URL relativa como
+      <literal>/foo</literal> solo se acepta cuando se proporciona
+      <parameter>baseUrl</parameter>.
      </simpara>
     </listitem>
    </varlistentry>
@@ -68,6 +71,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $url = \Uri\WhatWg\Url::parse("https://example.com");
 
 if ($url !== null) {
@@ -75,7 +79,6 @@ if ($url !== null) {
 } else {
     echo "Invalid URL";
 }
-?>
 ]]>
    </programlisting>
    &example.outputs;
diff --git a/reference/uri/uri/whatwg/url/resolve.xml b/reference/uri/uri/whatwg/url/resolve.xml
index 3197ba192..c90d1d8b2 100644
--- a/reference/uri/uri/whatwg/url/resolve.xml
+++ b/reference/uri/uri/whatwg/url/resolve.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.resolve" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::resolve</refname>
@@ -25,7 +25,7 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      Una cadena de URL válida (p.ej. <literal>/foo</literal> o (p.ej. <literal>https://example.com/foo</literal>) a aplicar sobre
+      Una cadena de URL válida (p.ej. <literal>/foo</literal> o <literal>https://example.com/foo</literal>) a aplicar sobre
       el objeto actual.
      </simpara>
     </listitem>
diff --git a/reference/uri/uri/whatwg/url/toasciistring.xml b/reference/uri/uri/whatwg/url/toasciistring.xml
index fddadbca9..11d3fc4e9 100644
--- a/reference/uri/uri/whatwg/url/toasciistring.xml
+++ b/reference/uri/uri/whatwg/url/toasciistring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.toasciistring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::toAsciiString</refname>
@@ -37,16 +37,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com/foo/bar?baz");
+
+$url = new \Uri\WhatWg\Url("https://täst.example.com/foo/bar?baz");
 
 echo $url->toAsciiString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://xn--tst-qla.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 47ae5857c..9787d7771 100644
--- a/reference/uri/uri/whatwg/url/tounicodestring.xml
+++ b/reference/uri/uri/whatwg/url/tounicodestring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <refentry xml:id="uri-whatwg-url.tounicodestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::toUnicodeString</refname>
@@ -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://xn--tst-qla.example.com/foo/bar?baz");
 
 echo $url->toUnicodeString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://täst.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 6faaf1bb2..91fed1231 100644
--- a/reference/uri/uri/whatwg/url/unserialize.xml
+++ b/reference/uri/uri/whatwg/url/unserialize.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: lacatoire Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: lacatoire Status: ready -->
 <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>Deserializa el parámetro data en un objeto Url</refpurpose>
+  <refpurpose>Deserializa el array del parámetro data en un objeto Url</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -13,7 +13,7 @@
    <methodparam><type>array</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Deserializa un parámetro data en un objeto <classname>Uri\WhatWg\Url</classname>.
+   Deserializa el &array; del parámetro <parameter>data</parameter> en un objeto <classname>Uri\WhatWg\Url</classname>.
   </simpara>
  </refsect1>