mirror of
https://github.com/sigmasternchen/php-doc-en
synced 2025-03-15 08:28:54 +00:00
Fix other typos outside of php module docs
Patch provided by tandre@php.net. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@349711 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
ba38a95b6a
commit
dcd5448282
13 changed files with 14 additions and 14 deletions
|
@ -2246,7 +2246,7 @@ try {
|
||||||
<listitem>
|
<listitem>
|
||||||
<simpara>
|
<simpara>
|
||||||
The standard &php.ini; files have been re-organized and renamed.
|
The standard &php.ini; files have been re-organized and renamed.
|
||||||
<literal>php.ini-development</literal> contains settings recommded
|
<literal>php.ini-development</literal> contains settings recommended
|
||||||
for use in development environments. <literal>php.ini-production</literal>
|
for use in development environments. <literal>php.ini-production</literal>
|
||||||
contains settings recommended for use in production environments.
|
contains settings recommended for use in production environments.
|
||||||
</simpara>
|
</simpara>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- $Revision$ -->
|
<!-- $Revision$ -->
|
||||||
<!-- Based on UPGRADING version 322438. Work in progess !-->
|
<!-- Based on UPGRADING version 322438. Work in progress !-->
|
||||||
|
|
||||||
<appendix xml:id="migration54" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
|
<appendix xml:id="migration54" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||||
<title>Migrating from PHP 5.3.x to PHP 5.4.x</title>
|
<title>Migrating from PHP 5.3.x to PHP 5.4.x</title>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- $Revision$ -->
|
<!-- $Revision$ -->
|
||||||
<!-- Based on UPGRADING version 322438. Work in progess !-->
|
<!-- Based on UPGRADING version 322438. Work in progress !-->
|
||||||
|
|
||||||
<appendix xml:id="migration55" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
|
<appendix xml:id="migration55" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||||
<title>Migrating from PHP 5.4.x to PHP 5.5.x</title>
|
<title>Migrating from PHP 5.4.x to PHP 5.5.x</title>
|
||||||
|
|
|
@ -74,7 +74,7 @@ while ($foo) {
|
||||||
<literal>$obj->offsetGet("123")</literal> will be called instead of
|
<literal>$obj->offsetGet("123")</literal> will be called instead of
|
||||||
<literal>$obj->offsetGet(123)</literal>. This matches existing behavior for
|
<literal>$obj->offsetGet(123)</literal>. This matches existing behavior for
|
||||||
non-literals. The behavior of arrays is not affected in any way, they
|
non-literals. The behavior of arrays is not affected in any way, they
|
||||||
continue to implicitly convert integeral string keys to integers.
|
continue to implicitly convert integral string keys to integers.
|
||||||
</para>
|
</para>
|
||||||
</sect3>
|
</sect3>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<!-- $Revision$ -->
|
<!-- $Revision$ -->
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
This file shold only be present in the English doc tree. If you
|
This file should only be present in the English doc tree. If you
|
||||||
copy it over to your translation tree you will be hunted down
|
copy it over to your translation tree you will be hunted down
|
||||||
relentlessly! You have been warned! :)
|
relentlessly! You have been warned! :)
|
||||||
-->
|
-->
|
||||||
|
|
|
@ -247,7 +247,7 @@
|
||||||
<para>
|
<para>
|
||||||
The manual content and the user notes are separated to
|
The manual content and the user notes are separated to
|
||||||
<filename>php_manual_LANG.chm</filename> and
|
<filename>php_manual_LANG.chm</filename> and
|
||||||
<filename>php_manual_notes.chm</filename>. There were several resons
|
<filename>php_manual_notes.chm</filename>. There were several reasons
|
||||||
to do this, including:
|
to do this, including:
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
|
|
|
@ -139,7 +139,7 @@
|
||||||
<entry>&false;</entry>
|
<entry>&false;</entry>
|
||||||
<entry>
|
<entry>
|
||||||
Defaults to &false;, as it can be quite hard to read error messages
|
Defaults to &false;, as it can be quite hard to read error messages
|
||||||
in the shell enviroment when they are cluttered up with uninterpreted
|
in the shell environment when they are cluttered up with uninterpreted
|
||||||
<acronym>HTML</acronym> tags.
|
<acronym>HTML</acronym> tags.
|
||||||
</entry>
|
</entry>
|
||||||
</row>
|
</row>
|
||||||
|
@ -660,7 +660,7 @@ array(370) {
|
||||||
experienced - if appropriate, a bug report should be opened at
|
experienced - if appropriate, a bug report should be opened at
|
||||||
<link xlink:href="&url.php.bugs;">&url.php.bugs;</link>.
|
<link xlink:href="&url.php.bugs;">&url.php.bugs;</link>.
|
||||||
It is still easy to run into trouble when trying to use variables
|
It is still easy to run into trouble when trying to use variables
|
||||||
(shell or PHP) in commnad-line code, or using backslashes for
|
(shell or PHP) in command-line code, or using backslashes for
|
||||||
escaping, so take great care when doing so. You have been warned!
|
escaping, so take great care when doing so. You have been warned!
|
||||||
</para>
|
</para>
|
||||||
</note>
|
</note>
|
||||||
|
|
|
@ -758,7 +758,7 @@ php_admin_value[memory_limit] = 32M
|
||||||
</para>
|
</para>
|
||||||
<para>
|
<para>
|
||||||
Settings defined with <literal>php_admin_value</literal> and <literal>php_admin_flag</literal>
|
Settings defined with <literal>php_admin_value</literal> and <literal>php_admin_flag</literal>
|
||||||
cannot be overriden with <function>ini_set</function>.
|
cannot be overridden with <function>ini_set</function>.
|
||||||
</para>
|
</para>
|
||||||
<para>
|
<para>
|
||||||
As of 5.3.3, PHP settings are also possible to be set in webserver.
|
As of 5.3.3, PHP settings are also possible to be set in webserver.
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
explanations running <command>./configure --help</command>.
|
explanations running <command>./configure --help</command>.
|
||||||
Our manual documents the different options separately. You will
|
Our manual documents the different options separately. You will
|
||||||
find the <link linkend="configure.about">core options in the appendix</link>,
|
find the <link linkend="configure.about">core options in the appendix</link>,
|
||||||
while the different extension specific options are descibed on the
|
while the different extension specific options are described on the
|
||||||
reference pages.
|
reference pages.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<orderedlist>
|
<orderedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
It is recomended that you visit the Nginx Wiki
|
It is recommended that you visit the Nginx Wiki
|
||||||
<link xlink:href="&url.nginx.wiki.install;">install</link> page
|
<link xlink:href="&url.nginx.wiki.install;">install</link> page
|
||||||
in order to obtain and install Nginx on your system.
|
in order to obtain and install Nginx on your system.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
account used by the Sambar Server Service. The default account used for
|
account used by the Sambar Server Service. The default account used for
|
||||||
the Sambar Server Service is LocalSystem which will not have access to
|
the Sambar Server Service is LocalSystem which will not have access to
|
||||||
remote resources. The account can be amended by using the Services
|
remote resources. The account can be amended by using the Services
|
||||||
option from within the Windows Control Panel Administation Tools.
|
option from within the Windows Control Panel Administration Tools.
|
||||||
</para>
|
</para>
|
||||||
</note>
|
</note>
|
||||||
</sect2>
|
</sect2>
|
||||||
|
|
|
@ -658,7 +658,7 @@ font_index</parameter></term><listitem><para>A font resource, returned by <funct
|
||||||
<programlisting role='php'>
|
<programlisting role='php'>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
<?php
|
<?php
|
||||||
// Set the enviroment variable for GD
|
// Set the environment variable for GD
|
||||||
putenv('GDFONTPATH=' . realpath('.'));
|
putenv('GDFONTPATH=' . realpath('.'));
|
||||||
|
|
||||||
// Name the font to be used (note the lack of the .ttf extension)
|
// Name the font to be used (note the lack of the .ttf extension)
|
||||||
|
|
|
@ -268,7 +268,7 @@ class MyException extends Exception
|
||||||
If a &return; statement is encountered inside either the &try; or the &catch; blocks,
|
If a &return; statement is encountered inside either the &try; or the &catch; blocks,
|
||||||
the &finally; block will still be executed. Moreover, the &return; statement is
|
the &finally; block will still be executed. Moreover, the &return; statement is
|
||||||
evaluated when encountered, but the result will be returned after the &finally; block
|
evaluated when encountered, but the result will be returned after the &finally; block
|
||||||
is executed. Additionaly, if the &finally; block also contains a &return; statement,
|
is executed. Additionally, if the &finally; block also contains a &return; statement,
|
||||||
the value from the &finally; block is returned.
|
the value from the &finally; block is returned.
|
||||||
</para>
|
</para>
|
||||||
</simplesect>
|
</simplesect>
|
||||||
|
|
Loading…
Reference in a new issue