From f112cc1ec6335a62d03a3de0da4f03ea3f5d0e03 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Thu, 6 Mar 2025 13:38:24 +0000
Subject: [PATCH] Fix some markup issues from
 06313c3bb195d974aeba8f4364a6739833b18768

Also some few drive-by fixes of versions.xml
---
 .../info/functions/restore-include-path.xml   | 50 +++++++++---------
 reference/info/versions.xml                   |  6 +--
 reference/mail/functions/ezmlm-hash.xml       | 50 +++++++++---------
 reference/mail/versions.xml                   |  2 +-
 .../reflection/reflectionmethod/export.xml    | 52 +++++++++----------
 reference/reflection/reflector/export.xml     | 50 +++++++++---------
 .../strings/functions/convert-cyr-string.xml  | 50 +++++++++---------
 reference/strings/functions/hebrevc.xml       | 50 +++++++++---------
 reference/strings/versions.xml                |  6 +--
 9 files changed, 152 insertions(+), 164 deletions(-)

diff --git a/reference/info/functions/restore-include-path.xml b/reference/info/functions/restore-include-path.xml
index 7f4a310c15..8c473770a8 100644
--- a/reference/info/functions/restore-include-path.xml
+++ b/reference/info/functions/restore-include-path.xml
@@ -37,32 +37,30 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.4.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/info/versions.xml b/reference/info/versions.xml
index bf66f96a49..1309fa7bee 100644
--- a/reference/info/versions.xml
+++ b/reference/info/versions.xml
@@ -26,8 +26,8 @@
  <function name="get_required_files" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="get_resources" from="PHP 7, PHP 8"/>
  <function name="get_loaded_extensions" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="get_magic_quotes_gpc" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0"/>
- <function name="get_magic_quotes_runtime" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0"/>
+ <function name="get_magic_quotes_gpc" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
+ <function name="get_magic_quotes_runtime" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
  <function name="get_required_files" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="getenv" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="getlastmod" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
@@ -54,7 +54,7 @@
  <function name="phpinfo" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="phpversion" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="putenv" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="restore_include_path" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7" deprecated="PHP 7.4.0"/>
+ <function name="restore_include_path" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
  <function name="set_include_path" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7, PHP 8"/>
  <function name="set_time_limit" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="sys_get_temp_dir" from="PHP 5 &gt;= 5.2.1, PHP 7, PHP 8"/>
diff --git a/reference/mail/functions/ezmlm-hash.xml b/reference/mail/functions/ezmlm-hash.xml
index 0b79db4bf7..8a64fa7f32 100644
--- a/reference/mail/functions/ezmlm-hash.xml
+++ b/reference/mail/functions/ezmlm-hash.xml
@@ -48,32 +48,30 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.2.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="examples">
diff --git a/reference/mail/versions.xml b/reference/mail/versions.xml
index 5a88758993..fb4cfe4999 100644
--- a/reference/mail/versions.xml
+++ b/reference/mail/versions.xml
@@ -4,7 +4,7 @@
   Do NOT translate this file
 -->
 <versions>
- <function name="ezmlm_hash" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7" deprecated="PHP 7.2.0"/>
+ <function name="ezmlm_hash" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7" deprecated="PHP 7.2.0" removed="PHP 8"/>
  <function name="mail" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
 </versions>
 <!-- Keep this comment at the end of the file
diff --git a/reference/reflection/reflectionmethod/export.xml b/reference/reflection/reflectionmethod/export.xml
index 2223311d18..db0ca2a2ec 100644
--- a/reference/reflection/reflectionmethod/export.xml
+++ b/reference/reflection/reflectionmethod/export.xml
@@ -64,33 +64,31 @@
  </refsect1>
 
  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.4.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/reflection/reflector/export.xml b/reference/reflection/reflector/export.xml
index 0334055512..58c4c84e0d 100644
--- a/reference/reflection/reflector/export.xml
+++ b/reference/reflection/reflector/export.xml
@@ -39,32 +39,30 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.4.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/strings/functions/convert-cyr-string.xml b/reference/strings/functions/convert-cyr-string.xml
index 616fb7f6a5..11abf2caa4 100644
--- a/reference/strings/functions/convert-cyr-string.xml
+++ b/reference/strings/functions/convert-cyr-string.xml
@@ -99,32 +99,30 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.4.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="notes">
diff --git a/reference/strings/functions/hebrevc.xml b/reference/strings/functions/hebrevc.xml
index 977984506d..00b612ba6a 100644
--- a/reference/strings/functions/hebrevc.xml
+++ b/reference/strings/functions/hebrevc.xml
@@ -60,32 +60,30 @@
 
  <refsect1 role="changelog">
   &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>8.0.0</entry>
-       <entry>
-        &removed.function;
-       </entry>
-      </row>
-      <row>
-       <entry>7.4.0</entry>
-       <entry>
-        &deprecated.function;
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       &removed.function;
+      </entry>
+     </row>
+     <row>
+      <entry>7.4.0</entry>
+      <entry>
+       &deprecated.function;
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/strings/versions.xml b/reference/strings/versions.xml
index 0d1e51da16..cde52c0b61 100644
--- a/reference/strings/versions.xml
+++ b/reference/strings/versions.xml
@@ -10,7 +10,7 @@
  <function name="chop" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="chr" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="chunk_split" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="convert_cyr_string" from="PHP 4, PHP 5, PHP 7" deprecated='PHP 7.4.0'/>
+ <function name="convert_cyr_string" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
  <function name="convert_uudecode" from="PHP 5, PHP 7, PHP 8"/>
  <function name="convert_uuencode" from="PHP 5, PHP 7, PHP 8"/>
  <function name="count_chars" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
@@ -21,7 +21,7 @@
  <function name="fprintf" from="PHP 5, PHP 7, PHP 8"/>
  <function name="get_html_translation_table" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="hebrev" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="hebrevc" from="PHP 4, PHP 5, PHP 7" deprecated='PHP 7.4.0'/>
+ <function name="hebrevc" from="PHP 4, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
  <function name="hex2bin" from="PHP 5 &gt;= 5.4.0, PHP 7, PHP 8"/>
  <function name="html_entity_decode" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7, PHP 8"/>
  <function name="htmlentities" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
@@ -36,7 +36,7 @@
  <function name="md5" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="md5_file" from="PHP 4 &gt;= 4.2.0, PHP 5, PHP 7, PHP 8"/>
  <function name="metaphone" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="money_format" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7"/>
+ <function name="money_format" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7" deprecated="PHP 7.4.0" removed="PHP 8"/>
  <function name="nl2br" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
  <function name="nl_langinfo" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7, PHP 8"/>
  <function name="number_format" from="PHP 4, PHP 5, PHP 7, PHP 8"/>