Merge pull request #1 from angular/master

Refresh upstream

Author: GulajavaMinistudio

docs/content/tutorial/step_04.ngdoc

@@ -41,7 +41,7 @@ maintain. As we add more and more features, our files will get bigger and bigger
 difficult to navigate and find the code we are looking for.
 
 Instead we should put each feature/entity in its own file. Each stand-alone controller will be
-defined in its own file, each component will be defined in each own file, etc.
+defined in its own file, each component will be defined in its own file, etc.
 
 Luckily, we don't need to change anything with respect to that guideline in our code, since we have
 already defined our `phoneList` component in its own `phone-list.component.js` file. Good job!

docs/content/tutorial/step_09.ngdoc

@@ -402,7 +402,7 @@ You can now rerun `npm run protractor` to see the tests run (and hopefully pass)
 
 <div></div>
 
-* Try to add a `{{$ctrl.phoneId}` binding in the template string for the phone details view:
+* Try to add a `{{$ctrl.phoneId}}` binding in the template string for the phone details view:
 
   ```js
   when('/phones/:phoneId', {

src/ngMock/angular-mocks.js

@@ -1133,6 +1133,8 @@ angular.mock.dump = function(object) {
     $http.get('/auth.py').then(function(response) {
       authToken = response.headers('A-Token');
       $scope.user = response.data;
+    }).catch(function() {
+      $scope.status = 'Failed...';
     });
 
     $scope.saveMessage = function(message) {

src/ngResource/resource.js

@@ -280,7 +280,7 @@ function shallowClearAndCopy(src, dst) {
  *     the Resource API. This object can be serialized through {@link angular.toJson} safely
  *     without attaching AngularJS-specific fields. Notice that `JSON.stringify` (and
  *     `angular.toJson`) automatically use this method when serializing a Resource instance
- *     (see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#toJSON()_behavior)).
+ *     (see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#toJSON%28%29_behavior)).
  *
  * @example
  *

test/ngSanitize/sanitizeSpec.js

@@ -246,7 +246,7 @@ describe('HTML', function() {
       .toEqual('<p>text1text2</p>');
   });
 
-  it('should remove clobbered elements', function() {
+  it('should throw on clobbered elements', function() {
     inject(function($sanitize) {
       expect(function() {
         $sanitize('<form><input name="parentNode" /></form>');