aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content
diff options
context:
space:
mode:
authorJohn Fletcher2012-12-18 18:47:35 +0100
committerPawel Kozlowski2012-12-19 20:55:22 +0100
commitd4e7274d4b6e64da24a834316946416978f84cc1 (patch)
tree0662c51f6e22ac43bab14fd149ccb83d6422f1bc /docs/content
parentcffa015554f73afae174210143dfa71d86f76bf2 (diff)
downloadangular.js-d4e7274d4b6e64da24a834316946416978f84cc1.tar.bz2
docs(guide): minor English corrections to the Directive guide
Diffstat (limited to 'docs/content')
-rw-r--r--docs/content/guide/directive.ngdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/content/guide/directive.ngdoc b/docs/content/guide/directive.ngdoc
index 4fd53352..3a97db44 100644
--- a/docs/content/guide/directive.ngdoc
+++ b/docs/content/guide/directive.ngdoc
@@ -144,9 +144,9 @@ links a specific instance of the {@link api/ng.$rootScope.Scope scope} and the s
instance of an `li` is performed.
{@link api/ng.directive:ngRepeat ngRepeat} works by preventing the
-compilation process form descending into the `li` element. Instead the {@link
+compilation process from descending into the `li` element. Instead the {@link
api/ng.directive:ngRepeat ngRepeat} directive compiles `li`
-separately. The result of of the `li` element compilation is a linking function which contains all
+separately. The result of the `li` element compilation is a linking function which contains all
of the directives contained in the `li` element, ready to be attached to a specific clone of the `li`
element. At runtime the {@link api/ng.directive:ngRepeat ngRepeat}
watches the expression and as items are added to the array it clones the `li` element, creates a
@@ -549,9 +549,9 @@ Here is an example of what the template definition for the `dialog` widget may l
This will not render properly, unless we do some scope magic.
-The first issue we have to solve is that the dialog box template expect `title` to be defined, but
-the place of instantiation would like to bind to `username`. Furthermore the buttons expect `onOk`
-as well as `onCancel` functions to be present in the scope. This limits the usefulness of the
+The first issue we have to solve is that the dialog box template expects `title` to be defined, but
+the place of instantiation would like to bind to `username`. Furthermore the buttons expect the
+`onOk` and `onCancel` functions to be present in the scope. This limits the usefulness of the
widget. To solve the mapping issue we use the `locals` to create local variables which the template
expects as follows: