Merge remote-tracking branch 'origin/master'

Author: Urigo

.docs/angular-meteor/client/content/api/api.AngularMeteorCollection.html

@@ -109,11 +109,11 @@ <h4>Parameters</h4>
 </tr>
 </tbody></table>
 <br>
-<h3><p><code><span class="pln">subscribe( :subscriptionName );</span></code></p></h3>
+<h3><p><code><span class="pln">subscribe( :subscriptionName, :PublisherArguments );</span></code></p></h3>
 <br>
 A shorter ('syntactic sugar') function for <a href="/api/subscribe">$meteor.subscribe</a>.
 
-Takes only one parameter and doesn't return a promise like <a href="/api/subscribe">$meteor.subscribe</a> does.
+Takes the subscription name and its paraemters, but does not return a promise like <a href="/api/subscribe">$meteor.subscribe</a> does.
 
 When called after $scope.meteorCollection, it acts the same but in addition it automatically closes the subscription when the scope is destroyed.
 
@@ -138,6 +138,13 @@ <h4>Parameters</h4>
     </p></td>
     <td><a href="" class="label type-hint type-hint-object">Yes</a></td>
   </tr>
+  <tr>
+    <td>publisherArguments</td>
+    <td><a href="" class="label type-hint type-hint-object">any</a></td>
+    <td><p>Optional arguments passed to publisher function on server.</p></td>
+    <td><a href="" class="label type-hint type-hint-object">No</a></td>
+  </tr>
+
   </tbody>
 </table>
 #### Returns

.docs/angular-meteor/client/content/tutorials/angular1/steps/tutorial.step_09.md

@@ -264,7 +264,7 @@ More information about publications and subscription in [this blog article](http
 We've added the support of privacy to our parties app.
 
 We also learned how to use the `Meteor.publish` command to control permissions and the data sent to the client
-and how to subscribe to it with the $meteor.collection publish function.
+and how to subscribe to it with the $meteor.collection subscribe function.
 
 In the next step we will learn how to filter the users list in the client side with AngularJS filters and create a custom filter for our own needs.
 

.docs/angular-meteor/client/content/tutorials/angular1/steps/tutorial.step_15.md

@@ -52,7 +52,7 @@ So let's use `ng-if` to hide the outstanding invitations from a party, if the pa
 
 # Assigning a function
 
-Now lets hide the 'Users to invite' inside `party-details.ng.html` is case the user is not logged in or can't invite to the party:
+Now lets hide the 'Users to invite' inside `party-details.ng.html` in case the user is not logged in or can't invite to the party:
 
 To do that we will create a scope function that returns a boolean and associate it with `ng-show`:
 

.docs/angular-meteor/client/content/tutorials/angular1/steps/tutorial.step_16.md

@@ -18,7 +18,7 @@ Now let's add a map the `party-details.ng.html` , first add this HTML snippet to
 
 {{> DiffBox tutorialName="angular-meteor" step="16.2"}}
 
-Here we created the google-map directive with attributes for biding the center, handling events and zoom of the map.
+Here we created the google-map directive with attributes for binding the center, handling events and zoom of the map.
 So let's define those variables in our scope. Go to `partyDetails.js`.
 
 Inside we will create the $scope.map variable to hold the properties on the map:
@@ -32,15 +32,15 @@ Create a new file named parties.css inside a new folder called `styles` placed l
 
 Now run the app and go to the party details page. You should see a new Google Map widget, but it doesn't do anything yet.
 
-Let's add a marker that will be binded to the party's location.
+Let's add a marker that will be bound to the party's location.
 
 Inside `party-details.ng.html`:
 
 {{> DiffBox tutorialName="angular-meteor" step="16.5"}}
 
 The ui-gmap-marker directive represents a marker inside the map. We use the following attributes:
 
-* coords - where is the scope the marker location will be binded to.
+* coords - where is the scope the marker location will be bound to.
 * options - object that holds the marker options. We are going to use the draggable option.
 * events - handling the events on the marker. We will use the click event.
 * idKey - where in the scope there exists the unique id of the object that the marker represent.
@@ -56,7 +56,7 @@ What happened here:
 * We added the click event to the map. Every time the user clicks the map, we take the location from the click event's params and save it as the party's new location.
 Notice that in the end we call $scope.$apply();  this is because that event comes outside of Angular and we need to let Angular know that something has change so it will run another $digest cycle.
 * We defined the options object under the marker to specify the marker is draggable.
-* We handled the dragend event that happens when the marker is droped in a new location. We take the location from the event's params and save it as the party's new location.
+* We handled the dragend event that happens when the marker is dropped to a new location. We take the location from the event's params and save it as the party's new location.
 
 Again, with the great Meteor platform there is no need for sync or save function. We just set it and it syncs in all other clients.
 
@@ -77,7 +77,7 @@ You can see that the difference between the directive we used in `party-details.
 The attributes we use:
 
 * models - the scope array that the markers represent.
-* coords - the property the holds the location.
+* coords - the property that holds the location.
 * click - handler for the click event on a marker
 * fit - a boolean to automatically zoom the map to fit all the markers inside
 * idKey - the property that holds the unique id of the array

.docs/angular-meteor/client/content/tutorials/angular1/steps/tutorial.step_17.md

@@ -85,7 +85,7 @@ Now, let's start with some cool fonts and some CSS changes to make the `index.ht
 
 {{> DiffBox tutorialName="angular-meteor" step="17.9"}}
 
-And verify that we have `angular-ui-bootstrap` dependency in the module definition, because we will use `$modal` service later.
+And verify that we have `ui.bootstrap` dependency in the module definition, because we will use `$modal` service later.
 
 {{> DiffBox tutorialName="angular-meteor" step="17.10"}}
 

.docs/angular-meteor/client/content/tutorials/angular1/steps/tutorial.step_18.md

@@ -18,7 +18,7 @@ Next, we want to inject the angular-material module into our Angular application
 
 {{> DiffBox tutorialName="angular-meteor" step="18.3"}}
 
-Don't forget to remove the `ui.bootstrap` dependency! It's not longer needed!
+Don't forget to remove the `ui.bootstrap` dependency! It's no longer needed!
 
 That's it, now we can use angular-material in our application layout.