From b7884d7febdc2229ca4abe71fd04c45a6bff5ba7 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Sat, 13 Dec 2008 08:08:30 +0000 Subject: [PATCH] Typos git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271124 c90b9560-bf6c-de11-be94-00142212c4b1 --- appendices/migration52.xml | 4 ++-- internals2/counter.xml | 4 ++-- internals2/structure/basics.xml | 10 +++++----- internals2/structure/globals.xml | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/appendices/migration52.xml b/appendices/migration52.xml index 7a5c361e8c..34dd1d23a7 100644 --- a/appendices/migration52.xml +++ b/appendices/migration52.xml @@ -1,5 +1,5 @@ - + Migrating from PHP 5.1.x to PHP 5.2.x @@ -940,7 +940,7 @@ $obj->getCommentName(''); - void swfmovie::protect([string pasword]) + void swfmovie::protect([string password]) - Protects diff --git a/internals2/counter.xml b/internals2/counter.xml index 4ec8bcd5fa..149c17fa78 100644 --- a/internals2/counter.xml +++ b/internals2/counter.xml @@ -1,5 +1,5 @@ - + The "counter" Extension - A Continuing Example @@ -105,7 +105,7 @@ Tells "counter" where to save data that has to persist between invocations of PHP (i.e. any counter that has COUNTER_RESET_NEVER or COUNTER_FLAG_SAVE). A file will be created at this path, which must be - readable and writeable to whatever user PHP is running as. + readable and writable to whatever user PHP is running as. diff --git a/internals2/structure/basics.xml b/internals2/structure/basics.xml index ccd5ca32d3..3a31c8e9ad 100644 --- a/internals2/structure/basics.xml +++ b/internals2/structure/basics.xml @@ -1,5 +1,5 @@ - + Basic constructs @@ -18,16 +18,16 @@ understandable, but C forces certain necessary declarations upon any extension that to an inexperienced eye seem redundant or plain unnecessary. All of those constructs, detailed in this section, are "write once and - forget" in Zend Engine 2 and 3. Here are some excerpts from the pregenerated + forget" in Zend Engine 2 and 3. Here are some excerpts from the pre-generated php_counter.h and counter.c files - created by PHP 5.3's ext_skel, showing the pregenerated + created by PHP 5.3's ext_skel, showing the pre-generated declarations: - The astute reader will notice that there are several delcarations in the - real files that aren't shown here. Those declaractions are specific to + The astute reader will notice that there are several declarations in the + real files that aren't shown here. Those declarations are specific to various Zend subsystems and are discussed elsewhere as appropriate. diff --git a/internals2/structure/globals.xml b/internals2/structure/globals.xml index 02c45a7d7c..65e9120792 100644 --- a/internals2/structure/globals.xml +++ b/internals2/structure/globals.xml @@ -1,5 +1,5 @@ - + Extension globals @@ -16,7 +16,7 @@ - Barring any special options passed to the compiler, a global varaible can + Barring any special options passed to the compiler, a global variable can be accessed and changed by any piece of code anywhere in the program, whether or not that code should be doing so. @@ -40,7 +40,7 @@ A PHP extension's globals are more properly called the "extension state", since most modules must remember what they're doing between function calls. The "counter" extension is a perfect example of this need: The basic - interface calls for a counter with a persistant value. A programmer new to + interface calls for a counter with a persistent value. A programmer new to Zend and PHP might do something like this in counter.c to store that value: @@ -67,12 +67,12 @@ PHP_FUNCTION(counter_get) it would function correctly. However, there are a number of situations in which more than one copy of PHP is running in the same thread, which means more than one instance of the counter module. Suddenly these multiple - threads are sharing the same counter value, which is clearly undesireable. + threads are sharing the same counter value, which is clearly undesirable. Another problem shows itself when considering that another extension might someday happen to have a global with the same name, and due to the rules of C scoping, this has the potential to cause a compile failure, or worse, a runtime error. Something more elaborate is needed, and so exists Zend's - support for threadsafe per-module globals. + support for thread-safe per-module globals.