vrana Fri Dec 12 14:56:04 2003 EDT
Modified files:
/phpdoc/en/language control-structures.xml expressions.xml oop.xml
operators.xml types.xml
/phpdoc/en/faq databases.xml html.xml
/phpdoc/en/chapters install.apache.xml install.general.xml
install.hpux.xml install.iplanet.xml
install.windows.xml intro.xml
streams.common.xml streams.structs.xml
streams.xml
/phpdoc/en/chmonly integration.xml search.xml skins.xml
specialities.xml
/phpdoc/en/features safe-mode.xml
/phpdoc/en/appendices transports.xml
Log:
Typos
Index: phpdoc/en/language/control-structures.xml
diff -u phpdoc/en/language/control-structures.xml:1.82
phpdoc/en/language/control-structures.xml:1.83
--- phpdoc/en/language/control-structures.xml:1.82 Fri Nov 14 11:27:23 2003
+++ phpdoc/en/language/control-structures.xml Fri Dec 12 14:56:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.82 $ -->
+<!-- $Revision: 1.83 $ -->
<chapter id="control-structures">
<title>Control Structures</title>
@@ -751,7 +751,7 @@
</informalexample>
</para>
<para>
- Ommiting the semicolon after <literal>continue</literal> can lead to
+ Omitting the semicolon after <literal>continue</literal> can lead to
confusion. Here's an example of what you shouldn't do.
</para>
<para>
@@ -789,7 +789,7 @@
<para>
because the return value of the <function>print</function>
call is <literal>int(1)</literal>, and it will look like the
- optional numeric argument mentionned above.
+ optional numeric argument mentioned above.
</para>
</informalexample>
</para>
Index: phpdoc/en/language/expressions.xml
diff -u phpdoc/en/language/expressions.xml:1.22 phpdoc/en/language/expressions.xml:1.23
--- phpdoc/en/language/expressions.xml:1.22 Tue Sep 30 04:40:06 2003
+++ phpdoc/en/language/expressions.xml Fri Dec 12 14:56:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<chapter id="language.expressions">
<title>Expressions</title>
<simpara>
@@ -83,7 +83,7 @@
these expressions as well, like in C. In PHP, like in C, there
are two types of increment - pre-increment and post-increment.
Both pre-increment and post-increment essentially increment the
- variable, and the effect on the variable is idential. The
+ variable, and the effect on the variable is identical. The
difference is with the value of the increment expression.
Pre-increment, which is written '++$variable', evaluates to the
incremented value (PHP increments the variable before reading its
Index: phpdoc/en/language/oop.xml
diff -u phpdoc/en/language/oop.xml:1.46 phpdoc/en/language/oop.xml:1.47
--- phpdoc/en/language/oop.xml:1.46 Wed Nov 12 23:53:14 2003
+++ phpdoc/en/language/oop.xml Fri Dec 12 14:56:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.46 $ -->
+<!-- $Revision: 1.47 $ -->
<chapter id="language.oop">
<title>Classes and Objects</title>
@@ -386,7 +386,7 @@
<para>
You also can use the <literal>@</literal> operator to
- <emphasis>mute</emphasis> errors occuring in the constructor, e.g.
+ <emphasis>mute</emphasis> errors occurring in the constructor, e.g.
<literal>@new</literal>.
</para>
@@ -436,7 +436,7 @@
This is fixed in PHP 4 by introducing another rule: If a class
has no constructor, the constructor of the base class is being
called, if it exists. The above example would have printed
- 'I am the constructor of A.<br>' in PHP 4.
+ 'I am the constructor of A.<br>' in PHP 4.
</para>
<informalexample>
@@ -485,7 +485,7 @@
is a function of the same name as the class it is being defined
in.'. Thus in PHP 4, the class B would have no constructor function
of its own and the constructor of the base class would have been
- called, printing 'I am the constructor of A.<br>'.
+ called, printing 'I am the constructor of A.<br>'.
</para>
<caution>
Index: phpdoc/en/language/operators.xml
diff -u phpdoc/en/language/operators.xml:1.56 phpdoc/en/language/operators.xml:1.57
--- phpdoc/en/language/operators.xml:1.56 Mon Dec 8 07:00:42 2003
+++ phpdoc/en/language/operators.xml Fri Dec 12 14:56:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.56 $ -->
+<!-- $Revision: 1.57 $ -->
<chapter id="language.operators">
<title>Operators</title>
<simpara>
@@ -638,7 +638,7 @@
into 'AA', while in C 'Z'+1 turns into '[' ( ord('Z') == 90, ord('[') == 91 ).
Note that character variables can be incremented but not decremented.
<example>
- <title>Arithmetric Operations on Character Variables</title>
+ <title>Arithmetic Operations on Character Variables</title>
<programlisting role="php">
<![CDATA[
<?php
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.129 phpdoc/en/language/types.xml:1.130
--- phpdoc/en/language/types.xml:1.129 Thu Dec 11 10:41:58 2003
+++ phpdoc/en/language/types.xml Fri Dec 12 14:56:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.129 $ -->
+<!-- $Revision: 1.130 $ -->
<chapter id="language.types">
<title>Types</title>
@@ -1500,7 +1500,7 @@
The <function>unset</function> function allows unsetting keys of an
array. Be aware that the array will NOT be reindexed. If you only
use "usual integer indices" (starting from zero, increasing by one),
- you can achive the reindex effect by using <function>array_values</function>.
+ you can achieve the reindex effect by using <function>array_values</function>.
<informalexample>
<programlisting role="php">
<![CDATA[
@@ -2208,7 +2208,7 @@
<title>mixed</title>
<para>
<literal>mixed</literal> indicates that a parameter may accept multiple (but not
- necesseraly all) types.
+ necessarily all) types.
</para>
<para>
<function>gettype</function> for example will accept all PHP types,
Index: phpdoc/en/faq/databases.xml
diff -u phpdoc/en/faq/databases.xml:1.21 phpdoc/en/faq/databases.xml:1.22
--- phpdoc/en/faq/databases.xml:1.21 Wed Sep 10 15:29:43 2003
+++ phpdoc/en/faq/databases.xml Fri Dec 12 14:56:01 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
<chapter id="faq.databases">
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>
@@ -68,7 +68,7 @@
</programlisting>
</para>
<para>
- One option that has proven successful is to use MySQL and its
+ One option that has proved successful is to use MySQL and its
MyODBC drivers on Windows and synchronizing the databases. Steve Lawrence
writes:
</para>
Index: phpdoc/en/faq/html.xml
diff -u phpdoc/en/faq/html.xml:1.23 phpdoc/en/faq/html.xml:1.24
--- phpdoc/en/faq/html.xml:1.23 Tue Sep 30 04:41:52 2003
+++ phpdoc/en/faq/html.xml Fri Dec 12 14:56:01 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
<chapter id="faq.html">
<title>PHP and HTML</title>
<titleabbrev>PHP and HTML</titleabbrev>
@@ -230,7 +230,7 @@
The select multiple tag in an HTML construct allows users to
select multiple items from a list. These items are then passed
to the action handler for the form. The problem is that they
- are all passed with the same widget name. ie.
+ are all passed with the same widget name. I.e.
<programlisting role="html">
<![CDATA[
<select name="var" multiple="yes">
Index: phpdoc/en/chapters/install.apache.xml
diff -u phpdoc/en/chapters/install.apache.xml:1.20
phpdoc/en/chapters/install.apache.xml:1.21
--- phpdoc/en/chapters/install.apache.xml:1.20 Tue Jul 22 05:38:26 2003
+++ phpdoc/en/chapters/install.apache.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
<sect1 id="install.apache">
<title>Servers-Apache</title>
<para>
@@ -385,7 +385,7 @@
If you chose to configure Apache to use PHP as a CGI binary, you
will need to use the <function>show_source</function> function. To
do this simply create a PHP script file and add this code:
- <literal><?php show_source ("original_php_script.php"); ?></literal>.
+ <literal><?php show_source ("original_php_script.php"); ?></literal>.
Substitute <literal>original_php_script.php</literal> with
the name of the file you wish to show the source of.
</simpara>
Index: phpdoc/en/chapters/install.general.xml
diff -u phpdoc/en/chapters/install.general.xml:1.3
phpdoc/en/chapters/install.general.xml:1.4
--- phpdoc/en/chapters/install.general.xml:1.3 Mon Nov 11 21:46:34 2002
+++ phpdoc/en/chapters/install.general.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.general">
<title>General Installation Considerations</title>
<para>
@@ -19,7 +19,7 @@
PHP itself, a web server and a web browser. You
probably already have a web browser, and depending on
your operating system setup, you may also have a web
- server (eg. Apache on Linux or IIS on Windows).
+ server (e.g. Apache on Linux or IIS on Windows).
You may also rent webspace at a company. This way, you
don't need to set up anything on your own, only write
your PHP scripts, upload it to the server you rent, and
@@ -42,7 +42,7 @@
</para>
<para>
If you are also interested to use PHP for command line
- scripting (eg. write scripts autogenerating some images
+ scripting (e.g. write scripts autogenerating some images
for you offline, or processing text files depending
on some arguments you pass to them), you always need
the command line executable. For more information, read
Index: phpdoc/en/chapters/install.hpux.xml
diff -u phpdoc/en/chapters/install.hpux.xml:1.4 phpdoc/en/chapters/install.hpux.xml:1.5
--- phpdoc/en/chapters/install.hpux.xml:1.4 Mon Jun 23 13:32:28 2003
+++ phpdoc/en/chapters/install.hpux.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<sect1 id="install.hpux">
<title>Unix/HP-UX installs</title>
<para>
@@ -64,7 +64,7 @@
<listitem>
<para>
<command>gunzip</command> and <command>tar -xvf</command> them. We
- need to hack a couple of files so that they can compile ok.
+ need to hack a couple of files so that they can compile OK.
</para>
</listitem>
<listitem>
@@ -94,7 +94,7 @@
<listitem>
<para>
PHP and Apache should have compiled OK, but Apache won't start. you
- need to create a new user for Apache, eg www, or apache. You then
+ need to create a new user for Apache, e.g. www, or apache. You then
change lines 252 and 253 of the <filename>conf/httpd.conf</filename> in
Apache so that instead of
</para>
Index: phpdoc/en/chapters/install.iplanet.xml
diff -u phpdoc/en/chapters/install.iplanet.xml:1.10
phpdoc/en/chapters/install.iplanet.xml:1.11
--- phpdoc/en/chapters/install.iplanet.xml:1.10 Fri Oct 17 18:01:19 2003
+++ phpdoc/en/chapters/install.iplanet.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<sect1 id="install.netscape-enterprise">
<title>Servers-Netscape, iPlanet and SunONE</title>
<para>
@@ -414,7 +414,7 @@
Error fn="php4_execute" code=XXX script="/path/to/script.php" [inikey=value
inikey=value...]
]]>
</programlisting>
- where <literal>XXX</literal> ist the HTTP error code. Please delete any other
<literal>Error</literal>
+ where <literal>XXX</literal> is the HTTP error code. Please delete any other
<literal>Error</literal>
directives which could interfere with yours.
If you want to place a page for all errors that could exist, leave
the <literal>code</literal> parameter out. Your script can get the HTTP status
code
Index: phpdoc/en/chapters/install.windows.xml
diff -u phpdoc/en/chapters/install.windows.xml:1.37
phpdoc/en/chapters/install.windows.xml:1.38
--- phpdoc/en/chapters/install.windows.xml:1.37 Tue Sep 30 04:33:24 2003
+++ phpdoc/en/chapters/install.windows.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
+<!-- $Revision: 1.38 $ -->
<sect1 id="install.windows">
<title>Installation on Windows systems</title>
<para>
@@ -141,13 +141,13 @@
Extract the distribution file to a directory of your choice,
<filename>c:\</filename> is a good start. The zip package expands to a
foldername like <filename>php-4.3.1-Win32</filename> which is assumed to
- be renamed to <filename>php</filename>. For the sake of convinience and
- to be version independant the following steps assume your extracted
+ be renamed to <filename>php</filename>. For the sake of convenience and
+ to be version independent the following steps assume your extracted
version of PHP lives in <filename>c:\php</filename>. You might choose
any other location but you probably do not want to use a path in which
spaces are included (for example:
<filename>c:\program files\php</filename> is not a good idea). Some web
- servers will crash if you do. The struture of your directory you
+ servers will crash if you do. The structure of your directory you
extracted the zip file will look like:
</simpara>
</listitem>
@@ -274,17 +274,17 @@
<link linkend="configuration.file">ini settings</link> and set every
element manually yourself. If you would like to achieve the best
security, then this is the way for you, although PHP works fine with
- these default ini files. Copy your choosen ini-file to a directory where
- PHP is able to find and rename it to &php.ini;. By default PHP searchs
+ these default ini files. Copy your chosen ini-file to a directory where
+ PHP is able to find and rename it to &php.ini;. By default PHP searches
&php.ini; in your Windows directory:
<simplelist>
<member>
- On Windows 9x/ME/XP copy your choosen ini file to your
+ On Windows 9x/ME/XP copy your chosen ini file to your
<filename> %WINDIR%</filename>, which is typically
<filename>c:\windows</filename>.
</member>
<member>
- On Windows NT/2000 copy your choosen ini file to your
+ On Windows NT/2000 copy your chosen ini file to your
<filename>%WINDIR%</filename> or <filename>%SYSTEMROOT%</filename>,
which is typically <filename>c:\winnt</filename> or
<filename>c:\winnt40</filename> for NT/2000 servers.
@@ -432,8 +432,8 @@
&reftitle.required;
<para>
To compile and build <literal>PHP</literal> you need a Microsoft
- Development Environment. Microsoft Visuaul C++ 6.0 is recommended.
- To extract the downloaded files you need a extraction utilitiy
+ Development Environment. Microsoft Visual C++ 6.0 is recommended.
+ To extract the downloaded files you need a extraction utility
(e.g.: Winzip). If you don't already have an unzip utility, you
can get a free version from <ulink url="&url.infozip;">InfoZip</ulink>.
</para>
@@ -681,7 +681,7 @@
<simpara>
It is possible to do minor customization to the build process by editing
the <filename>main/config.win32.h</filename> file. For example you can
- change the default location of &php.ini;, the builtin extensions, and the
+ change the default location of &php.ini;, the built-in extensions, and the
default location for your extensions.
</simpara>
<simpara>
@@ -690,7 +690,7 @@
The steps are the same as for building the CGI version, except you have
to select the <literal>php4ts_cli - Win32 Debug_TS</literal> or
<literal>php4ts_cli - Win32 Release_TS</literal> project file. After a
- succcessfull compiling run you will find the <filename>php.exe</filename>
+ successful compiling run you will find the <filename>php.exe</filename>
in either the directory <filename>Release_TS\cli\</filename> or
<filename>Debug_TS\cli\</filename>.
</simpara>
Index: phpdoc/en/chapters/intro.xml
diff -u phpdoc/en/chapters/intro.xml:1.35 phpdoc/en/chapters/intro.xml:1.36
--- phpdoc/en/chapters/intro.xml:1.35 Mon Apr 7 13:23:33 2003
+++ phpdoc/en/chapters/intro.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
<chapter id="introduction">
<title>Introduction</title>
@@ -206,7 +206,7 @@
extension to transform XML documents.
</para>
<para>
- While using PHP in the ecommerce field, you'll find
+ While using PHP in the e-commerce field, you'll find
the Cybercash payment, CyberMUT, VeriSign Payflow
Pro and CCVS functions useful for your online payment
programs.
Index: phpdoc/en/chapters/streams.common.xml
diff -u phpdoc/en/chapters/streams.common.xml:1.9
phpdoc/en/chapters/streams.common.xml:1.10
--- phpdoc/en/chapters/streams.common.xml:1.9 Tue Sep 30 04:33:24 2003
+++ phpdoc/en/chapters/streams.common.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -546,7 +546,7 @@
stream was seekable.
</para>
<para>
- <parameter>flags</parameter> allows you to specify your preference for the
seekeable stream that is
+ <parameter>flags</parameter> allows you to specify your preference for the
seekable stream that is
returned: use <constant>PHP_STREAM_NO_PREFERENCE</constant> to use the default
seekable stream
(which uses a dynamically expanding memory buffer, but switches to temporary
file backed storage
when the stream size becomes large), or use
<constant>PHP_STREAM_PREFER_STDIO</constant> to
@@ -771,7 +771,7 @@
</note>
<note>
<simpara>
- You must explicity compare the return value of this function with one of the
constants, as described
+ You must explicitly compare the return value of this function with one of the
constants, as described
in <function>php_stream_cast</function>.
</simpara>
</note>
@@ -915,7 +915,7 @@
<refentry id="streams.php-unregister-url-stream-wrapper">
<refnamediv>
<refname>php_unregister_url_stream_wrapper</refname>
- <refpurpose>Un-registers a wrapper from the Streams API</refpurpose>
+ <refpurpose>Unregisters a wrapper from the Streams API</refpurpose>
</refnamediv>
<refsect1>
<title>Description</title>
Index: phpdoc/en/chapters/streams.structs.xml
diff -u phpdoc/en/chapters/streams.structs.xml:1.4
phpdoc/en/chapters/streams.structs.xml:1.5
--- phpdoc/en/chapters/streams.structs.xml:1.4 Wed May 14 18:04:50 2003
+++ phpdoc/en/chapters/streams.structs.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -53,6 +53,7 @@
<refsect1>
<title>Description</title>
<programlisting role="c">
+<![CDATA[
typedef struct _php_stream_ops {
/* all streams MUST implement these operations */
size_t (*write)(php_stream *stream, const char *buf, size_t count
TSRMLS_DC);
@@ -69,6 +70,7 @@
int (*cast)(php_stream *stream, int castas, void **ret TSRMLS_DC);
int (*stat)(php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC);
} php_stream_ops;
+]]>
</programlisting>
</refsect1>
</refentry>
@@ -80,6 +82,7 @@
<refsect1>
<title>Description</title>
<programlisting role="c">
+<![CDATA[
struct _php_stream_wrapper {
php_stream_wrapper_ops *wops; /* operations the wrapper can perform */
void *abstract; /* context for the wrapper */
@@ -89,6 +92,7 @@
int err_count;
char **err_stack;
} php_stream_wrapper;
+]]>
</programlisting>
</refsect1>
</refentry>
@@ -100,6 +104,7 @@
<refsect1>
<title>Description</title>
<programlisting role="c">
+<![CDATA[
typedef struct _php_stream_wrapper_ops {
/* open/create a wrapped stream */
php_stream *(*stream_opener)(php_stream_wrapper *wrapper, char *filename,
char *mode,
@@ -119,6 +124,7 @@
/* Delete/Unlink a file */
int (*unlink)(php_stream_wrapper *wrapper, char *url, int options,
php_stream_context *context TSRMLS_DC);
} php_stream_wrapper_ops;
+]]>
</programlisting>
</refsect1>
</refentry>
@@ -130,6 +136,7 @@
<refsect1>
<title>Description</title>
<programlisting role="c">
+<![CDATA[
struct _php_stream_filter {
php_stream_filter_ops *fops;
void *abstract; /* for use by filter implementation */
@@ -143,6 +150,7 @@
/* buffered buckets */
php_stream_bucket_brigade buffer;
} php_stream_filter;
+]]>
</programlisting>
</refsect1>
</refentry>
@@ -154,6 +162,7 @@
<refsect1>
<title>Description</title>
<programlisting role="c">
+<![CDATA[
typedef struct _php_stream_filter_ops {
php_stream_filter_status_t (*filter)(
php_stream *stream,
@@ -168,6 +177,7 @@
const char *label;
} php_stream_filter_ops;
+]]>
</programlisting>
</refsect1>
</refentry>
Index: phpdoc/en/chapters/streams.xml
diff -u phpdoc/en/chapters/streams.xml:1.8 phpdoc/en/chapters/streams.xml:1.9
--- phpdoc/en/chapters/streams.xml:1.8 Tue Sep 30 04:33:24 2003
+++ phpdoc/en/chapters/streams.xml Fri Dec 12 14:56:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -22,7 +22,7 @@
</para>
<para>
The aim of the Streams API is to make it comfortable for developers to
- open files, urls and other streamable data sources with a unified API
+ open files, URLs and other streamable data sources with a unified API
that is easy to understand. The API is more or less based on the ANSI
C stdio family of functions (with identical semantics for most of the main
functions), so C programmers will have a feeling of familiarity with streams.
Index: phpdoc/en/chmonly/integration.xml
diff -u phpdoc/en/chmonly/integration.xml:1.3 phpdoc/en/chmonly/integration.xml:1.4
--- phpdoc/en/chmonly/integration.xml:1.3 Thu Dec 26 18:32:38 2002
+++ phpdoc/en/chmonly/integration.xml Fri Dec 12 14:56:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<chapter id="chm.integration">
<title>Integrating the PHP Manual</title>
@@ -52,7 +52,7 @@
All files are in the root directory of the CHM, unlike the previous
CHM versions which included a language directory. Images, style sheets
and other supplemental files have names starting with an underscore
- (like the main index shown above), to avoid name colissions.
+ (like the main index shown above), to avoid name collisions.
</para>
</note>
</para>
Index: phpdoc/en/chmonly/search.xml
diff -u phpdoc/en/chmonly/search.xml:1.4 phpdoc/en/chmonly/search.xml:1.5
--- phpdoc/en/chmonly/search.xml:1.4 Tue Aug 27 15:13:45 2002
+++ phpdoc/en/chmonly/search.xml Fri Dec 12 14:56:03 2003
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<chapter id="chm.search">
<title>The Full Text Search</title>
<para>
This edition of the PHP Manual includes an advanced full text
- search possibilty provided by the viewer application. This enables
+ search possibility provided by the viewer application. This enables
users to to search through every word in the help file to find a
match. For example, if a user does a full-text search on the word
"Apache", every topic that contains the word "Apache" will be listed.
@@ -284,7 +284,7 @@
as separate ones. The "Location" column shows the source of the result,
also enabling you to "add precedence" to manual content results with
ordering the results by "Location". User note page titles are also
- prefixed with "N:" to make them easily distinguisable in the favorites
+ prefixed with "N:" to make them easily distinguishable in the favorites
list (there's no location info in the favorites list).
</para>
</sect1>
Index: phpdoc/en/chmonly/skins.xml
diff -u phpdoc/en/chmonly/skins.xml:1.4 phpdoc/en/chmonly/skins.xml:1.5
--- phpdoc/en/chmonly/skins.xml:1.4 Tue Aug 27 15:13:45 2002
+++ phpdoc/en/chmonly/skins.xml Fri Dec 12 14:56:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<chapter id="chm.skins">
<title>Skin development</title>
@@ -84,7 +84,7 @@
<listitem>
<simpara>
That function loads in the skin JS file as the preferences
- dictate. The sknin JS file should load in the needed CSS
+ dictate. The skin JS file should load in the needed CSS
file, and define a <literal>displayPage()</literal> function,
which displays the page if called.
</simpara>
@@ -106,16 +106,16 @@
</simpara>
</listitem>
</itemizedlist>
- Every action is syncronized with calling back a function in
+ Every action is synchronized with calling back a function in
the previously loaded file when the JS is in memory. The notes
- loading and skin JS loading is only syncronized with the page's
+ loading and skin JS loading is only synchronized with the page's
onload event (which as the Microsoft documentation says only fires
if the page is completely loaded).
</para>
<para>
This load and callback chain may seem to be too complicated, but
so far this seemed to be the best way to do as many things as
- possible paralelly, while also syncronize some calls.
+ possible parallel, while also synchronize some calls.
</para>
<para>
As you can see your skin JavaScript file is loaded in by
Index: phpdoc/en/chmonly/specialities.xml
diff -u phpdoc/en/chmonly/specialities.xml:1.2 phpdoc/en/chmonly/specialities.xml:1.3
--- phpdoc/en/chmonly/specialities.xml:1.2 Tue Aug 27 15:13:45 2002
+++ phpdoc/en/chmonly/specialities.xml Fri Dec 12 14:56:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<chapter id="chm.specialities">
<title>Specialities of this Edition</title>
@@ -86,7 +86,7 @@
These are displayed as HTML forms, where you can enter search
keywords, press ENTER, and receive a new window with the search
issued in the appropriate search engine. Currently there is no
- way to extend the set of specialy displayed context menu items.
+ way to extend the set of specially displayed context menu items.
</entry>
</row>
</tbody>
Index: phpdoc/en/features/safe-mode.xml
diff -u phpdoc/en/features/safe-mode.xml:1.44 phpdoc/en/features/safe-mode.xml:1.45
--- phpdoc/en/features/safe-mode.xml:1.44 Wed Oct 1 14:39:21 2003
+++ phpdoc/en/features/safe-mode.xml Fri Dec 12 14:56:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.44 $ -->
+<!-- $Revision: 1.45 $ -->
<chapter id="features.safe-mode">
<title>Safe Mode</title>
@@ -243,7 +243,7 @@
<simpara>
This directive allows you to disable certain functions for
<link linkend="security.index">security</link> reasons. It takes
- on a comma-dilimited list of function names. disable_functions
+ on a comma-delimited list of function names. disable_functions
is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
</simpara>
<simpara>
@@ -261,7 +261,7 @@
<simpara>
This directive allows you to disable certain classes for
<link linkend="security.index">security</link> reasons. It takes
- on a comma-dilimited list of class names. disable_classes
+ on a comma-delimited list of class names. disable_classes
is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
</simpara>
<simpara>
Index: phpdoc/en/appendices/transports.xml
diff -u phpdoc/en/appendices/transports.xml:1.4 phpdoc/en/appendices/transports.xml:1.5
--- phpdoc/en/appendices/transports.xml:1.4 Sun Jun 22 17:51:05 2003
+++ phpdoc/en/appendices/transports.xml Fri Dec 12 14:56:04 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<appendix id="transports">
<title>List of Supported Socket Transports</title>
<para>
@@ -44,7 +44,7 @@
this is specified in a second parameter and therefore does
not impact the formatting of transport url. With
<function>stream_socket_client</function> and related functions
- as with traditional URLs however, the port number is speicified
+ as with traditional URLs however, the port number is specified
as a suffix of the transport URL delimited by a colon.
</simpara>
