irc-html Thu Jan 17 22:32:23 2002 EDT
Modified files:
/phpdoc/en/appendices about.xml commandline.xml debugger.xml
history.xml migration4.xml phpdevel.xml
/phpdoc/en/functions gmp.xml ibase.xml icap.xml ifx.xml
Log:
parameter corrections, spelling corrections
Index: phpdoc/en/appendices/about.xml
diff -u phpdoc/en/appendices/about.xml:1.9 phpdoc/en/appendices/about.xml:1.10
--- phpdoc/en/appendices/about.xml:1.9 Fri Jan 4 17:37:01 2002
+++ phpdoc/en/appendices/about.xml Thu Jan 17 22:32:22 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!--
TODO: add manual conventions section (eg. how to read
@@ -165,7 +165,7 @@
url="&url.docbook.xml;">DocBook XML DTD</ulink>, using <ulink
url="&url.dsssl;"><acronym>DSSSL</acronym></ulink> (Document
Style and Semantics Specification Language) for formatting, and
- experimentaly the <ulink url="&url.xslt;"><acronym>XSLT</acronym>
+ experimentally the <ulink url="&url.xslt;"><acronym>XSLT</acronym>
</ulink> (Extensible Stylesheet Language Transformations)
for maintenance and formatting.
</para>
Index: phpdoc/en/appendices/commandline.xml
diff -u phpdoc/en/appendices/commandline.xml:1.8
phpdoc/en/appendices/commandline.xml:1.9
--- phpdoc/en/appendices/commandline.xml:1.8 Fri Dec 28 10:14:25 2001
+++ phpdoc/en/appendices/commandline.xml Thu Jan 17 22:32:22 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!--
TODO:
@@ -113,7 +113,7 @@
<entry>-C</entry>
<entry>
Normally PHP changes the working directory to the
- running scripts direcrory. This makes it possible
+ running scripts directory. This makes it possible
for example, to open files in the same directory,
with only specifying the name of the file. If you
would like to disable this directory change, use
@@ -141,7 +141,7 @@
<entry>-l</entry>
<entry>
Check the file given for syntax errors. This
- option implies -q. Use for debugging purpouses.
+ option implies -q. Use for debugging purposes.
This option won't find fatal errors (like undefined
functions). Use -f if you would like to test
for fatal errors too.
Index: phpdoc/en/appendices/debugger.xml
diff -u phpdoc/en/appendices/debugger.xml:1.16 phpdoc/en/appendices/debugger.xml:1.17
--- phpdoc/en/appendices/debugger.xml:1.16 Mon Dec 17 14:33:05 2001
+++ phpdoc/en/appendices/debugger.xml Thu Jan 17 22:32:22 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<appendix id="debugger">
<title>Debugging PHP 3</title>
@@ -145,7 +145,7 @@
<row>
<entry><literal>location</literal></entry>
<entry>
- File name and line number where the error occured. The
+ File name and line number where the error occurred. The
first <literal>location</literal> line will always
contain the top-level location.
<replaceable>data</replaceable> will contain
@@ -161,14 +161,14 @@
in the following stack dump. If there are four frames,
expect information about four levels of called functions.
If no "frames" line is given, the depth should be assumed
- to be 0 (the error occured at top-level).
+ to be 0 (the error occurred at top-level).
</entry>
</row>
<row>
<entry>
<literal>function</literal></entry>
<entry>
- Name of function where the error occured. Will be
+ Name of function where the error occurred. Will be
repeated once for every level in the function call
stack.
</entry>
Index: phpdoc/en/appendices/history.xml
diff -u phpdoc/en/appendices/history.xml:1.11 phpdoc/en/appendices/history.xml:1.12
--- phpdoc/en/appendices/history.xml:1.11 Fri Jan 4 06:05:54 2002
+++ phpdoc/en/appendices/history.xml Thu Jan 17 22:32:22 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<appendix id="history">
<title>History of PHP and related projects</title>
@@ -230,7 +230,7 @@
fall of 2000. After I showed PHP-GTK to Frank Kromann, he got
interested and started helping me out with code generator work
and Win32 implementation. When we wrote the first Hello World
- program and fired it up, it was extremly exciting. It took a
+ program and fired it up, it was extremely exciting. It took a
couple more months to get the project to a presentable condition
and the initial version was released on March 1, 2001. The
story promptly hit SlashDot.
@@ -244,7 +244,7 @@
</para>
<para>
Since its release PHP-GTK has been gaining popularity. We
- have our own documenation team, the manual keeps improving,
+ have our own documentation team, the manual keeps improving,
people start writing extensions for PHP-GTK, and more and
more exciting applications with it.
</para>
Index: phpdoc/en/appendices/migration4.xml
diff -u phpdoc/en/appendices/migration4.xml:1.17
phpdoc/en/appendices/migration4.xml:1.18
--- phpdoc/en/appendices/migration4.xml:1.17 Mon Dec 17 14:27:31 2001
+++ phpdoc/en/appendices/migration4.xml Thu Jan 17 22:32:22 2002
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<appendix id="migration4">
<title>Migrating from PHP 3 to PHP 4</title>
<section id='migration4.changes'>
<title>What has changed in PHP 4</title>
<para>
- PHP 4 and the integrated Zend engine have greatly inproved PHPs
+ PHP 4 and the integrated Zend engine have greatly improved PHPs
performance and capabilities, but great care has been taken to
break as little existing code as possible. So migrating your code
from PHP 3 to 4 should be much easier than migrating from
@@ -148,15 +148,15 @@
<section id='migration4.parser'>
<title>Parser behavior</title>
<para>
- Parsing and execution are now two completely seperated steps, no
+ Parsing and execution are now two completely separated steps, no
execution of a files code will happen until the complete file and
everything it requires has completely and successfully been
parsed.
</para>
<para>
- One of the new requirenments introduced with this split is that
+ One of the new requirements introduced with this split is that
required and included files now have to be syntactically
- complete. You can no longer spread the different controling parts
+ complete. You can no longer spread the different controlling parts
of a control structure across file boundaries. That is you cannot
start a <literal>for</literal> or <literal>while</literal> loop,
an <literal>if</literal> statement or a <literal>switch</literal>
@@ -167,7 +167,7 @@
</para>
<para>
It still perfectly legal to include additional code within loops
- or other control structures, only the controling keywords and
+ or other control structures, only the controlling keywords and
corresponding curly braces <literal>{...}</literal> have to be
within the same compile unit (file or <function>eval</function>ed
string).
@@ -219,12 +219,12 @@
<para>
Using the old values 7 and 15 for setting up error reporting is
a very bad idea as this suppresses some of the newly added error
- classes including parese errors. This may lead to very strange
+ classes including parse errors. This may lead to very strange
behavior as scripts might no longer work without error messages
showing up anywhere.
</para>
<para>
- This has lead to a lot of unreproduceable bug reports in the
+ This has lead to a lot of unreproducible bug reports in the
past where people reported script engine problems they were not
capable to track down while the &true; case was usually some
missing '}' in a required file that the parser was not able to
@@ -232,8 +232,8 @@
</para>
<para>
So checking your error reporting setup should be the first thing
- to do whenever your scripts silently die. The Zend enginge can
- be considererd mature enough nowadays to not cause this kind of
+ to do whenever your scripts silently die. The Zend engine can
+ be considered mature enough nowadays to not cause this kind of
strange behavior.
</para>
</warning>
@@ -253,7 +253,7 @@
<para>
The most common case that will now produce notice messages is the
use of unquoted string constants as array indices. Both PHP 3
- and 4 will fall back to interprete theese as strings if no
+ and 4 will fall back to interpret these as strings if no
keyword or constant is known by that name, but whenever a
constant by that name had been defined anywhere else in the code
it might break your script. This can even become a security risk
@@ -293,7 +293,7 @@
<section id='migration4.empty'>
<title><literal>empty("0")</literal></title>
<para>
- The perhaps most cotroversal change in behavior has happend to the
+ The perhaps most controversial change in behavior has happened to the
behavior of the <function>empty</function>. A String containing
only the character '0' (zero) is now considered empty while it
wasn't in PHP 3.
@@ -326,9 +326,9 @@
<section id='migration4.missing.concept'>
<title>Functions missing due to conceptual changes</title>
<para>
- As PHP 4 now seperates parsing from execution it is no longer
+ As PHP 4 now separates parsing from execution it is no longer
possible to change the behavior of the parser (now embedded in
- the Zend engine) at runtime as parsing already happend by
+ the Zend engine) at runtime as parsing already happened by
then. So the function <function>short_tags</function> no longer
exists. You can still change the parsers behavior by setting
appropriate values in the <filename>php.ini</filename> file.
@@ -403,7 +403,7 @@
existing scripts written for PHP 3. But you can easily check for
this kind of problem by checking for the character combination
<literal>{$</literal> in your code and by replacing it with
- <literal>\{$</literal> with your favourite search-and-replace
+ <literal>\{$</literal> with your favorite search-and-replace
tool.
</para>
</section>
@@ -413,7 +413,7 @@
<para>
PHP 3 had the bad habit of setting cookies in the reverse order
of the <function>setcookie</function> calls in your code. PHP 4
- breaks with this habbit and creates the cookie header lines in
+ breaks with this habit and creates the cookie header lines in
exactly the same order as you set the cookies in the code.
</para>
<para>
Index: phpdoc/en/appendices/phpdevel.xml
diff -u phpdoc/en/appendices/phpdevel.xml:1.16 phpdoc/en/appendices/phpdevel.xml:1.17
--- phpdoc/en/appendices/phpdevel.xml:1.16 Mon Dec 17 14:33:05 2001
+++ phpdoc/en/appendices/phpdevel.xml Thu Jan 17 22:32:22 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<appendix id="phpdevel">
<title>Extending PHP 3</title>
@@ -260,7 +260,7 @@
<simpara>
First, you may want to check whether it exists and abort
- appropiately, using hash_exists() or hash_find().</simpara>
+ appropriately, using hash_exists() or hash_find().</simpara>
<simpara>
Next, initialize the array:</simpara>
@@ -642,7 +642,7 @@
the persistent list destructor should properly free any resources
obtained by that type (e.g. memory, SQL links, etc). Just like
with the non-persistent resources, you *MUST* add destructors for
- every resource, even it requires no destructotion and the
+ every resource, even it requires no destruction and the
destructor would be empty. Remember, since emalloc() and friends
aren't to be used in conjunction with the persistent list, you
mustn't use efree() here either.</simpara></sect2>
Index: phpdoc/en/functions/gmp.xml
diff -u phpdoc/en/functions/gmp.xml:1.20 phpdoc/en/functions/gmp.xml:1.21
--- phpdoc/en/functions/gmp.xml:1.20 Sat Dec 15 09:39:15 2001
+++ phpdoc/en/functions/gmp.xml Thu Jan 17 22:32:23 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
<reference id="ref.gmp">
<title>GMP functions</title>
<titleabbrev>GMP</titleabbrev>
@@ -39,7 +39,7 @@
<warning>
<simpara>
- If you want to explicitely specify a large integer,
+ If you want to explicitly specify a large integer,
specify it as a string. If you don't do that, PHP will
interpret the integer-literal first, possibly resulting
in loss of precision, even before <literal>GMP</literal>
@@ -67,7 +67,7 @@
</example>
</para>
<para>
- This will calculate factiorial of 1000 (pretty big number)
+ This will calculate factorial of 1000 (pretty big number)
very fast.
</para>
</partintro>
Index: phpdoc/en/functions/ibase.xml
diff -u phpdoc/en/functions/ibase.xml:1.42 phpdoc/en/functions/ibase.xml:1.43
--- phpdoc/en/functions/ibase.xml:1.42 Tue Jan 8 14:29:49 2002
+++ phpdoc/en/functions/ibase.xml Thu Jan 17 22:32:23 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.42 $ -->
+<!-- $Revision: 1.43 $ -->
<reference id="ref.ibase">
<title>InterBase functions</title>
<titleabbrev>InterBase</titleabbrev>
@@ -875,7 +875,7 @@
<refnamediv>
<refname>ibase_blob_open</refname>
<refpurpose>
- Open blob for retriving data parts
+ Open blob for retrieving data parts
</refpurpose>
</refnamediv>
<refsect1>
Index: phpdoc/en/functions/icap.xml
diff -u phpdoc/en/functions/icap.xml:1.17 phpdoc/en/functions/icap.xml:1.18
--- phpdoc/en/functions/icap.xml:1.17 Sat Jan 5 12:32:27 2002
+++ phpdoc/en/functions/icap.xml Thu Jan 17 22:32:23 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<reference id="ref.icap">
<title>ICAP Functions [deprecated]</title>
<titleabbrev>ICAP</titleabbrev>
@@ -13,7 +13,7 @@
<simpara>
Icap will be removed in near future. Neither this module, nor
those versions of icap library are supported any longer. If you
- want to use calendar capabilites in php, use <link
+ want to use calendar capabilities in php, use <link
linkend="ref.mcal">mcal</link> instead.
</simpara>
</note>
@@ -262,7 +262,7 @@
</listitem>
<listitem>
<simpara>
- string caegory - Category string of the event.
+ string category - Category string of the event.
</simpara>
</listitem>
<listitem>
@@ -343,7 +343,7 @@
<funcsynopsis>
<funcprototype>
<funcdef>string <function>icap_delete_event</function></funcdef>
- <paramdef>int <parameter>sream_id</parameter></paramdef>
+ <paramdef>int <parameter>stream_id</parameter></paramdef>
<paramdef>int <parameter>uid</parameter></paramdef>
</funcprototype>
</funcsynopsis>
Index: phpdoc/en/functions/ifx.xml
diff -u phpdoc/en/functions/ifx.xml:1.24 phpdoc/en/functions/ifx.xml:1.25
--- phpdoc/en/functions/ifx.xml:1.24 Wed Dec 12 15:46:52 2001
+++ phpdoc/en/functions/ifx.xml Thu Jan 17 22:32:23 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
<reference id="ref.ifx">
<title>Informix functions</title>
<titleabbrev>Informix</titleabbrev>
@@ -28,7 +28,7 @@
<para>
The configure script will autodetect the libraries and include
directories, if you run "configure --with_informix=yes". You can
- overide this detection by specifying "IFX_LIBDIR", "IFX_LIBS" and
+ override this detection by specifying "IFX_LIBDIR", "IFX_LIBS" and
"IFX_INCDIR" in the environment. The configure script will also
try to detect your Informix server version. It will set the
"HAVE_IFX_IUS" conditional compilation variable if your Informix
@@ -714,7 +714,7 @@
<function>ifx_prepare</function>.
</para>
<para>
- Returns a pseudo-row (assiociative array) with sqlca.sqlerrd[0]
+ Returns a pseudo-row (associative array) with sqlca.sqlerrd[0]
... sqlca.sqlerrd[5] after the query associated with
<parameter>result_id</parameter>.
</para>
@@ -902,7 +902,7 @@
<parameter>result_id</parameter>. Returns &false; on error.
</para>
<example>
- <title>Fielnames and SQL fieldtypes</title>
+ <title>Fieldnames and SQL fieldtypes</title>
<programlisting role="php">
<