From a8ed01738f47198c678441aecfea2ce7b4e51269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Fri, 26 Jun 2026 14:19:22 -0300
Subject: [PATCH 1/4] Example of transforming DTD entities into XML entities

---
 contributors.ent             | 12 ------------
 docbookcs.xml                |  1 -
 entities/entities-remove.ent | 31 +++++++++++++++++++++++++++++++
 entities/entities.ent        | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 13 deletions(-)
 delete mode 100644 contributors.ent
 create mode 100644 entities/entities-remove.ent
 create mode 100644 entities/entities.ent

diff --git a/contributors.ent b/contributors.ent
deleted file mode 100644
index efa9ec9ce992..000000000000
--- a/contributors.ent
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- $Revision$ -->
-
- <!--
-   This file should only be present in the English doc tree. If you
-   copy it over to your translation tree you will be hunted down
-   relentlessly! You have been warned! :)
- -->
-
-<!-- Authors and editors displayed on the manual frontpage -->
-<!ENTITY frontpage.authors ''>
-
-<!ENTITY frontpage.editors ''>
diff --git a/docbookcs.xml b/docbookcs.xml
index a5f428f2483d..7c874f321686 100644
--- a/docbookcs.xml
+++ b/docbookcs.xml
@@ -21,7 +21,6 @@
  </paths>
 
  <entities>
-  <file>contributors.ent</file>
   <file>extensions.ent</file>
   <file>language-defs.ent</file>
   <file>language-snippets.ent</file>
diff --git a/entities/entities-remove.ent b/entities/entities-remove.ent
new file mode 100644
index 000000000000..761979e0ed0d
--- /dev/null
+++ b/entities/entities-remove.ent
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf8" ?>
+<!-- $Revision:$ -->
+<!--
+
+This is a "remove" XML Entity file.
+See doc-base/script/text-entities.php for details.
+
+Place here only deprecated entities that are expected NOT
+be being used in any part of the manual.
+
+If an entity moved here is used in a language in your control,
+this means that the entity on the original file is planned to be
+removed, or already was removed.
+
+DO NOT TRANSLATE THIS FILE.
+
+This file is tracked by revcheck, so translations have a heads up
+when a entity is removed from doc-en. On translations, leave an
+empty <entities/> element at the end of file, only updating the revtag.
+
+-->
+
+<entities xmlns       = "http://docbook.org/ns/docbook"
+          xmlns:xlink = "http://www.w3.org/1999/xlink"
+          translate   = "remove">
+
+<!-- Erased in 2026-06, long time empty -->
+<entity name="frontpage.authors"/>
+<entity name="frontpage.editors"/>
+
+</entities>
diff --git a/entities/entities.ent b/entities/entities.ent
new file mode 100644
index 000000000000..61948b52e515
--- /dev/null
+++ b/entities/entities.ent
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf8" ?>
+<!-- $Revision:$ -->
+<!--
+
+# Description
+
+This is a translatable XML Entity file.
+See doc-base/script/text-entities.php for details.
+
+Place here small entities that are expected to be translated.
+For big or complex entities, please create an individual entity
+file at doc-lang/entities/entityname.xml.
+
+Keep the lines strictly under 79 columns, to make the process of
+manual translation easier, and to not wrap around on automatic
+emails.
+
+-->
+
+<entities xmlns       = "http://docbook.org/ns/docbook"
+          xmlns:xlink = "http://www.w3.org/1999/xlink"
+          translate   = "yes">
+
+<entity name="extcat.intro">
+ <title>Extension List/Categorization</title>
+ <simpara>This appendix categorizes more than 150 extensions documented
+ in the PHP Manual by several criteria.</simpara>
+</entity>
+
+<entity name="extcat.alphabetical"><title>Alphabetical</title></entity>
+<entity name="extcat.alphabetical"><title>Alphabetical</title></entity>
+
+</entities>
\ No newline at end of file

From fc1d921e222f2af9a0d7d0414081c83ecf7d2fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Fri, 26 Jun 2026 14:44:54 -0300
Subject: [PATCH 2/4] Per extension entities example

---
 entities/entities-remove.ent |  8 ++++----
 entities/entities.ent        | 10 ++++++----
 reference/entities.ent       | 37 ++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 reference/entities.ent

diff --git a/entities/entities-remove.ent b/entities/entities-remove.ent
index 761979e0ed0d..5ea5eb7ee0fa 100644
--- a/entities/entities-remove.ent
+++ b/entities/entities-remove.ent
@@ -5,8 +5,8 @@
 This is a "remove" XML Entity file.
 See doc-base/script/text-entities.php for details.
 
-Place here only deprecated entities that are expected NOT
-be being used in any part of the manual.
+Place here only deprecated or removed entities that are
+expected NOT be being used in any part of the manual.
 
 If an entity moved here is used in a language in your control,
 this means that the entity on the original file is planned to be
@@ -15,7 +15,7 @@ removed, or already was removed.
 DO NOT TRANSLATE THIS FILE.
 
 This file is tracked by revcheck, so translations have a heads up
-when a entity is removed from doc-en. On translations, leave an
+when an entity is removed from doc-en. On translations, leave an
 empty <entities/> element at the end of file, only updating the revtag.
 
 -->
@@ -28,4 +28,4 @@ empty <entities/> element at the end of file, only updating the revtag.
 <entity name="frontpage.authors"/>
 <entity name="frontpage.editors"/>
 
-</entities>
+</entities>
\ No newline at end of file
diff --git a/entities/entities.ent b/entities/entities.ent
index 61948b52e515..97c699d45e2f 100644
--- a/entities/entities.ent
+++ b/entities/entities.ent
@@ -2,8 +2,6 @@
 <!-- $Revision:$ -->
 <!--
 
-# Description
-
 This is a translatable XML Entity file.
 See doc-base/script/text-entities.php for details.
 
@@ -11,9 +9,13 @@ Place here small entities that are expected to be translated.
 For big or complex entities, please create an individual entity
 file at doc-lang/entities/entityname.xml.
 
+No inline namespaces are necessary. In fact, they can make things
+complicated to debug later. Place any needed namespace in
+declaration of root <entities> element.
+
 Keep the lines strictly under 79 columns, to make the process of
-manual translation easier, and to not wrap around on automatic
-emails.
+manual translation easier, and to avoid wrap-around in some other
+contexts.
 
 -->
 
diff --git a/reference/entities.ent b/reference/entities.ent
new file mode 100644
index 000000000000..38ee50cce865
--- /dev/null
+++ b/reference/entities.ent
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf8" ?>
+<!-- $Revision:$ -->
+<!--
+
+This is a translatable XML Entity file.
+See doc-base/script/text-entities.php for details.
+
+Place here small entities that are expected to be translated.
+For big or complex entities, please create an individual entity
+file at doc-lang/entities/entityname.xml.
+
+No inline namespaces are necessary. In fact, they can make things
+complicated to debug later. Place any needed namespace in
+declaration of root <entities> element.
+
+Keep the lines strictly under 79 columns, to make the process of
+manual translation easier, and to avoid wrap-around in some other
+contexts.
+
+-->
+
+<entities xmlns       = "http://docbook.org/ns/docbook"
+          xmlns:xlink = "http://www.w3.org/1999/xlink"
+          translate   = "yes">
+
+<!-- Examples:
+
+<entity name="name">Direct text</entity>
+
+<entity name="name.name">
+ Single-, multi- or text rooted XML fragment, as long as it is
+ a well-balanced region.
+</entity>
+
+-->
+
+</entities>
\ No newline at end of file

From b44182684a82141302c391aedad70284d7918499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Fri, 26 Jun 2026 14:56:50 -0300
Subject: [PATCH 3/4] Remove example file

---
 reference/entities.ent | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 reference/entities.ent

diff --git a/reference/entities.ent b/reference/entities.ent
deleted file mode 100644
index 38ee50cce865..000000000000
--- a/reference/entities.ent
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf8" ?>
-<!-- $Revision:$ -->
-<!--
-
-This is a translatable XML Entity file.
-See doc-base/script/text-entities.php for details.
-
-Place here small entities that are expected to be translated.
-For big or complex entities, please create an individual entity
-file at doc-lang/entities/entityname.xml.
-
-No inline namespaces are necessary. In fact, they can make things
-complicated to debug later. Place any needed namespace in
-declaration of root <entities> element.
-
-Keep the lines strictly under 79 columns, to make the process of
-manual translation easier, and to avoid wrap-around in some other
-contexts.
-
--->
-
-<entities xmlns       = "http://docbook.org/ns/docbook"
-          xmlns:xlink = "http://www.w3.org/1999/xlink"
-          translate   = "yes">
-
-<!-- Examples:
-
-<entity name="name">Direct text</entity>
-
-<entity name="name.name">
- Single-, multi- or text rooted XML fragment, as long as it is
- a well-balanced region.
-</entity>
-
--->
-
-</entities>
\ No newline at end of file

From ef0d750dee64bbaf0d47737ac00f3ff6e9c9f8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Fri, 26 Jun 2026 15:47:41 -0300
Subject: [PATCH 4/4] EOF EOL

---
 entities/entities.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entities/entities.ent b/entities/entities.ent
index 97c699d45e2f..fc3452edffe1 100644
--- a/entities/entities.ent
+++ b/entities/entities.ent
@@ -32,4 +32,4 @@ contexts.
 <entity name="extcat.alphabetical"><title>Alphabetical</title></entity>
 <entity name="extcat.alphabetical"><title>Alphabetical</title></entity>
 
-</entities>
\ No newline at end of file
+</entities>