Skip to content

Commit 6b5b64c

Browse files
alfsbAndré L F S Bacci
andauthored
Move some PDO file entities at sibling positions (#4330)
Co-authored-by: André L F S Bacci <[email protected]>
1 parent 32caa89 commit 6b5b64c

File tree

8 files changed

+22
-18
lines changed

8 files changed

+22
-18
lines changed

reference/pdo/drivers.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
3+
44
<part xml:id="pdo.drivers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<title>PDO Drivers</title>
66

@@ -68,15 +68,21 @@
6868

6969
&reference.pdo-cubrid.reference;
7070
&reference.pdo-dblib.reference;
71+
&reference.pdo-dblib.pdo-dblib;
7172
&reference.pdo-firebird.reference;
73+
&reference.pdo-firebird.pdo-firebird;
7274
&reference.pdo-ibm.reference;
7375
&reference.pdo-informix.reference;
7476
&reference.pdo-mysql.reference;
77+
&reference.pdo-mysql.pdo-mysql;
7578
&reference.pdo-sqlsrv.reference;
7679
&reference.pdo-oci.reference;
7780
&reference.pdo-odbc.reference;
81+
&reference.pdo-odbc.pdo-odbc;
7882
&reference.pdo-pgsql.reference;
83+
&reference.pdo-pgsql.pdo-pgsql;
7984
&reference.pdo-sqlite.reference;
85+
&reference.pdo-sqlite.pdo-sqlite;
8086
</part>
8187

8288
<!-- Keep this comment at the end of the file
@@ -99,4 +105,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
99105
vim: et tw=78 syn=sgml
100106
vi: ts=1 sw=1
101107
-->
102-

reference/pdo_dblib/reference.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
This extension is not available anymore on Windows.
1919
</para>
2020
<para>
21-
On Windows, you should use SqlSrv, an alternative driver for MS SQL is
21+
On Windows, you should use SqlSrv, an alternative driver for MS SQL is
2222
available from Microsoft: <link xlink:href="&url.sqlsrv;">&url.sqlsrv;
2323
</link>.
2424
</para>
2525
<para>
26-
If it is not possible to use SqlSrv, you can use the
27-
<link linkend="ref.pdo-odbc">PDO_ODBC</link> driver to connect to
28-
Microsoft SQL Server and Sybase databases, as the native Windows DB-LIB
26+
If it is not possible to use SqlSrv, you can use the
27+
<link linkend="ref.pdo-odbc">PDO_ODBC</link> driver to connect to
28+
Microsoft SQL Server and Sybase databases, as the native Windows DB-LIB
2929
is ancient, thread un-safe and no longer supported by Microsoft.
3030
</para>
3131
</section>
@@ -120,7 +120,7 @@ dblib:host=localhost;dbname=testdb
120120
</refentry>
121121

122122
</reference>
123-
&reference.pdo-dblib.pdo-dblib;
123+
124124
<!-- Keep this comment at the end of the file
125125
Local variables:
126126
mode: sgml

reference/pdo_firebird/reference.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ firebird:dbname=localhost:/var/lib/firebird/2.5/data/test.fdb;charset=utf-8;dial
128128
</refentry>
129129

130130
</reference>
131-
&reference.pdo-firebird.pdo-firebird;
132131
<!-- Keep this comment at the end of the file
133132
Local variables:
134133
mode: sgml

reference/pdo_mysql/reference.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</para>
2424

2525
<para>
26-
When running a PHP version before 7.1.16, or PHP 7.2 before 7.2.4, set
26+
When running a PHP version before 7.1.16, or PHP 7.2 before 7.2.4, set
2727
MySQL 8 Server's default password plugin to <emphasis>mysql_native_password</emphasis>
2828
or else you will see errors similar to
2929
<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
156156
<note>
157157
<title>Unix only:</title>
158158
<para>
159-
When the host name is set to <literal>"localhost"</literal>, then the connection to the
160-
server is made through a domain socket. If PDO_MYSQL is compiled against libmysqlclient then the
161-
location of the socket file is at libmysqlclient's compiled in location. If PDO_MYSQL is compiled
159+
When the host name is set to <literal>"localhost"</literal>, then the connection to the
160+
server is made through a domain socket. If PDO_MYSQL is compiled against libmysqlclient then the
161+
location of the socket file is at libmysqlclient's compiled in location. If PDO_MYSQL is compiled
162162
against mysqlnd a default socket can be set through the <link linkend="ini.pdo-mysql.default-socket">
163163
pdo_mysql.default_socket</link> setting.
164164
</para>
@@ -167,7 +167,7 @@ mysql:unix_socket=/tmp/mysql.sock;dbname=testdb
167167
</refentry>
168168

169169
</reference>
170-
&reference.pdo-mysql.pdo-mysql;
170+
171171
<!-- Keep this comment at the end of the file
172172
Local variables:
173173
mode: sgml

reference/pdo_odbc/reference.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<listitem>
3131
<para>
3232
Supports access to database servers through the unixODBC driver
33-
manager and the database's own ODBC drivers.
33+
manager and the database's own ODBC drivers.
3434
</para>
3535
</listitem>
3636
</varlistentry>
@@ -154,13 +154,13 @@ odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=C:\\db.mdb;Uid=Admin
154154
]]>
155155
</programlisting>
156156
</example>
157-
157+
158158
</para>
159159
</refsect1>
160160
</refentry>
161161

162162
</reference>
163-
&reference.pdo-odbc.pdo-odbc;
163+
164164
<!-- Keep this comment at the end of the file
165165
Local variables:
166166
mode: sgml

reference/pdo_pgsql/reference.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pgsql:host=/tmp;port=5432;dbname=testdb;user=bruce;password=mypass
153153
&reference.pdo-pgsql.entities.pdo-overloaded;
154154

155155
</reference>
156-
&reference.pdo-pgsql.pdo-pgsql;
156+
157157
<!-- Keep this comment at the end of the file
158158
Local variables:
159159
mode: sgml

reference/pdo_sqlite/reference.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ sqlite:
9191
&reference.pdo-sqlite.entities.pdo-overloaded;
9292

9393
</reference>
94-
&reference.pdo-sqlite.pdo-sqlite;
94+
9595
<!-- Keep this comment at the end of the file
9696
Local variables:
9797
mode: sgml

reference/wkhtmltox/wkhtmltox/bits/.xmlfragmentdir

Whitespace-only changes.

0 commit comments

Comments
 (0)