From 00649f549f7db5ea0ede29e4a3fc6a0e10b53180 Mon Sep 17 00:00:00 2001 From: Yannick Torres Date: Fri, 19 Oct 2012 09:28:27 +0000 Subject: [PATCH] Typo found by online editor user git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328079 c90b9560-bf6c-de11-be94-00142212c4b1 --- install/windows/installermsi.xml | 2 +- language/oop5/changelog.xml | 2 +- language/oop5/traits.xml | 2 +- reference/array/functions/array-diff-ukey.xml | 2 +- reference/filesystem/functions/fgets.xml | 2 +- reference/spl/norewinditerator.xml | 2 +- reference/spl/recursiveiterator/haschildren.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install/windows/installermsi.xml b/install/windows/installermsi.xml index e6f091b5d2..8c52722a93 100644 --- a/install/windows/installermsi.xml +++ b/install/windows/installermsi.xml @@ -39,7 +39,7 @@ It is not recommended to install all extensions by default, since many of them require dependencies from outside PHP in order to function properly. Instead, use the Installation Repair Mode that can be - triggered thru the 'Add/Remove Programs' control panel to + triggered through the 'Add/Remove Programs' control panel to enable or disable extensions and features after installation. diff --git a/language/oop5/changelog.xml b/language/oop5/changelog.xml index 19a8e2cc66..afbd29bf9e 100644 --- a/language/oop5/changelog.xml +++ b/language/oop5/changelog.xml @@ -67,7 +67,7 @@ caught in the catch block, and would result in a fatal error. Exceptions now thrown in the __autoload function can be caught in the catch block, with - one proviso. If throwing a custom exception, then the custom exception class must + one provison. 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. diff --git a/language/oop5/traits.xml b/language/oop5/traits.xml index f3f458c70f..dc84d925bf 100644 --- a/language/oop5/traits.xml +++ b/language/oop5/traits.xml @@ -6,7 +6,7 @@ As of PHP 5.4.0, PHP implements a method of code reuse called Traits. - Traits is a mechanism for code reuse in single inheritance languages such as + Traits are a mechanism for code reuse in single inheritance languages such as PHP. A Trait is intended to reduce some limitations of single inheritance by enabling a developer to reuse sets of methods freely in several independent classes living in different class hierarchies. The semantics of the combination diff --git a/reference/array/functions/array-diff-ukey.xml b/reference/array/functions/array-diff-ukey.xml index e2a5946291..f49af8f7c8 100644 --- a/reference/array/functions/array-diff-ukey.xml +++ b/reference/array/functions/array-diff-ukey.xml @@ -22,7 +22,7 @@ comparison is done on the keys instead of the values. - Unlike array_diff_key an user supplied callback + Unlike array_diff_key a user supplied callback function is used for the indices comparison, not internal function. diff --git a/reference/filesystem/functions/fgets.xml b/reference/filesystem/functions/fgets.xml index a7ee6d4fe1..1608543ae6 100644 --- a/reference/filesystem/functions/fgets.xml +++ b/reference/filesystem/functions/fgets.xml @@ -33,7 +33,7 @@ Reading ends when length - 1 bytes have been - read, on a newline (which is included in the return value), or on EOF + read, or a newline (which is included in the return value), or an EOF (whichever comes first). If no length is specified, it will keep reading from the stream until it reaches the end of the line. diff --git a/reference/spl/norewinditerator.xml b/reference/spl/norewinditerator.xml index e7f59cc8fe..864709d6e1 100644 --- a/reference/spl/norewinditerator.xml +++ b/reference/spl/norewinditerator.xml @@ -10,7 +10,7 @@
&reftitle.intro; - This iterator cannot be rewinded. + This iterator cannot be rewound.
diff --git a/reference/spl/recursiveiterator/haschildren.xml b/reference/spl/recursiveiterator/haschildren.xml index da65f7e2f1..1cec318a95 100644 --- a/reference/spl/recursiveiterator/haschildren.xml +++ b/reference/spl/recursiveiterator/haschildren.xml @@ -12,7 +12,7 @@ - Returns if an iterator can be created fot the current entry. + Returns if an iterator can be created for the current entry. RecursiveIterator::getChildren.