Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appendices/examples.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<simpara>
This does not mean that error handling should be omitted for production code
as it can lead to <exceptionname>TypeError</exceptionname>s being thrown,
failure values being coerces, such as &false; into an empty string,
failure values being coerced, such as &false; into an empty string,
or assumptions being violated which might cause difficult to track bugs.
Some extensions provide complete examples where error handling is included
to demonstrate correct usage of the various functions and methods provided
Expand Down
6 changes: 3 additions & 3 deletions appendices/migration74/other-changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
for including or excluding arguments from stack traces generated
from exceptions.
</para>
<para>
<simpara>
<link linkend="ini.opcache.preload-user">opcache.preload_user</link> is a new INI directive
for specifying the user account under which preloading
code is execute if it would otherwise be run as root (which is not
code is executed if it would otherwise be run as root (which is not
allowed for security reasons).
</para>
</simpara>
</sect2>

<sect2 xml:id="migration74.other-changes.pkg-config">
Expand Down
6 changes: 3 additions & 3 deletions appendices/migration83/new-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<sect3 xml:id="migration83.new-features.core.static-variable-initializers">
<title>Static variable Initializers</title>

<para>
<simpara>
Static variable initializers can now contain arbitrary expressions.
<!-- RFC: RFC: https://wiki.php.net/rfc/arbitrary_static_variable_initializers -->
</para>
<!-- RFC: https://wiki.php.net/rfc/arbitrary_static_variable_initializers -->
</simpara>
</sect3>

<sect3 xml:id="migration83.new-features.core.fallback-value-syntax-for-php-ini">
Expand Down
6 changes: 3 additions & 3 deletions install/windows/apache2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
</para>
</note>

<para>
<simpara>
It is strongly recommended to consult the
<link xlink:href="&url.apache2.docs;">Apache Documentation</link>
to get have a basic understanding of the Apache 2.x Server.
to get a basic understanding of the Apache 2.x Server.
Also consider reading the
<link xlink:href="&url.apache2.windows;">Windows specific notes</link>
for Apache 2.x before reading on here.
</para>
</simpara>

<para>
Download the most recent version of
Expand Down
6 changes: 3 additions & 3 deletions language/wrappers/expect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

<refsect1 role="description"><!-- {{{ -->
&reftitle.description;
<para>
<simpara>
Streams opened via the <filename>expect://</filename> wrapper provide
access to process'es stdio, stdout and stderr via PTY.
</para>
access to process's stdin, stdout and stderr via PTY.
</simpara>
<note>
<title>This wrapper is not enabled by default</title>
<simpara>
Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
&reftitle.resources;
<simpara>
There are four resource types used in CUBRID. The first one is the link
identifier for a database connection, the second is the a resource which
identifier for a database connection, the second is the resource which
holds the result of a query, and the last two a resource which holds the
query results of BLOB/CLOB data types.
</simpara>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<term><parameter>misspelled</parameter></term>
<listitem>
<simpara>
The work to fix
The word to fix
</simpara>
</listitem>
</varlistentry>
Expand Down
6 changes: 3 additions & 3 deletions reference/event/eventbuffer/write.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<parameter>fd</parameter>
</term>
<listitem>
<para>
Socket resource, stream or numeric file descriptor associated normally
<simpara>
Socket resource, stream or numeric file descriptor normally
associated with a socket.
</para>
</simpara>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/exif/functions/exif-read-data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ THUMBNAIL.Thumbnail.Height: 1
<programlisting role="php">
<![CDATA[
<?php
// Open a the file, this should be in binary mode
// Open the file, this should be in binary mode
$fp = fopen('/path/to/image.jpg', 'rb');

if (!$fp) {
Expand Down
2 changes: 1 addition & 1 deletion reference/fdf/functions/fdf-get-attachment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
The returned array contains the following fields:
<itemizedlist>
<listitem>
<simpara><parameter>path</parameter> - path were the file got stored</simpara>
<simpara><parameter>path</parameter> - path where the file got stored</simpara>
</listitem>
<listitem>
<simpara><parameter>size</parameter> - size of the stored file in bytes</simpara>
Expand Down
2 changes: 1 addition & 1 deletion reference/fdf/functions/fdf-set-file.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<methodparam choice="opt"><type>string</type><parameter>target_frame</parameter></methodparam>
</methodsynopsis>
<simpara>
Selects a different PDF document to display the form results in then the
Selects a different PDF document to display the form results in than the
form it originated from.
</simpara>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/filesystem/functions/fgetcsv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
If a sequence of <parameter>escape</parameter> and
<parameter>enclosure</parameter> characters appear in the input,
both characters will be present in the parsed result.
So for the default parameters, a CVS line like
So for the default parameters, a CSV line like
<literal>"a""b","c\"d"</literal> will have the fields parsed as
<literal>a"b</literal> and <literal>c\"d</literal>, respectively.
</simpara>
Expand Down
12 changes: 6 additions & 6 deletions reference/gearman/gearmanclient/jobstatus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ do
$stat = $gmclient->jobStatus($job_handle);
if (!$stat[0]) // the job is known so it is not done
$done = true;
echo "Running: " . ($stat[1] ? "true" : "false") . ", numerator: " . $stat[2] . ", denomintor: " . $stat[3] . "\n";
echo "Running: " . ($stat[1] ? "true" : "false") . ", numerator: " . $stat[2] . ", denominator: " . $stat[3] . "\n";
}
while(!$done);

Expand All @@ -88,11 +88,11 @@ echo "done!\n";
&example.outputs.similar;
<screen>
<![CDATA[
Running: true, numerator: 3, denomintor: 14
Running: true, numerator: 6, denomintor: 14
Running: true, numerator: 9, denomintor: 14
Running: true, numerator: 12, denomintor: 14
Running: false, numerator: 0, denomintor: 0
Running: true, numerator: 3, denominator: 14
Running: true, numerator: 6, denominator: 14
Running: true, numerator: 9, denominator: 14
Running: true, numerator: 12, denominator: 14
Running: false, numerator: 0, denominator: 0
done!
]]>
</screen>
Expand Down
2 changes: 1 addition & 1 deletion reference/gearman/gearmanclient/setdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</simpara>
<note>
<simpara>
This method has been replaced by <methodname>GearmanCient::setContext</methodname> in the
This method has been replaced by <methodname>GearmanClient::setContext</methodname> in the
0.6.0 release of the Gearman extension.
</simpara>
</note>
Expand Down
4 changes: 2 additions & 2 deletions reference/gearman/gearmanjob/sendstatus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<term><parameter>numerator</parameter></term>
<listitem>
<simpara>
The numerator of the precentage completed expressed as a fraction.
The numerator of the percentage completed expressed as a fraction.
</simpara>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>denominator</parameter></term>
<listitem>
<simpara>
The denominator of the precentage completed expressed as a fraction.
The denominator of the percentage completed expressed as a fraction.
</simpara>
</listitem>
</varlistentry>
Expand Down
6 changes: 3 additions & 3 deletions reference/gearman/gearmanjob/status.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<note>
<simpara>
This method has been replaced by <methodname>GearmanJob::sendStatus</methodname> in the
0.6.0 release of the Gearman extenstion.
0.6.0 release of the Gearman extension.
</simpara>
</note>
</refsect1>
Expand All @@ -32,15 +32,15 @@
<term><parameter>numerator</parameter></term>
<listitem>
<simpara>
The numerator of the precentage completed expressed as a fraction.
The numerator of the percentage completed expressed as a fraction.
</simpara>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>denominator</parameter></term>
<listitem>
<simpara>
The denominator of the precentage completed expressed as a fraction.
The denominator of the percentage completed expressed as a fraction.
</simpara>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/gearman/gearmanworker/timeout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<simpara>
A time period is milliseconds. A negative value indicates an infinite timeout.
A time period in milliseconds. A negative value indicates an infinite timeout.
</simpara>
</refsect1>

Expand Down
6 changes: 3 additions & 3 deletions reference/gmp/functions/gmp-add.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<varlistentry>
<term><parameter>num1</parameter></term>
<listitem>
<para>
The first summand (augent).
</para>
<simpara>
The first summand (augend).
</simpara>
&gmp.parameter;
</listitem>
</varlistentry>
Expand Down
4 changes: 2 additions & 2 deletions reference/gmp/functions/gmp-init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
the string is interpreted as a hexadecimal integer.
If the first two characters are <literal>0b</literal> or <literal>0B</literal>,
the string is interpreted as a binary integer.
If the first two characters are <literal>0o</literal> or <literal>0o</literal>,
If the first two characters are <literal>0o</literal> or <literal>0O</literal>,
the string is interpreted as an octal integer.
Moreover, if the first character is <literal>0</literal> the string
is also interpreted as an octal integer.
Expand Down Expand Up @@ -85,7 +85,7 @@
<entry>8.1.0</entry>
<entry>
Support for explicit octal prefixes <literal>0o</literal> and
<literal>0o</literal> has been added for <parameter>num</parameter> strings.
<literal>0O</literal> has been added for <parameter>num</parameter> strings.
Interpretation of such prefixes when <parameter>base</parameter> is
<literal>0</literal> has also been added.
</entry>
Expand Down
2 changes: 1 addition & 1 deletion reference/gnupg/functions/gnupg-getengineinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<simpara>
Returns an array with engine info consting of <literal>protocol</literal>,
Returns an array with engine info consisting of <literal>protocol</literal>,
<literal>file_name</literal> and <literal>home_dir</literal>.
</simpara>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/gnupg/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
&reftitle.notes;
<simpara>
This extension makes use of the keyring of the current user. This keyring
is normally located in ~./.gnupg/.
is normally located in ~/.gnupg/.
To specify a custom location, store the path to the keyring in the
environment variable GNUPGHOME. See <link linkend="function.putenv">putenv</link> for more information how to do
this.
Expand Down
2 changes: 1 addition & 1 deletion reference/ibm_db2/functions/db2-fetch-row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ goat Rickety Ride
<function>db2_fetch_array</function>, or <function>db2_fetch_object</function>
over <function>db2_fetch_row</function>/<function>db2_result</function>. In general
<function>db2_fetch_row</function>/<function>db2_result</function> have more issues
with various column types in <literal>EBCIDIC</literal> to <literal>ASCII</literal>
with various column types in <literal>EBCDIC</literal> to <literal>ASCII</literal>
translation, including possible truncation in <literal>DBCS</literal> applications.
You may also find the performance of <function>db2_fetch_both</function>,
<function>db2_fetch_array</function>, and <function>db2_fetch_object</function> to
Expand Down
2 changes: 1 addition & 1 deletion reference/info/functions/assert-options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<row>
<entry>8.3.0</entry>
<entry>
<function>assert_option</function> is now deprecated.
<function>assert_options</function> is now deprecated.
</entry>
</row>
<row>
Expand Down
2 changes: 1 addition & 1 deletion reference/intl/intlcalendar/getkeywordvaluesforlocale.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
&reftitle.examples;
<para>
<example>
<title><function>IntlCalendar::getKeyworkValuesForLocale</function></title>
<title><function>IntlCalendar::getKeywordValuesForLocale</function></title>
<programlisting role="php">
<![CDATA[
<?php
Expand Down
2 changes: 1 addition & 1 deletion reference/intl/intlcalendar/getleastmaximum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<methodparam><type>int</type><parameter>field</parameter></methodparam>
</methodsynopsis>
<simpara>
Returns the smallest local maximumw for a field. This should be a value
Returns the smallest local maximum for a field. This should be a value
smaller or equal to that returned by
<function>IntlCalendar::getActualMaximum</function>, which is in its turn
smaller or equal to that returned by
Expand Down
4 changes: 2 additions & 2 deletions reference/mongodb/mongodb/driver/manager/startsession.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</simpara>
<simpara>
See
<link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Casual Consistency</link>
<link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Causal Consistency</link>
in the MongoDB manual for more information.
</simpara>
</entry>
Expand Down Expand Up @@ -194,7 +194,7 @@
&reftitle.seealso;
<simplelist>
<member><classname>MongoDB\Driver\Session</classname></member>
<member><link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Casual Consistency</link> in the MongoDB manual</member>
<member><link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Causal Consistency</link> in the MongoDB manual</member>
</simplelist>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/mongodb/mongodb/driver/readconcern/isdefault.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<simpara>
The driver will not include a default read concern in its read operations
(e.g. <methodname>MongoDB\Driver\Manager::executeQuery</methodname>) in order
order to allow the server to apply its own default. Libraries that access the
to allow the server to apply its own default. Libraries that access the
Manager's read concern to include it in their own read commands should use
this method to ensure that default read concerns are left unset.
</simpara>
Expand Down
2 changes: 1 addition & 1 deletion reference/mongodb/mongodb/driver/server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<term><constant>MongoDB\Driver\Server::TYPE_POSSIBLE_PRIMARY</constant></term>
<listitem>
<simpara>Replica set possible primary server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
<simpara>A server may be identified as a possible primary if it has not yet been checked but another memory of the replica set thinks it is the primary.</simpara>
<simpara>A server may be identified as a possible primary if it has not yet been checked but another member of the replica set thinks it is the primary.</simpara>
</listitem>
</varlistentry>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
&true; if a given column as a signed type.
</para>
<simpara>
&true; if a given column has a signed type.
</simpara>
</refsect1>

<refsect1 role="examples">
Expand Down
2 changes: 1 addition & 1 deletion reference/mysqli/mysqli_stmt/error-list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if ($stmt = mysqli_prepare($link, $query)) {
mysqli_stmt_execute($stmt);

echo "Error:\n";
print_r(mysql_stmt_error_list($stmt));
print_r(mysqli_stmt_error_list($stmt));

/* close statement */
mysqli_stmt_close($stmt);
Expand Down
2 changes: 1 addition & 1 deletion reference/pdo_cubrid/constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
</row>
<row xml:id="pdo.constants.cubrid-sch-cross-reference">
<entry><constant>PDO::CUBRID_SCH_CROSS_REFERENCE</constant></entry>
<entry>Get reference relationship of tow tables.</entry>
<entry>Get reference relationship of two tables.</entry>
</row>
</tbody>
</tgroup>
Expand Down
2 changes: 1 addition & 1 deletion reference/ps/functions/ps-rect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<para>
<simplelist>
<member><function>ps_arc</function></member>
<member><function>ps_cirle</function></member>
<member><function>ps_circle</function></member>
<member><function>ps_lineto</function></member>
</simplelist>
</para>
Expand Down
2 changes: 1 addition & 1 deletion reference/snmp/functions/snmpgetnext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<programlisting role="php">
<![CDATA[
<?php
$nameOfSecondInterface = snmpgetnetxt('localhost', 'public', 'IF-MIB::ifName.1');
$nameOfSecondInterface = snmpgetnext('localhost', 'public', 'IF-MIB::ifName.1');
?>
]]>
</programlisting>
Expand Down
Loading