Merge remote-tracking branch 'origin/master'

Author: Urigo

.docs/angular-meteor/client/views/steps/tutorial.step_03.html

@@ -28,16 +28,16 @@ <h1>Step 3 - 3-Way data binding</h1>
 So, if we were in any Framework other than Meteor, we would start implementing a series of REST end points to connect the server to the client.
 Also, we would need to create a database and functions to connect to it.
 
-And we haven't talked about realtime, so then we need to add sockets, and a local DB for cache and handle latency compensation (or just ignore those features and create a not - so - good and modern app...)
+And we haven't talked about realtime, in which case we would need to add sockets, and a local DB for cache and handle latency compensation (or just ignore those features and create a not - so - good and modern app...)
 
 But luckily, we use Meteor!
 
 
 Meteor makes writing distributed client code as simple as talking to a local database. It's a clean, simple, and secure approach that obviates the need to implement individual RPC endpoints, manually cache data on the client to avoid slow roundtrips to the server, and carefully orchestrate invalidation messages to every client as data changes.
 
-In Meteor, the client and server share the same database API. The same exact application code — like validators and computed properties — can often run in both places. But while code running on the server has direct access to the database, code running on the client does not. This distinction is the basis for Meteor's data security model.
+In Meteor, the client and server share the same database API. The exact same application code — like validators and computed properties — can often run in both places. But while code running on the server has direct access to the database, code running on the client does not. This distinction is the basis for Meteor's data security model.
 
-Every Meteor client includes an in-memory database cache. To manage the client cache, the server publishes sets of JSON documents, and the client subscribes to those sets. As documents in a set change, the server patches each client's cache.
+Every Meteor client includes an in-memory database cache. To manage the client cache, the server publishes sets of JSON documents, and the client subscribes to these sets. As documents in a set change, the server patches each client's cache.
 
 
 That introduce us to a new concept - Reactivity.
@@ -60,13 +60,13 @@ <h1>Step 3 - 3-Way data binding</h1>
 
 Now that we've created the collection, our client needs to subscribe to it's changes and bind it to our parties AngularJS collection.
 
-To bind them we are going to use angular-meteor built-in [service](https://docs.angularjs.org/guide/services) called $meteor.collection.
+To bind them we are going to use the built-in angular-meteor [service](https://docs.angularjs.org/guide/services) called $meteor.collection.
 
 We are going to replace the declaration of $scope.parties with the following command inside the PartiesListCtrl controller:
 
     $scope.parties = $meteor.collection(Parties);
 
-That line declares a new $scope.parties variable so we don't need to do something like $scope.parties = []; and then bind it to the Parties Mongo collection.
+This line declares a new $scope.parties variable so we don't need to do something like $scope.parties = []; and then bind it to the Parties Mongo collection.
 
 We also need to add the $meteor service to the controller with dependency injection.
 
@@ -89,9 +89,9 @@ <h1>Step 3 - 3-Way data binding</h1>
     }
 
 
-Now every change that will happen to the $scope.parties variable will automatically be saved to the local minimongo and synced to the MongoDB server DB and all the other clients in realtime!
+Now every change that happens to the $scope.parties variable will automatically be saved to the local minimongo and synced to the MongoDB server DB and all the other clients in realtime!
 
-But we still don't have information so let's add some.
+But we still don't have data in that collection, so let's add some.
 Let's initialize our server with the same parties we had before.
 
 Add this to the bottom of app.js:
@@ -116,11 +116,11 @@ <h1>Step 3 - 3-Way data binding</h1>
        });
     }
 
-As you can probably understand, this code runs only on the server, and when Meteor starts it initialize the DB with sample parties.
+As you can probably understand, this code runs only on the server, and when Meteor starts it initializes the DB with these sample parties.
 
-Run the app and see if you see the list of parties on the screen.
+Run the app and you should see the list of parties on the screen.
 
-In the next chapter we will see how easy it is to manipulate the data, save and publish the changes to the server and all the connected clients.
+In the next chapter we will see how easy it is to manipulate the data, save and publish changes to the server, and by doing so, all the connected clients will automatically get updated.
 
 # Inserting parties from the console
 
@@ -129,7 +129,7 @@ <h1>Step 3 - 3-Way data binding</h1>
 
     meteor mongo
 
-This opens a console into your app's local development database. Into the prompt, type:
+This opens a console into your app's local development database. At the prompt, type:
 
     db.parties.insert({ name: "A new party", description: "From the mongo console!" });
 
@@ -138,18 +138,18 @@ <h1>Step 3 - 3-Way data binding</h1>
 
 Insert a few more parties from the database console with different text.
 
-Now let's do the same but with remove. Into the prompt, type the following command to look at all the parties and their properties:
+Now let's do the same but with remove. At the prompt, type the following command to look at all the parties and their properties:
 
     db.parties.find({});
 
 Now choose one party you want to remove and copy it's id property.
-Then, remove it like that (replace N4KzMEvtm4dYvk2TF with your party's id value):
+Then, remove it using that id (replace N4KzMEvtm4dYvk2TF with your party's id value):
 
     db.parties.remove( {"_id": "N4KzMEvtm4dYvk2TF"});
 
-Again, you will see the UI of your app immediately update to without the removed party.
+Again, you will see the UI of your app immediately update with that party removed.
 
-Try running more actions like update an object from the console and so on..
+Try running more actions like updating an object from the console and so on.
 
 In the next step, we'll see how to add functionality to our app's UI so that we can add parties without using the database console.
 

.docs/angular-meteor/client/views/steps/tutorial.step_04.html

@@ -25,11 +25,11 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
 
 Now that we have full data binding from server to client, let's interact with the data and see the updates in action.
 
-In this chapter you will add the option to add a new party and delete an existing one.
+In this chapter you will add the ability to insert a new party and delete an existing one from the UI.
 
-First let's add a simple form with a button that will add a new party.
+First let's create a simple form with a button that will add a new party.
 
-Add to following form inside the PartiesListCtrl div:
+Add the following form inside the PartiesListCtrl div:
 
     <form>
       <label>Name</label>
@@ -40,7 +40,7 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
     </form>
 
 
-So that index.ng.html will look like that:
+So that index.ng.html will look like this:
 
 __`index.ng.html`:__
 
@@ -68,9 +68,9 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
 
 ## ng-model
 
-First thing, let's bind the value of the inputs into a new party variable.
+First things first, let's bind the value of the inputs into a new party variable.
 
-To do that we will use the simple and powerful [ng-model](https://docs.angularjs.org/api/ng/directive/ngModel) AngularJS directive.
+To do that we'll use the simple and powerful [ng-model](https://docs.angularjs.org/api/ng/directive/ngModel) AngularJS directive.
 
 Add ng-model to the form like this:
 
@@ -82,7 +82,7 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
       <button>Add</button>
     </form>
 
-Now each time the user types inside those inputs, the value of the newParty scope variable will be automatically updated.  Conversely, if $scope.newParty is changed outside of the HTML, the input values will be updated accordingly.
+Now each time the user types inside these inputs, the value of the newParty scope variable will be automatically updated.  Conversely, if $scope.newParty is changed outside of the HTML, the input values will be updated accordingly.
 
 ## ng-click
 
@@ -91,8 +91,8 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
 
     <button ng-click="parties.push(newParty); newParty='';">Add</button>
 
-ng-click binds the click event into an expression.
-So we take the parties scope array (when accessing scope variables in the HTML, there is no need to add $scope. before) and push the newParty variable into it.
+ng-click binds the click event to an expression.
+So we take the parties scope array (when accessing scope variables in the HTML, there is no need to add $scope. before them) and push the newParty variable into it.
 
 Open a different browser, click the button and see how the party is added on both clients. So simple!
 
@@ -110,17 +110,17 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
     </ul>
 
 
-So this time we are binding ng-click to a scope function that gets the current party as a parameter.
+This time we are binding ng-click to a scope function that gets the current party as a parameter.
 
 Let's go into the controller and add that function.
 
-Add that function inside the PartiesListCtrl in `app.js`:
+Add the function inside the PartiesListCtrl in `app.js`:
 
     $scope.remove = function(party){
       $scope.parties.splice( $scope.parties.indexOf(party), 1 );
     };
 
-And this is how the controller should look now:
+And this is how the controller should now look:
 
     angular.module("socially").controller("PartiesListCtrl", ['$scope', '$meteor',
       function($scope, $meteor){
@@ -139,35 +139,35 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
 
 # AngularMeteorCollection functions
 
-$meteor.collection's return value is a new collection from type [AngularMeteorCollection](/api/AngularMeteorCollection).
+$meteor.collection's return value is a new collection of type [AngularMeteorCollection](/api/AngularMeteorCollection).
 
 It is not only responsible for keeping the collection updated, it also has helper functions for saving and deleting objects.
 
-Let's try to use those instead of the current solution.
+Let's try to use these helper functions instead of the current implementation.
 
-First let's replace our push to save in the add button action:
+First let's replace our 'push' with 'save' in the add button action:
 
     <button ng-click="parties.save(newParty); newParty='';">Add</button>
 
-There isn't a lot of difference here except a little bit of performance, but now let's change our remove function:
+There isn't much difference here except a small performance improvement, but now let's change our remove function:
 
     $scope.remove = function(party){
       $scope.parties.remove(party);
     };
 
-Much nicer!  and also better performance.
+Much nicer, and gives better performance!
 
-Let's also add a button for remove all parties:
+Also let's add a button to remove all parties:
 
     <button ng-click="removeAll()">remove all</button>
 
-and add it's function in the scope:
+not forgetting to add this new function to the scope:
 
     $scope.removeAll = function(){
       $scope.parties.remove();
     };
 
-Very simple syntax.
+Again, very simple syntax.
 
 You can read more about AngularMeteorCollection and it's helper functions in the [API reference](http://angularjs.meteor.com/api/AngularMeteorCollection).
 
@@ -188,4 +188,4 @@ <h1>Step 4 - Adding/removing objects and Angular event handling</h1>
     </ul>
     </div>
   </div>
-</template>
+</template>

.docs/angular-meteor/client/views/steps/tutorial.step_09.html

@@ -76,7 +76,7 @@ <h1>Step 9 - Privacy and publish-subscribe functions</h1>
 
 We have two ways of doing that:
 
-1. Using the [$meteor.subscribe](/api/subscribe) service that also return a promise when the subscribing is done
+1. Using the [$meteor.subscribe](/api/subscribe) service that also returns a promise when the subscribing is done
 2. Using [AngularMeteorCollection's](/api/AngularMeteorCollection) subscribe function which is exactly the same but it's
 here just for syntactic sugar doesn't return a promise.
 

README.md

@@ -16,7 +16,7 @@
 - [Example application](https://github.com/Urigo/meteor-angular-socially) (Final version of the tutorial)
 - [angular-meteor University](https://github.com/Urigo/meteor-angular-socially#angular-meteor-university-)
 - Questions and help - [stack-overflow `angular-meteor` tag](http://stackoverflow.com/questions/tagged/angular-meteor)
-- Discussions - [Meteor Forums](https://forums.meteor.com/) and [![Join the chat at https://gitter.im/Urigo/angular-meteor](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Urigo/angular-meteor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+- Discussions - [Angular category on the Meteor Forum](https://forums.meteor.com/c/angular) and [![Join the chat at https://gitter.im/Urigo/angular-meteor](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Urigo/angular-meteor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 - [Report issues](https://github.com/Urigo/angular-meteor/issues)
 - [Change Log, updates and breaking changes](https://github.com/Urigo/angular-meteor/releases)
 - [Roadmap - Trello board](https://trello.com/b/Wj9U0ulk/angular-meteor)