Merge branch 'master' of git://github.com/yiisoft/yii2

framework/console/Action.php

@@ -43,6 +43,6 @@ class Action extends \yii\base\Action
      */
     public function getHelp()
     {
-        return HelpParser::getFull(new \ReflectionClass($this));
+        return HelpParser::getDetail(new \ReflectionClass($this));
     }
 }

framework/console/Controller.php

@@ -318,7 +318,7 @@ class Controller extends \yii\base\Controller
      */
     public function getHelp()
     {
-        return HelpParser::getFull(new \ReflectionClass($this));
+        return HelpParser::getDetail(new \ReflectionClass($this));
     }
 
     /**
@@ -339,6 +339,6 @@ class Controller extends \yii\base\Controller
             $class = new \ReflectionClass($action);
         }
 
-        return HelpParser::getFull($class);
+        return HelpParser::getDetail($class);
     }
 }

framework/console/HelpParser.php

@@ -38,7 +38,7 @@ class HelpParser
      * @param \Reflector $reflector
      * @return string
      */
-    public static function getFull(\Reflector $reflector)
+    public static function getDetail(\Reflector $reflector)
     {
         $comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($reflector->getDocComment(), '/'))), "\r", '');
         if (preg_match('/^\s*@\w+/m', $comment, $matches, PREG_OFFSET_CAPTURE)) {