Skip to content

Commit 7641a62

Browse files
committed
Fix grammar in PDO documentation.
1 parent 84534c7 commit 7641a62

20 files changed

Lines changed: 55 additions & 51 deletions

appendices/migration72/new-features.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ $db->quote('über', PDO::PARAM_STR | PDO::PARAM_STR_NATL);
156156
<sect2 xml:id="migration72.new-features.additional-emulated-prepares-debugging-info">
157157
<title>Additional emulated prepares debugging information for <link linkend="book.pdo">PDO</link></title>
158158

159-
<para>
159+
<simpara>
160160
The <function>PDOStatement::debugDumpParams</function> method has been
161161
updated to include the SQL being sent to the DB, where the full, raw query
162-
(including the replaced placeholders with their bounded values) will be
162+
(including the replaced placeholders with their bound values) will be
163163
shown. This has been added to aid with debugging emulated prepares (and so
164164
it will only be available when emulated prepares are turned on).
165-
</para>
165+
</simpara>
166166
</sect2>
167167

168168
<sect2 xml:id="migration72.new-features.extended-ops-in-ldap">

reference/pdo/configure.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<procedure xml:id="pdo.install.unix51up">
1010
<title>Installing PDO on Unix systems</title>
1111
<step>
12-
<para>
12+
<simpara>
1313
PDO and the <link linkend="ref.pdo-sqlite">PDO_SQLITE</link> driver
14-
is enabled by default. You may need
14+
are enabled by default. You may need
1515
to enable the PDO driver for your database of choice; consult the
1616
documentation for
1717
<link linkend="pdo.drivers">database-specific PDO drivers</link>
1818
to find out more about that.
19-
</para>
19+
</simpara>
2020
<note>
2121
<para>
2222
When building PDO as a shared extension (<emphasis>not

reference/pdo/connections.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ $dbh = new PDO('mysql:host=localhost;dbname=test', $user, $pass, array(
114114
</programlisting>
115115
</example>
116116
</para>
117-
<para>
117+
<simpara>
118118
The value of the <constant>PDO::ATTR_PERSISTENT</constant> option is converted
119119
to &boolean; (enable/disable persistent connections), unless it is a non-numeric
120-
&string;, in which case it allows to use multiple persistent connection pools.
120+
&string;, in which case it allows the use of multiple persistent connection pools.
121121
This is useful if different connections use incompatible settings, for instance,
122122
different values of <constant>PDO::MYSQL_ATTR_USE_BUFFERED_QUERY</constant>.
123-
</para>
123+
</simpara>
124124
<note>
125125
<para>
126126
If you wish to use persistent connections, you must set

reference/pdo/constants.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,10 @@
425425
</term>
426426
<listitem>
427427
<simpara>
428-
Sets the class name of which statements are returned as.
428+
Sets the class name and constructor arguments for the extension of the
429+
<classname>PDOStatement</classname> object. The first
430+
element of the array is the class name, and the second element is an
431+
array of constructor arguments.
429432
</simpara>
430433
</listitem>
431434
</varlistentry>
@@ -518,8 +521,9 @@
518521
</term>
519522
<listitem>
520523
<simpara>
521-
Sets the default string parameter type, this can be one of <constant>PDO::PARAM_STR_NATL</constant>
522-
and <constant>PDO::PARAM_STR_CHAR</constant>.
524+
Sets the default string parameter type, which can be either
525+
<constant>PDO::PARAM_STR_NATL</constant>
526+
or <constant>PDO::PARAM_STR_CHAR</constant>.
523527
</simpara>
524528
<simpara>
525529
Available as of PHP 7.2.0.

reference/pdo/ini.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</term>
4040
<listitem>
4141
<para>
42-
Defines DSN alias. See <methodname>PDO::__construct</methodname> for
42+
Defines a DSN alias. See <methodname>PDO::__construct</methodname> for
4343
thorough explanation.
4444
</para>
4545
</listitem>

reference/pdo/pdo/connect.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<simpara>
1818
Creates an instance of a <classname>PDO</classname> subclass for the
1919
database being connected to, if it exists,
20-
otherwise return a generic <classname>PDO</classname> instance.
20+
otherwise returns a generic <classname>PDO</classname> instance.
2121
</simpara>
2222
</refsect1>
2323

reference/pdo/pdo/errorcode.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323

2424
<refsect1 role="returnvalues">
2525
&reftitle.returnvalues;
26-
<para>
27-
Returns an SQLSTATE, a five characters alphanumeric identifier defined in
26+
<simpara>
27+
Returns an SQLSTATE, a five-character alphanumeric identifier defined in
2828
the ANSI SQL-92 standard. Briefly, an SQLSTATE consists of a
29-
two characters class value followed by a three characters subclass value. A
29+
two-character class value followed by a three-character subclass value. A
3030
class value of 01 indicates a warning and is accompanied by a return code
3131
of SQL_SUCCESS_WITH_INFO. Class values other than '01', except for the
3232
class 'IM', indicate an error. The class 'IM' is specific to warnings
3333
and errors that derive from the implementation of PDO (or perhaps ODBC,
3434
if you're using the ODBC driver) itself. The subclass value '000' in any
3535
class indicates that there is no subclass for that SQLSTATE.
36-
</para>
36+
</simpara>
3737
<para>
3838
<methodname>PDO::errorCode</methodname> only retrieves error codes for operations
3939
performed directly on the database handle. If you create a PDOStatement

reference/pdo/pdo/errorinfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<tbody>
3939
<row>
4040
<entry>0</entry>
41-
<entry>SQLSTATE error code (a five characters alphanumeric identifier defined
41+
<entry>SQLSTATE error code (a five-character alphanumeric identifier defined
4242
in the ANSI SQL standard).</entry>
4343
</row>
4444
<row>

reference/pdo/pdo/getavailabledrivers.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</methodsynopsis>
2121
<para>
2222
This function returns all currently available PDO drivers which can be used
23-
in <parameter>DSN</parameter> parameter of
23+
in the <parameter>DSN</parameter> parameter of
2424
<methodname>PDO::__construct</methodname>.
2525
</para>
2626

reference/pdo/pdo/prepare.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
statement, unless emulation mode is on.
3333
</para>
3434
<note>
35-
<para>
35+
<simpara>
3636
Parameter markers can represent a complete data literal only.
37-
Neither part of literal, nor keyword, nor identifier, nor whatever arbitrary query
38-
part can be bound using parameters. For example, you cannot bind multiple values
37+
Neither part of a literal, nor keyword, nor identifier, nor whatever arbitrary query
38+
part can be bound using parameters. For example, you cannot bind multiple values
3939
to a single parameter in the IN() clause of an SQL statement.
40-
</para>
40+
</simpara>
4141
</note>
4242
<para>
4343
Calling <methodname>PDO::prepare</methodname> and
@@ -113,10 +113,10 @@
113113
<classname>PDOException</classname> (depending on <link linkend="pdo.error-handling">error handling</link>).
114114
</para>
115115
<note>
116-
<para>
117-
Emulated prepared statements does not communicate with the database server
116+
<simpara>
117+
Emulated prepared statements do not communicate with the database server
118118
so <methodname>PDO::prepare</methodname> does not check the statement.
119-
</para>
119+
</simpara>
120120
</note>
121121
</refsect1>
122122

0 commit comments

Comments
 (0)