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

…ix/uri-path-not-being-set-when-empty

src/Compress/Gz.php

@@ -129,7 +129,7 @@ public function setArchive($archive)
      *
      * @param  string $content
      * @return string
-     * @throws Exceptin\RuntimeException if unable to open archive or error during decompression
+     * @throws Exception\RuntimeException if unable to open archive or error during decompression
      */
     public function compress($content)
     {

src/Compress/Zip.php

@@ -106,7 +106,7 @@ public function setTarget($target)
      *
      * @param  string $content
      * @return string Compressed archive
-     * @throws Exception\RuntimeException if unable to open zip archive, or error during compresion
+     * @throws Exception\RuntimeException if unable to open zip archive, or error during compression
      */
     public function compress($content)
     {

src/File/Rename.php

@@ -166,7 +166,7 @@ public function filter($value)
         $result = rename($file['source'], $file['target']);
 
         if ($result !== true) {
-            throw new Exception\RuntimeException(sprintf("File '%s' could not be renamed. An error occured while processing the file.", $value));
+            throw new Exception\RuntimeException(sprintf("File '%s' could not be renamed. An error occurred while processing the file.", $value));
         }
 
         return $file['target'];

src/Inflector.php

@@ -83,7 +83,7 @@ public function __construct($options = null)
     }
 
     /**
-     * Retreive plugin broker
+     * Retrieve plugin broker
      *
      * @return FilterPluginManager
      */

src/Word/AbstractSeparator.php

@@ -40,9 +40,9 @@ public function __construct($separator = ' ')
     }
 
     /**
-     * Sets a new seperator
+     * Sets a new separator
      *
-     * @param  string  $separator  Seperator
+     * @param  string  $separator  Separator
      * @return AbstractSeparator
      * @throws Exception\InvalidArgumentException
      */
@@ -56,7 +56,7 @@ public function setSeparator($separator)
     }
 
     /**
-     * Returns the actual set seperator
+     * Returns the actual set separator
      *
      * @return  string
      */

src/Word/SeparatorToDash.php

@@ -19,7 +19,7 @@ class SeparatorToDash extends SeparatorToSeparator
     /**
      * Constructor
      *
-     * @param  string  $searchSeparator  Seperator to search for change
+     * @param  string  $searchSeparator  Separator to search for change
      */
     public function __construct($searchSeparator = ' ')
     {

src/Word/SeparatorToSeparator.php

@@ -24,8 +24,8 @@ class SeparatorToSeparator extends \Zend\Filter\PregReplace
     /**
      * Constructor
      *
-     * @param  string  $searchSeparator      Seperator to search for
-     * @param  string  $replacementSeperator Seperator to replace with
+     * @param  string  $searchSeparator      Separator to search for
+     * @param  string  $replacementSeparator Separator to replace with
      */
     public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
     {
@@ -46,7 +46,7 @@ public function setSearchSeparator($separator)
     }
 
     /**
-     * Returns the actual set seperator to search for
+     * Returns the actual set separator to search for
      *
      * @return  string
      */
@@ -56,9 +56,9 @@ public function getSearchSeparator()
     }
 
     /**
-     * Sets a new seperator which replaces the searched one
+     * Sets a new separator which replaces the searched one
      *
-     * @param  string  $separator  Seperator which replaces the searched one
+     * @param  string  $separator  Separator which replaces the searched one
      * @return SeparatorToSeparator
      */
     public function setReplacementSeparator($separator)
@@ -68,7 +68,7 @@ public function setReplacementSeparator($separator)
     }
 
     /**
-     * Returns the actual set seperator which replaces the searched one
+     * Returns the actual set separator which replaces the searched one
      *
      * @return  string
      */
@@ -80,7 +80,7 @@ public function getReplacementSeparator()
     /**
      * Defined by Zend\Filter\Filter
      *
-     * Returns the string $value, replacing the searched seperators with the defined ones
+     * Returns the string $value, replacing the searched separators with the defined ones
      *
      * @param  string $value
      * @return string