Skip to content

Commit

Permalink
Move some PDO file entities at sibling positions (#4330)
Browse files Browse the repository at this point in the history
Co-authored-by: André L F S Bacci <ae@php.net>
  • Loading branch information
alfsb and André L F S Bacci authored Dec 21, 2024
1 parent 32caa89 commit 6b5b64c
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 18 deletions.
9 changes: 7 additions & 2 deletions reference/pdo/drivers.xml
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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
Expand All @@ -99,4 +105,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
-->

10 changes: 5 additions & 5 deletions reference/pdo_dblib/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion reference/pdo_firebird/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions reference/pdo_mysql/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions reference/pdo_odbc/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion reference/pdo_pgsql/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion reference/pdo_sqlite/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file.

0 comments on commit 6b5b64c

Please sign in to comment.