Merge pull request #1144 from adrice727/master

christopherthielen · christopherthielen · commit 831c85400e9f · 2014-08-26T20:54:25.000-05:00
fix(docs): Fixed typo on line 469 of angular-ui-router.js
diff --git a/release/angular-ui-router.js b/release/angular-ui-router.js
@@ -466,7 +466,7 @@ function $Resolve(  $q,    $injector) {
    * propagated immediately. Once the `$resolve` promise has been rejected, no 
    * further invocables will be called.
    * 
-   * Cyclic dependencies between invocables are not permitted and will caues `$resolve`
+   * Cyclic dependencies between invocables are not permitted and will cause `$resolve`
    * to throw an error. As a special case, an injectable can depend on a parameter 
    * with the same name as the injectable, which will be fulfilled from the `parent` 
    * injectable of the same name. This allows inherited values to be decorated. 

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ function $Resolve( $q, $injector) {`
`466`	`466`	* propagated immediately. Once the `$resolve` promise has been rejected, no
`467`	`467`	`* further invocables will be called.`
`468`	`468`	`*`
`469`		- * Cyclic dependencies between invocables are not permitted and will caues `$resolve`
	`469`	+ * Cyclic dependencies between invocables are not permitted and will cause `$resolve`
`470`	`470`	`* to throw an error. As a special case, an injectable can depend on a parameter`
`471`	`471`	* with the same name as the injectable, which will be fulfilled from the `parent`
`472`	`472`	`* injectable of the same name. This allows inherited values to be decorated.`