From 60cfa0ccda54778dc170a9346e7a2f1c0e7e3a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E7=94=B0=20=E6=86=B2=E5=A4=AA=E9=83=8E?=
 <takeda@youmind.jp>
Date: Sun, 20 Sep 2026 13:08:45 +0900
Subject: [PATCH] =?UTF-8?q?URI=20=E3=81=AE=E6=AD=A3=E8=A6=8F=E5=8C=96?=
 =?UTF-8?q?=E3=81=AE=E8=AA=AC=E6=98=8E=E3=81=A8=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E4=BE=8B=E3=82=92=E5=8E=9F=E6=96=87=E3=81=AB=E8=BF=BD=E5=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

php/doc-en@9bf8b904f3 (php/doc-en#5548) に追従します。

正規化される／されないことの説明が language-snippets.ent の 2 つのエンティティに
切り出され、各 getter のページから参照されるようになりました。あわせて
Uri\WhatWg\Url のコンストラクタと parse() でクラス名と重複した `(e.g.` の誤りを修正し、
Ipv4InIpv6InvalidCodePoint に発生条件の説明を追加し、IDN を扱うコード例のホスト名を
非 ASCII ラベルに差し替えています。

## 対象ファイル (30件)

- language-snippets.ent
- reference/uri/uri.whatwg.urlvalidationerrortype.xml
- reference/uri/uri/rfc3986/uri/ (21) — getfragment, gethost, getpassword, getpath,
  getquery, getrawfragment, getrawhost, getrawpassword, getrawpath, getrawquery,
  getrawscheme, getrawuserinfo, getrawusername, getscheme, getuserinfo, getusername,
  parse, resolve, torawstring, tostring, withfragment
- reference/uri/uri/whatwg/url/ (7) — construct, getasciihost, parse, resolve,
  toasciistring, tounicodestring, unserialize
---
 language-snippets.ent                            | 16 +++++++++++++++-
 .../uri/uri.whatwg.urlvalidationerrortype.xml    |  7 +++++--
 reference/uri/uri/rfc3986/uri/getfragment.xml    |  3 ++-
 reference/uri/uri/rfc3986/uri/gethost.xml        |  3 ++-
 reference/uri/uri/rfc3986/uri/getpassword.xml    |  3 ++-
 reference/uri/uri/rfc3986/uri/getpath.xml        |  3 ++-
 reference/uri/uri/rfc3986/uri/getquery.xml       |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawfragment.xml |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawhost.xml     |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawpassword.xml |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawpath.xml     |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawquery.xml    |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawscheme.xml   |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawuserinfo.xml |  3 ++-
 reference/uri/uri/rfc3986/uri/getrawusername.xml |  3 ++-
 reference/uri/uri/rfc3986/uri/getscheme.xml      |  3 ++-
 reference/uri/uri/rfc3986/uri/getuserinfo.xml    |  3 ++-
 reference/uri/uri/rfc3986/uri/getusername.xml    |  3 ++-
 reference/uri/uri/rfc3986/uri/parse.xml          |  4 ++--
 reference/uri/uri/rfc3986/uri/resolve.xml        |  8 ++++----
 reference/uri/uri/rfc3986/uri/torawstring.xml    |  7 ++++++-
 reference/uri/uri/rfc3986/uri/tostring.xml       |  3 ++-
 reference/uri/uri/rfc3986/uri/withfragment.xml   |  4 ++--
 reference/uri/uri/whatwg/url/construct.xml       |  8 +++++---
 reference/uri/uri/whatwg/url/getasciihost.xml    |  8 ++++----
 reference/uri/uri/whatwg/url/parse.xml           |  8 +++++---
 reference/uri/uri/whatwg/url/resolve.xml         |  2 +-
 reference/uri/uri/whatwg/url/toasciistring.xml   |  8 ++++----
 reference/uri/uri/whatwg/url/tounicodestring.xml |  8 ++++----
 reference/uri/uri/whatwg/url/unserialize.xml     |  6 +++---
 30 files changed, 94 insertions(+), 51 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 03971cd042..b5b1fa51c5 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8648d1cda141537b5dbd403a0bf0e6eb8c086e9d Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: takagi Status: ready -->
 <!-- Credits: hirokawa,haruki,shimooka,mumumu,jdkfx -->
 
 <!--
@@ -4473,6 +4473,20 @@ local: {
   </simpara>
 '>
 
+<!ENTITY uri.normalization '
+  <simpara>
+   RFC 3986 に従って、16 進数のトリプレットは大文字に変換され、パーセントエンコードされた非予約文字はデコードされ、
+   スキームコンポーネントとホストコンポーネントは小文字に正規化され、パスからドットセグメントが削除されます。
+  </simpara>
+'>
+
+<!ENTITY uri.non-normalization '
+  <simpara>
+   16 進数のトリプレットは大文字に変換されず、パーセントエンコードされた非予約文字はエンコードされたまま残り、
+   スキームコンポーネントとホストコンポーネントは指定された通りの大文字小文字を保ち、ドットセグメントはパスに残ります。
+  </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 9519dcf720..838ab7ef48 100644
--- a/reference/uri/uri.whatwg.urlvalidationerrortype.xml
+++ b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8352249a84d0b91b38c741ff1c256061127dbfbb Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>Uri\WhatWg\UrlValidationErrorType Enum</title>
  <titleabbrev>Uri\WhatWg\UrlValidationErrorType</titleabbrev>
@@ -107,7 +107,10 @@
 
      <enumitem>
       <enumidentifier>Ipv4InIpv6InvalidCodePoint</enumidentifier>
-      <enumitemdescription>IPv4 アドレス構文を持つ IPv6 アドレスです。</enumitemdescription>
+      <enumitemdescription>
+       IPv4 アドレス構文を持つ IPv6 アドレスです。IPv4 のパートが空であるか、
+       パートに ASCII 数字以外の文字や先頭のゼロが含まれているか、パートの数が多すぎます。
+      </enumitemdescription>
      </enumitem>
 
      <enumitem>
diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 8127d725a7..28bcf2a202 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたフラグメントコンポーネントを取得します。
   </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 60188e4dd4..813351f940 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたホストコンポーネントを取得します。
   </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 95791d8f66..eed7a25114 100644
--- a/reference/uri/uri/rfc3986/uri/getpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getpassword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getpassword" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    ユーザー情報コンポーネントから、正規化されたパスワードの部分（最初の <literal>:</literal> 文字より後ろのテキスト）を取得します。
   </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 8da4af1dea..0315e6679c 100644
--- a/reference/uri/uri/rfc3986/uri/getpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getpath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたパスコンポーネントを取得します。
   </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 5e0d1f0517..f290c67d4b 100644
--- a/reference/uri/uri/rfc3986/uri/getquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getquery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたクエリコンポーネントを取得します。
   </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 b1ae45360c..abf3902ff0 100644
--- a/reference/uri/uri/rfc3986/uri/getrawfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c5ff5efb9c44487de448c0294af6f6b214f87594 Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないフラグメントコンポーネントを取得します。
   </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 abc253a64a..56df856532 100644
--- a/reference/uri/uri/rfc3986/uri/getrawhost.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawhost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないホストコンポーネントを取得します。
   </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 d136b2c2a9..35be6ebcb4 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawpassword" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    ユーザー情報コンポーネントから、正規化されていないパスワードの部分（最初の <literal>:</literal> 文字より後ろのテキスト）を取得します。
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getrawpath.xml b/reference/uri/uri/rfc3986/uri/getrawpath.xml
index 1f54407053..e53e3ecdbc 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないパスコンポーネントを取得します。
   </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 a1b7b550db..413633aad2 100644
--- a/reference/uri/uri/rfc3986/uri/getrawquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawquery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないクエリコンポーネントを取得します。
   </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 61b9a58a25..4bcc27aba0 100644
--- a/reference/uri/uri/rfc3986/uri/getrawscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawscheme" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないスキームコンポーネントを取得します。
   </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 031ba88df6..786b435bd0 100644
--- a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawuserinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されていないユーザー情報コンポーネントを取得します。
   </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 85108bbeb3..98eb01bc9a 100644
--- a/reference/uri/uri/rfc3986/uri/getrawusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawusername.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getrawusername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -18,6 +18,7 @@
    ユーザー情報コンポーネントから、正規化されていないユーザー名の部分
    （最初の <literal>:</literal> 文字より前のテキスト）を取得します。
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/getscheme.xml b/reference/uri/uri/rfc3986/uri/getscheme.xml
index d16fa9fbd8..8dce700699 100644
--- a/reference/uri/uri/rfc3986/uri/getscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getscheme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getscheme" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたスキームコンポーネントを取得します。
   </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 d0ff4bbd1b..104a0507e4 100644
--- a/reference/uri/uri/rfc3986/uri/getuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getuserinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化されたユーザー情報コンポーネントを取得します。
   </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 8af05e69df..cd88b6883d 100644
--- a/reference/uri/uri/rfc3986/uri/getusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getusername.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.getusername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -18,6 +18,7 @@
    ユーザー情報コンポーネントから、正規化されたユーザー名の部分
    （最初の <literal>:</literal> 文字より前のテキスト）を取得します。
   </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 3604ec354b..89dc71fbec 100644
--- a/reference/uri/uri/rfc3986/uri/parse.xml
+++ b/reference/uri/uri/rfc3986/uri/parse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>
@@ -58,6 +58,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = \Uri\Rfc3986\Uri::parse("https://example.com");
 
 if ($uri !== null) {
@@ -65,7 +66,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 056beff5e9..6dd401f85c 100644
--- a/reference/uri/uri/rfc3986/uri/resolve.xml
+++ b/reference/uri/uri/rfc3986/uri/resolve.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>現在のオブジェクトをベース URL として URI を解決する</refpurpose>
+  <refpurpose>現在のオブジェクトをベース URI として URI を解決する</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,7 +15,7 @@
    <methodparam><type>string</type><parameter>uri</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   現在のオブジェクトをベース URL として URI（相対参照である可能性もあります）を解決します。
+   現在のオブジェクトをベース URI として URI（相対参照である可能性もあります）を解決します。
   </simpara>
  </refsect1>
 
@@ -52,11 +52,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 4532ccea14..ae22db49f1 100644
--- a/reference/uri/uri/rfc3986/uri/torawstring.xml
+++ b/reference/uri/uri/rfc3986/uri/torawstring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.torawstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,11 @@
   <simpara>
    正規化されていない URI を &string; として再構築します。
   </simpara>
+  &uri.non-normalization;
+  <simpara>
+   IPv6 ホストは例外です。パースされた形式から再構築されるため、
+   入力がどの表記であっても、完全に展開された小文字の形式で返されます。
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/uri/uri/rfc3986/uri/tostring.xml b/reference/uri/uri/rfc3986/uri/tostring.xml
index 48b68ecc03..57a7595517 100644
--- a/reference/uri/uri/rfc3986/uri/tostring.xml
+++ b/reference/uri/uri/rfc3986/uri/tostring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,6 +17,7 @@
   <simpara>
    正規化された URI を &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 3f77a639c8..b5cc1fbcd1 100644
--- a/reference/uri/uri/rfc3986/uri/withfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/withfragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-rfc3986-uri.withfragment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -52,11 +52,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 392fac49ee..78bb28f936 100644
--- a/reference/uri/uri/whatwg/url/construct.xml
+++ b/reference/uri/uri/whatwg/url/construct.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>
@@ -16,7 +16,7 @@
    <methodparam choice="opt"><type>array</type><parameter role="reference">softErrors</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <simpara>
-   <classname>Uri\Rfc3986\Uri</classname> オブジェクトを構築します。
+   <classname>Uri\WhatWg\Url</classname> オブジェクトを構築します。
   </simpara>
  </refsect1>
 
@@ -27,7 +27,9 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      パースする有効な URL 文字列（例: <literal>/foo</literal> や (例: <literal>https://example.com/foo</literal>)。
+      パースする URL 文字列（例: <literal>https://example.com/foo</literal>）。
+      <literal>/foo</literal> のような相対 URL 文字列は、
+      <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 3f0aead58e..6ec9d29888 100644
--- a/reference/uri/uri/whatwg/url/getasciihost.xml
+++ b/reference/uri/uri/whatwg/url/getasciihost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>
@@ -37,16 +37,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 187bf24ddf..d92efffeb4 100644
--- a/reference/uri/uri/whatwg/url/parse.xml
+++ b/reference/uri/uri/whatwg/url/parse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 0e06411471a898974e114bd57f624781fe3a0b89 Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>
@@ -27,7 +27,9 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      パースする有効な URL 文字列（例: <literal>/foo</literal> や (例: <literal>https://example.com/foo</literal>)。
+      パースする URL 文字列（例: <literal>https://example.com/foo</literal>）。
+      <literal>/foo</literal> のような相対 URL 文字列は、
+      <parameter>baseUrl</parameter> が指定された場合にのみ受け付けられます。
      </simpara>
     </listitem>
    </varlistentry>
@@ -68,6 +70,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $url = \Uri\WhatWg\Url::parse("https://example.com");
 
 if ($url !== null) {
@@ -75,7 +78,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 8ea36fae13..d322327da1 100644
--- a/reference/uri/uri/whatwg/url/resolve.xml
+++ b/reference/uri/uri/whatwg/url/resolve.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda Status: ready -->
 
 <refentry xml:id="uri-whatwg-url.resolve" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
diff --git a/reference/uri/uri/whatwg/url/toasciistring.xml b/reference/uri/uri/whatwg/url/toasciistring.xml
index a03b52323a..bfdc21bbe9 100644
--- a/reference/uri/uri/whatwg/url/toasciistring.xml
+++ b/reference/uri/uri/whatwg/url/toasciistring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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 b1fa50591e..f9e948919b 100644
--- a/reference/uri/uri/whatwg/url/tounicodestring.xml
+++ b/reference/uri/uri/whatwg/url/tounicodestring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>
@@ -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://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 52d6d1a5cd..9c7032ecdd 100644
--- a/reference/uri/uri/whatwg/url/unserialize.xml
+++ b/reference/uri/uri/whatwg/url/unserialize.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
+<!-- EN-Revision: 9bf8b904f30d04adcccd3e202c9e870b79284789 Maintainer: KentarouTakeda 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>data パラメータを Url オブジェクトにアンシリアライズする</refpurpose>
+  <refpurpose>data パラメータの配列を Url オブジェクトにアンシリアライズする</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,7 +15,7 @@
    <methodparam><type>array</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   <parameter>data</parameter> パラメータを <classname>Uri\WhatWg\Url</classname> オブジェクトにアンシリアライズします。
+   <parameter>data</parameter> パラメータの &array; を <classname>Uri\WhatWg\Url</classname> オブジェクトにアンシリアライズします。
   </simpara>
  </refsect1>