From 0c3d26f85bdbdeb2f5313f02690ca5260fcb4de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Fri, 20 Dec 2024 08:22:00 -0300
Subject: [PATCH] Move some PDO file  entities at sibling positions

---
 reference/pdo/drivers.xml                          |  9 +++++++--
 reference/pdo_dblib/reference.xml                  | 10 +++++-----
 reference/pdo_firebird/reference.xml               |  1 -
 reference/pdo_mysql/reference.xml                  | 10 +++++-----
 reference/pdo_odbc/reference.xml                   |  6 +++---
 reference/pdo_pgsql/reference.xml                  |  2 +-
 reference/pdo_sqlite/reference.xml                 |  2 +-
 reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir |  0
 8 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir

diff --git a/reference/pdo/drivers.xml b/reference/pdo/drivers.xml
index 9f5a0b345737..e293e86ad9c0 100644
--- a/reference/pdo/drivers.xml
+++ b/reference/pdo/drivers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
- 
+
 <part xml:id="pdo.drivers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>PDO Drivers</title>
 
@@ -68,15 +68,21 @@
 
  &reference.pdo-cubrid.reference;
  &reference.pdo-dblib.reference;
+ &reference.pdo-dblib.pdo-dblib;
  &reference.pdo-firebird.reference;
+ &reference.pdo-firebird.pdo-firebird;
  &reference.pdo-ibm.reference;
  &reference.pdo-informix.reference;
  &reference.pdo-mysql.reference;
+ &reference.pdo-mysql.pdo-mysql;
  &reference.pdo-sqlsrv.reference;
  &reference.pdo-oci.reference;
  &reference.pdo-odbc.reference;
+ &reference.pdo-odbc.pdo-odbc;
  &reference.pdo-pgsql.reference;
+ &reference.pdo-pgsql.pdo-pgsql;
  &reference.pdo-sqlite.reference;
+ &reference.pdo-sqlite.pdo-sqlite;
 </part>
 
 <!-- Keep this comment at the end of the file
@@ -99,4 +105,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/pdo_dblib/reference.xml b/reference/pdo_dblib/reference.xml
index 3d6870f3b62d..53dd24994998 100644
--- a/reference/pdo_dblib/reference.xml
+++ b/reference/pdo_dblib/reference.xml
@@ -18,14 +18,14 @@
      This extension is not available anymore on Windows.
     </para>
     <para>
-     On Windows, you should use SqlSrv, an alternative driver for MS SQL is 
+     On Windows, you should use SqlSrv, an alternative driver for MS SQL is
      available from Microsoft: <link xlink:href="&url.sqlsrv;">&url.sqlsrv;
      </link>.
     </para>
     <para>
-     If it is not possible to use SqlSrv, you can use the 
-     <link linkend="ref.pdo-odbc">PDO_ODBC</link> driver to connect to 
-     Microsoft SQL Server and Sybase databases, as the native Windows DB-LIB 
+     If it is not possible to use SqlSrv, you can use the
+     <link linkend="ref.pdo-odbc">PDO_ODBC</link> driver to connect to
+     Microsoft SQL Server and Sybase databases, as the native Windows DB-LIB
      is ancient, thread un-safe and no longer supported by Microsoft.
     </para>
    </section>
@@ -120,7 +120,7 @@ dblib:host=localhost;dbname=testdb
   </refentry>
 
  </reference>
- &reference.pdo-dblib.pdo-dblib;
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_firebird/reference.xml b/reference/pdo_firebird/reference.xml
index d24a395a37ac..18b8d3d4587b 100644
--- a/reference/pdo_firebird/reference.xml
+++ b/reference/pdo_firebird/reference.xml
@@ -128,7 +128,6 @@ firebird:dbname=localhost:/var/lib/firebird/2.5/data/test.fdb;charset=utf-8;dial
   </refentry>
 
  </reference>
- &reference.pdo-firebird.pdo-firebird;
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_mysql/reference.xml b/reference/pdo_mysql/reference.xml
index 6ccbe52b8727..eb2056c3c94b 100644
--- a/reference/pdo_mysql/reference.xml
+++ b/reference/pdo_mysql/reference.xml
@@ -23,7 +23,7 @@
     </para>
 
     <para>
-     When running a PHP version before 7.1.16, or PHP 7.2 before 7.2.4, set 
+     When running a PHP version before 7.1.16, or PHP 7.2 before 7.2.4, set
      MySQL 8 Server's default password plugin to <emphasis>mysql_native_password</emphasis>
      or else you will see errors similar to
      <emphasis>The server requested authentication method unknown to the client [caching_sha2_password]</emphasis>
@@ -156,9 +156,9 @@ mysql:unix_socket=/tmp/mysql.sock;dbname=testdb
     <note>
      <title>Unix only:</title>
      <para>
-      When the host name is set to <literal>"localhost"</literal>, then the connection to the 
-      server is made through a domain socket. If PDO_MYSQL is compiled against libmysqlclient then the 
-      location of the socket file is at libmysqlclient's compiled in location. If PDO_MYSQL is compiled 
+      When the host name is set to <literal>"localhost"</literal>, then the connection to the
+      server is made through a domain socket. If PDO_MYSQL is compiled against libmysqlclient then the
+      location of the socket file is at libmysqlclient's compiled in location. If PDO_MYSQL is compiled
       against mysqlnd a default socket can be set through the <link linkend="ini.pdo-mysql.default-socket">
       pdo_mysql.default_socket</link> setting.
      </para>
@@ -167,7 +167,7 @@ mysql:unix_socket=/tmp/mysql.sock;dbname=testdb
   </refentry>
 
  </reference>
- &reference.pdo-mysql.pdo-mysql;
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_odbc/reference.xml b/reference/pdo_odbc/reference.xml
index fce87a60cce9..7b52b97cc7d6 100644
--- a/reference/pdo_odbc/reference.xml
+++ b/reference/pdo_odbc/reference.xml
@@ -30,7 +30,7 @@
        <listitem>
         <para>
          Supports access to database servers through the unixODBC driver
-         manager and the database's own ODBC drivers. 
+         manager and the database's own ODBC drivers.
         </para>
        </listitem>
       </varlistentry>
@@ -154,13 +154,13 @@ odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=C:\\db.mdb;Uid=Admin
 ]]>
       </programlisting>
      </example>
-     
+
     </para>
    </refsect1>
   </refentry>
 
  </reference>
- &reference.pdo-odbc.pdo-odbc;
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_pgsql/reference.xml b/reference/pdo_pgsql/reference.xml
index 2175847b1d9f..7aea9bfe99ba 100644
--- a/reference/pdo_pgsql/reference.xml
+++ b/reference/pdo_pgsql/reference.xml
@@ -153,7 +153,7 @@ pgsql:host=/tmp;port=5432;dbname=testdb;user=bruce;password=mypass
   &reference.pdo-pgsql.entities.pdo-overloaded;
 
  </reference>
- &reference.pdo-pgsql.pdo-pgsql;
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml
index 753c62f5814a..70bd4fc651fe 100644
--- a/reference/pdo_sqlite/reference.xml
+++ b/reference/pdo_sqlite/reference.xml
@@ -91,7 +91,7 @@ sqlite:
  &reference.pdo-sqlite.entities.pdo-overloaded;
 
  </reference>
- &reference.pdo-sqlite.pdo-sqlite;
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir b/reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir
new file mode 100644
index 000000000000..e69de29bb2d1