Issue979

docs/content/cookbook/deeplinking.ngdoc

@@ -35,8 +35,8 @@ In this example we have a simple app which consist of two screens:
    angular.module('deepLinking', ['ngSanitize'])
      .config(function($routeProvider) {
         $routeProvider.
-          when("/welcome",  {template:'welcome.html',  controller:WelcomeCntl}).
-          when("/settings", {template:'settings.html', controller:SettingsCntl});
+          when("/welcome",  {templateUrl:'welcome.html',  controller:WelcomeCntl}).
+          when("/settings", {templateUrl:'settings.html', controller:SettingsCntl});
      });
 
    AppCntl.$inject = ['$scope', '$route']

docs/content/tutorial/step_07.ngdoc

@@ -72,8 +72,8 @@ __`app/js/app.js`:__
 angular.module('phonecat', []).
   config(['$routeProvider', function($routeProvider) {
   $routeProvider.
-      when('/phones', {template: 'partials/phone-list.html',   controller: PhoneListCtrl}).
-      when('/phones/:phoneId', {template: 'partials/phone-detail.html', controller: PhoneDetailCtrl}).
+      when('/phones', {templateUrl: 'partials/phone-list.html',   controller: PhoneListCtrl}).
+      when('/phones/:phoneId', {templateUrl: 'partials/phone-detail.html', controller: PhoneDetailCtrl}).
       otherwise({redirectTo: '/phones'});
 }]);
 </pre>

docs/src/ngdoc.js

@@ -54,7 +54,7 @@ Doc.prototype = {
     function extractWords(text) {
       var tokens = text.toLowerCase().split(/[,\.\`\'\"\#\s]+/mg);
       tokens.forEach(function(key){
-        var match = key.match(/^(([\$\_a-z]|ng\:)[\w\_\-]{2,})/);
+        var match = key.match(/^(([\$\_a-z]|ng\:)[\w\_\-]+)/);
         if (match){
           key = match[1];
           if (!keywords[key]) {
@@ -227,10 +227,10 @@ Doc.prototype = {
             'default':match[6]
           };
           self.param.push(param);
-        } else if (atName == 'returns') {
+        } else if (atName == 'returns' || atName == 'return') {
           match = text.match(/^\{([^}=]+)\}\s+(.*)/);
           if (!match) {
-            throw new Error("Not a valid 'returns' format: " + text);
+            throw new Error("Not a valid 'returns' format: " + text + ' in ' + self.file + ':' + self.line);
           }
           self.returns = {
             type: match[1],