aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/guide/concepts.ngdoc
diff options
context:
space:
mode:
authorJesse Cooke2013-02-11 18:32:07 -0800
committerJames deBoer2013-02-14 13:05:25 -0800
commitf3231b944707f5984fc87a3ff34854b3f7630977 (patch)
tree18e3a3df5a4da2e0804912cb855785fdd233b6a7 /docs/content/guide/concepts.ngdoc
parenta8a3efb5f0b010ec1d4853a3c4f7cbdaf58af1c5 (diff)
downloadangular.js-f3231b944707f5984fc87a3ff34854b3f7630977.tar.bz2
docs(guide): Fix typos in concepts/model,view.
Diffstat (limited to 'docs/content/guide/concepts.ngdoc')
-rw-r--r--docs/content/guide/concepts.ngdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/content/guide/concepts.ngdoc b/docs/content/guide/concepts.ngdoc
index a087c80a..d3e4e1be 100644
--- a/docs/content/guide/concepts.ngdoc
+++ b/docs/content/guide/concepts.ngdoc
@@ -234,7 +234,7 @@ The separation of the controller and the view is important because:
The model is the data which is used merged with the template to produce the view. To be able to
render the model into the view, the model has to be able to be referenced from the scope. Unlike many
-other frameworks Angular makes no restrictions or requirements an the model. There are no classes
+other frameworks Angular makes no restrictions or requirements on the model. There are no classes
to inherit from or special accessor methods for accessing or changing the model. The model can be
primitive, object hash, or a full object Type. In short the model is a plain JavaScript object.
@@ -248,9 +248,9 @@ primitive, object hash, or a full object Type. In short the model is a plain Jav
<img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-view.png">
-The view is what the users sees. The view begins its life as a template, it is merged with the
+The view is what the user sees. The view begins its life as a template, is merged with the
model and finally rendered into the browser DOM. Angular takes a very different approach to
-rendering the view, compared to most other templating systems.
+rendering the view compared to most other templating systems.
* **Others** - Most templating systems begin as an HTML string with special templating markup.
Often the template markup breaks the HTML syntax which means that the template can not be