Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/uri-path-not-being-set-when-empty
zendframework · Aug 3, 2012 · 9287e61 · 9287e61
commit 9287e61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Factory.php b/src/Factory.php
@@ -144,7 +144,7 @@ public static function registerReader($extension, $reader)
         if (!is_string($reader) && !$reader instanceof Reader\ReaderInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Reader should be plugin name, class name or ' .
-                'instance of %s\Reader\ReaderInterface; recieved "%s"',
+                'instance of %s\Reader\ReaderInterface; received "%s"',
                 __NAMESPACE__,
                 (is_object($reader) ? get_class($reader) : gettype($reader))
             ));

diff --git a/src/Processor/Token.php b/src/Processor/Token.php
@@ -51,7 +51,7 @@ class Token implements ProcessorInterface
 
     /**
      * Token Processor walks through a Config structure and replaces all
-     * occurences of tokens with supplied values.
+     * occurrences of tokens with supplied values.
      *
      * @param  array|Config|Traversable   $tokens  Associative array of TOKEN => value
      *                                             to replace it with

diff --git a/src/Writer/Ini.php b/src/Writer/Ini.php
@@ -57,7 +57,7 @@ public function getNestSeparator()
     }
 
     /**
-     * Set if rendering should occour without sections or not.
+     * Set if rendering should occur without sections or not.
      *
      * If set to true, the INI file is rendered without sections completely
      * into the global namespace of the INI file.