Merge branch 'hotfix/3473'

Close #3473
zendframework · Jan 21, 2013 · 8d8d889 · 8d8d889
2 parents ec43e98 + 44c23f4
commit 8d8d889
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/Zend/Mvc/Router/Console/Catchall.php b/library/Zend/Mvc/Router/Console/Catchall.php
@@ -72,12 +72,12 @@ class Catchall implements RouteInterface
     protected $assembledParams = array();
 
     /**
-     * @var \Zend\Validator\ValidatorChain
+     * @var ValidatorChain
      */
     protected $validators;
 
     /**
-     * @var \Zend\Filter\FilterChain
+     * @var FilterChain
      */
     protected $filters;
 

diff --git a/library/Zend/Mvc/Service/ControllerLoaderFactory.php b/library/Zend/Mvc/Service/ControllerLoaderFactory.php
@@ -25,7 +25,7 @@ class ControllerLoaderFactory implements FactoryInterface
     /**
      * Create the controller loader service
      *
-     * Creates and returns an instance of Controller\ControllerManager. The
+     * Creates and returns an instance of ControllerManager. The
      * only controllers this manager will allow are those defined in the
      * application configuration's "controllers" array. If a controller is
      * matched, the scoped manager will attempt to load the controller.