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/migration84/new-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $object = $reflector->newLazyGhost($initializer);

<!-- TODO: expand and examples? -->
<simpara>
New expressions with constructor arguments are now dereferencable, meaning
New expressions with constructor arguments are now dereferenceable, meaning
they allow chaining method calls, property accesses, etc. without enclosing
the expression in parentheses.
</simpara>
Expand Down
4 changes: 2 additions & 2 deletions language-snippets.ent
Original file line number Diff line number Diff line change
Expand Up @@ -1240,15 +1240,15 @@ returned by <function>dbmopen</function>.</simpara></listitem></varlistentry>'>
<entry>8.0.0</entry>
<entry>
<parameter>broker</parameter> expects an <classname>EnchantBroker</classname> instance now;
previoulsy, a &resource; was expected.
previously, a &resource; was expected.
</entry>
</row>'>

<!ENTITY enchant.changelog.dictionary-param '<row xmlns="http://docbook.org/ns/docbook">
<entry>8.0.0</entry>
<entry>
<parameter>dictionary</parameter> expects an <classname>EnchantDictionary</classname> instance now;
previoulsy, a &resource; was expected.
previously, a &resource; was expected.
</entry>
</row>'>

Expand Down
2 changes: 1 addition & 1 deletion language/exceptions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class Exception implements Throwable
final public function getPrevious(); // previous exception
final public function getTraceAsString(); // formatted string of trace
// Overrideable
// Overridable
public function __toString(); // formatted string for display
}
]]>
Expand Down
2 changes: 1 addition & 1 deletion language/oop5/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
caught in the <link linkend="language.exceptions">catch</link> block, and
would result in a fatal error. Exceptions now thrown in the __autoload function
can be caught in the <link linkend="language.exceptions">catch</link> block, with
one provison. If throwing a custom exception, then the custom exception class must
one provision. If throwing a custom exception, then the custom exception class must
be available. The __autoload function may be used recursively to autoload the
custom exception class.
</entry>
Expand Down
6 changes: 3 additions & 3 deletions reference/com/ini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@
<parameter>com.autoregister_casesensitive</parameter>
</term>
<listitem>
<para>
<simpara>
When this is turned on (the default), constants found in auto-loaded
type libraries when instatiating <classname>COM</classname> objects will be registered case sensitively. See
type libraries when instantiating <classname>COM</classname> objects will be registered case sensitively. See
<function>com_load_typelib</function> for more details.
</para>
</simpara>
</listitem>
</varlistentry>

Expand Down
6 changes: 3 additions & 3 deletions reference/curl/constants_curl_setopt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1754,12 +1754,12 @@
(<type>int</type>)
</term>
<listitem>
<para>
<simpara>
The maximum amount of HTTP redirections to follow. Use this option alongside <constant>CURLOPT_FOLLOWLOCATION</constant>.
Default value of <literal>20</literal> is set to prevent infinite redirects.
Setting to <literal>-1</literal> allows inifinite redirects, and <literal>0</literal> refuses all redirects.
Setting to <literal>-1</literal> allows infinite redirects, and <literal>0</literal> refuses all redirects.
Available as of cURL 7.5.0.
</para>
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curlopt-max-recv-speed-large">
Expand Down
6 changes: 3 additions & 3 deletions reference/datetime/datetime/settimezone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
<simpara>
Returns the <classname>DateTime</classname> object for method chaining. The
underlaying point-in-time is not changed when calling this method.
</para>
underlying point-in-time is not changed when calling this method.
</simpara>
</refsect1>

<refsect1 role="examples">
Expand Down
6 changes: 3 additions & 3 deletions reference/datetime/datetimeimmutable/settimezone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
<simpara>
Returns a new modified <classname>DateTimeImmutable</classname> object for
method chaining. The underlaying point-in-time is not changed when calling
method chaining. The underlying point-in-time is not changed when calling
this method.
</para>
</simpara>
</refsect1>

<refsect1 role="examples">
Expand Down
2 changes: 1 addition & 1 deletion reference/dba/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<function>dba_firstkey</function> and <function>dba_nextkey</function>
return string representations of the key there is the function
<function>dba_key_split</function> which allows
to convert the string keys into array keys without loosing &false;.
to convert the string keys into array keys without losing &false;.
</entry>
</row>

Expand Down
2 changes: 1 addition & 1 deletion reference/filter/constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
</term>
<listitem>
<simpara>
Singe and double quotes (<literal>'</literal> and <literal>"</literal>)
Single and double quotes (<literal>'</literal> and <literal>"</literal>)
will not be encoded.
</simpara>
</listitem>
Expand Down
2 changes: 1 addition & 1 deletion reference/fpm/status.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<entry>The name of the FPM process pool.</entry>
</row>
<row>
<entry>proccess manager</entry>
<entry>process manager</entry>
<entry>The process manager type - static, dynamic or ondemand.</entry>
</row>
<row>
Expand Down
6 changes: 3 additions & 3 deletions reference/image/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
</caution>
</para>

<para>
GD supports a varity of formats, below is a list of formats supported by GD and notes
<simpara>
GD supports a variety of formats, below is a list of formats supported by GD and notes
to their availability including read/write support.
</para>
</simpara>
<para>
<table>
<title>Formats supported by GD</title>
Expand Down
4 changes: 2 additions & 2 deletions reference/image/functions/getimagesize.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<simpara>
<function>getimagesize</function> is agnostic of any image metadata.
If e.g. the Exif <literal>Orientation</literal> flag is set to a value which
rotates the image by 90 or 270 degress, index 0 and 1 are swapped,
rotates the image by 90 or 270 degrees, index 0 and 1 are swapped,
i.e. the contain the height and width, respectively.
</simpara>
</note>
Expand All @@ -135,7 +135,7 @@
directly in an <acronym>IMG</acronym> tag.
</para>
<para>
<literal>mime</literal> is the correspondant MIME type of the image.
<literal>mime</literal> is the corresponding MIME type of the image.
This information can be used to deliver images with the correct HTTP
<literal>Content-type</literal> header:
<example>
Expand Down
6 changes: 3 additions & 3 deletions reference/image/functions/imagecolortransparent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ imagepng($im, './imagecolortransparent.png');
<refsect1 role="notes">
&reftitle.notes;
<note>
<para>
<simpara>
Transparency is copied only with <function>imagecopymerge</function> and
true color images, not with <function>imagecopy</function> or pallete images.
</para>
true color images, not with <function>imagecopy</function> or palette images.
</simpara>
</note>
<note>
<para>
Expand Down
6 changes: 3 additions & 3 deletions reference/image/functions/imagecopymerge.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@
<varlistentry>
<term><parameter>pct</parameter></term>
<listitem>
<para>
<simpara>
The two images will be merged according to <parameter>pct</parameter>
which can range from 0 to 100. When <parameter>pct</parameter> = 0,
no action is taken, when 100 this function behaves identically
to <function>imagecopy</function> for pallete images, except for
to <function>imagecopy</function> for palette images, except for
ignoring alpha components, while it implements alpha transparency
for true colour images.
</para>
</simpara>
</listitem>
</varlistentry>
</variablelist>
Expand Down
6 changes: 3 additions & 3 deletions reference/image/functions/imagecopymergegray.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@
<varlistentry>
<term><parameter>pct</parameter></term>
<listitem>
<para>
<simpara>
The <parameter>src_image</parameter> will be changed to grayscale according
to <parameter>pct</parameter> where 0 is fully grayscale and 100 is
unchanged. When <parameter>pct</parameter> = 100 this function behaves
identically to <function>imagecopy</function> for pallete images, except for
identically to <function>imagecopy</function> for palette images, except for
ignoring alpha components, while
it implements alpha transparency for true colour images.
</para>
</simpara>
</listitem>
</varlistentry>
</variablelist>
Expand Down
2 changes: 1 addition & 1 deletion reference/image/functions/imagefilltoborder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ imagepng($im);
The algorithm does not explicitly remember which pixels have
already been set, but rather infers that from the color of the
pixel, so it cannot distinguish between freshly set pixels and
pixels that are already there. That means chosing any fill color
pixels that are already there. That means choosing any fill color
that is already used in the image may yield undesired results.
</simpara>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/image/functions/imagefilter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
</listitem>
<listitem>
<simpara>
<constant>IMG_FILTER_SCATTER</constant>: Effect substraction level.
<constant>IMG_FILTER_SCATTER</constant>: Effect subtraction level.
This must not be higher or equal to the addition level set with
<parameter>arg2</parameter>.
</simpara>
Expand Down
2 changes: 1 addition & 1 deletion reference/image/functions/imageftbbox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ $font = './arial.ttf';
// First we create our bounding box
$bbox = imageftbbox(10, 0, $font, 'The PHP Documentation Group');
// This is our cordinates for X and Y
// This is our coordinates for X and Y
$x = $bbox[0] + (imagesx($im) / 2) - ($bbox[4] / 2) - 5;
$y = $bbox[1] + (imagesy($im) / 2) - ($bbox[5] / 2) - 5;
Expand Down
8 changes: 4 additions & 4 deletions reference/image/functions/imagepalettetotruecolor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns &true; if the convertion was complete, or if the source image already
<simpara>
Returns &true; if the conversion was complete, or if the source image already
is a true color image, otherwise &false; is returned.
</para>
</simpara>
</refsect1>

<refsect1 role="changelog">
Expand Down Expand Up @@ -62,7 +62,7 @@
<programlisting role="php">
<![CDATA[
<?php
// Backwards compatiblity
// Backwards compatibility
if(!function_exists('imagepalettetotruecolor'))
{
function imagepalettetotruecolor(&$src)
Expand Down
6 changes: 3 additions & 3 deletions reference/image/functions/imageresolution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
are set to this value. If none of the optional parameters are &null;, the horizontal
and vertical resolution are set to these values, respectively.
</para>
<para>
<simpara>
The resolution is only used as meta information when images are read from and
written to formats supporting this kind of information (curently PNG and
written to formats supporting this kind of information (currently PNG and
JPEG). It does not affect any drawing operations. The default resolution
for new images is 96 DPI.
</para>
</simpara>
</refsect1><!-- }}} -->

<refsect1 role="parameters"><!-- {{{ -->
Expand Down
4 changes: 2 additions & 2 deletions reference/image/functions/imagettfbbox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ $font = './arial.ttf';
// First we create our bounding box for the first text
$bbox = imagettfbbox(10, 45, $font, 'Powered by PHP ' . phpversion());

// This is our cordinates for X and Y
// This is our coordinates for X and Y
$x = $bbox[0] + (imagesx($im) / 2) - ($bbox[4] / 2) - 25;
$y = $bbox[1] + (imagesy($im) / 2) - ($bbox[5] / 2) - 5;

Expand All @@ -178,7 +178,7 @@ imagettftext($im, 10, 45, $x, $y, $black, $font, 'Powered by PHP ' . phpversion(
// Create the next bounding box for the second text
$bbox = imagettfbbox(10, 45, $font, 'and Zend Engine ' . zend_version());

// Set the cordinates so its next to the first text
// Set the coordinates so its next to the first text
$x = $bbox[0] + (imagesx($im) / 2) - ($bbox[4] / 2) + 10;
$y = $bbox[1] + (imagesy($im) / 2) - ($bbox[5] / 2) - 5;

Expand Down
6 changes: 3 additions & 3 deletions reference/info/functions/get-defined-constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ Array

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
<simpara>
Returns an array of constant name => constant value array, optionally
groupped by extension name registering the constant.
</para>
grouped by extension name registering the constant.
</simpara>
</refsect1>

<refsect1 role="examples">
Expand Down
4 changes: 2 additions & 2 deletions reference/info/functions/phpversion.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ echo phpversion('zip');
* $version_id = $major_version * 10000 + $minor_version * 100 + $release_version;
*
* Now with PHP_VERSION_ID we can check for features this PHP version
* may have, this doesn't require to use version_compare() everytime
* may have, this doesn't require to use version_compare() every time
* you check if the current PHP version may not support a feature.
*
* For example, we may here define the PHP_*_VERSION constants thats
* For example, we may here define the PHP_*_VERSION constants that's
* not available in versions prior to 5.2.7
*/

Expand Down
6 changes: 3 additions & 3 deletions reference/ldap/functions/ldap-exop-passwd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<varlistentry>
<term><parameter>old_password</parameter></term>
<listitem>
<para>
The old password of this user. May be ommited depending of server configuration.
</para>
<simpara>
The old password of this user. May be omitted depending of server configuration.
</simpara>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
6 changes: 3 additions & 3 deletions reference/ldap/functions/ldap-mod-add.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<varlistentry>
<term><parameter>entry</parameter></term>
<listitem>
<para>
An associative array listing the attirbute values to add. If an attribute was not existing yet it will be added. If an attribute is existing you can only add values to it if it supports multiple values.
</para>
<simpara>
An associative array listing the attribute values to add. If an attribute was not existing yet it will be added. If an attribute is existing you can only add values to it if it supports multiple values.
</simpara>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/mysqlnd/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ d:t:x:O,/tmp/mysqlnd.trace
<simpara>
Copying result sets instead of having PHP variables reference
them allows releasing the memory occupied for the PHP variables earlier.
Depending on the user API code, the actual database quries and the
Depending on the user API code, the actual database queries and the
size of their result sets this may reduce the memory footprint
of mysqlnd.
</simpara>
Expand Down
2 changes: 1 addition & 1 deletion reference/network/functions/dns-get-record.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<entry>type</entry>
<entry>
String containing the record type. Additional attributes will also be contained
in the resulting array dependant on the value of type. See table below.
in the resulting array dependent on the value of type. See table below.
</entry>
</row>
<row>
Expand Down
6 changes: 3 additions & 3 deletions reference/openssl/functions/openssl-pbkdf2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<varlistentry>
<term><parameter>salt</parameter></term>
<listitem>
<para>
PBKDF2 recommends a crytographic salt of at least 128 bits (16 bytes).
</para>
<simpara>
PBKDF2 recommends a cryptographic salt of at least 128 bits (16 bytes).
</simpara>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/pdo/pdo/prepare.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
The parser used for emulated prepared statements and for
rewriting named or question mark style parameters supports the non standard
backslash escapes for single- and double quotes. That means that terminating
quotes immediately preceeded by a backslash are not recognized as such, which
quotes immediately preceded by a backslash are not recognized as such, which
may result in wrong detection of parameters causing the prepared statement to
fail when it is executed. A work-around is to not use emulated prepares for
such SQL queries, and to avoid rewriting of parameters by using a parameter style
Expand Down
2 changes: 1 addition & 1 deletion reference/phar/ini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<caution>
<simpara>
<literal>phar.require_hash</literal> does not provide any security per se,
it is merely a measure against running accidentially corrupted Phar archives,
it is merely a measure against running accidentally corrupted Phar archives,
because anyone who would be able to tamper with the Phar could easily fix
the signature afterwards.
</simpara>
Expand Down
Loading