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

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

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Writer/Renderer/Entry/Atom.php b/src/Writer/Renderer/Entry/Atom.php
@@ -383,7 +383,7 @@ protected function _loadXhtml($content)
     }
 
     /**
-     * Set entry cateories
+     * Set entry categories
      *
      * @param  DOMDocument $dom
      * @param  DOMElement $root

diff --git a/src/Writer/Renderer/Feed/AbstractAtom.php b/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -378,7 +378,7 @@ protected function _setHubs(DOMDocument $dom, DOMElement $root)
     }
 
     /**
-     * Set feed cateories
+     * Set feed categories
      *
      * @param  DOMDocument $dom
      * @param  DOMElement $root

diff --git a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -377,7 +377,7 @@ protected function _setHubs(DOMDocument $dom, DOMElement $root)
     }
 
     /**
-     * Set feed cateories
+     * Set feed categories
      *
      * @param  DOMDocument $dom
      * @param  DOMElement $root