Merge pull request #87 from vitorarjol/dev

Fixing small typos on the Transition docs.

Author: yyx990803

docs/pipeline/data.md

@@ -84,8 +84,8 @@ route: {
   data (transition) {
     var userId = transition.to.params.userId
     return Promise.all([
-      userService.get(id),
-      postsService.getForUser(id)
+      userService.get(userId),
+      postsService.getForUser(userId)
     ]).then(function (data) {
       return {
         user: data[0],

docs/pipeline/hooks.md

@@ -61,7 +61,7 @@ All transition hooks are considered asynchronous by default. In order to signal
 
 ### Returning Promise in Hooks
 
-When you return a Promise in a transition hook, `transition.next` will be called for you when the Primise resolves. If the Promise is rejected during validation phase, it will call `transition.abort`; if it is rejected during activation phase, it will call `transition.next`.
+When you return a Promise in a transition hook, `transition.next` will be called for you when the Promise resolves. If the Promise is rejected during validation phase, it will call `transition.abort`; if it is rejected during activation phase, it will call `transition.next`.
 
 For validation hooks (`canActivate` and `canDeactivate`), if the Promise's resolved value is falsy, it will also abort the transition.
 
@@ -96,7 +96,7 @@ We are asynchronously fetching data in the `activate` hook here just for the sak
 
 ``` js
 route: {
-  acitvate ({ next }) {
+  activate ({ next }) {
     // when done:
     next()
   }