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

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

src/Csrf.php

@@ -205,7 +205,7 @@ public function getSalt()
     /**
      * Retrieve CSRF token
      *
-     * If no CSRF token currently exists, or should be regenrated,
+     * If no CSRF token currently exists, or should be regenerated,
      * generates one.
      *
      * @param  bool $regenerate    default false

src/EmailAddress.php

@@ -278,7 +278,7 @@ public function useDomainCheck($domain = true)
      * '224.0.0.0/4', '240.0.0.0/4'
      * @see http://en.wikipedia.org/wiki/Reserved_IP_addresses
      *
-     * As of RFC5753 (JAN 2010), the following blocks are no logner reserved:
+     * As of RFC5753 (JAN 2010), the following blocks are no longer reserved:
      *   - 128.0.0.0/16
      *   - 191.255.0.0/16
      *   - 223.255.255.0/24

src/Hostname.php

@@ -100,7 +100,7 @@ class Hostname extends AbstractValidator
      * Array for valid Idns
      * @see http://www.iana.org/domains/idn-tables/ Official list of supported IDN Chars
      * (.AC) Ascension Island http://www.nic.ac/pdf/AC-IDN-Policy.pdf
-     * (.AR) Argentinia http://www.nic.ar/faqidn.html
+     * (.AR) Argentina http://www.nic.ar/faqidn.html
      * (.AS) American Samoa http://www.nic.as/idn/chars.cfm
      * (.AT) Austria http://www.nic.at/en/service/technical_information/idn/charset_converter/
      * (.BIZ) International http://www.iana.org/domains/idn-tables/