aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaomiblack2013-01-08 16:08:24 -0800
committerPete Bacon Darwin2013-01-09 09:50:27 +0000
commit841bdf1c07bf7408ed9853488d77b1e7ca37e091 (patch)
tree6db95d701ac0d6b4b1267b1bda20744f41e7ce76
parent86cac55c7ce16e8adeae46649218d1b76fe222e3 (diff)
downloadangular.js-841bdf1c07bf7408ed9853488d77b1e7ca37e091.tar.bz2
Update docs/content/misc/faq.ngdoc
Updated the canonical video to a recent one. Fixed a typo.
-rw-r--r--docs/content/misc/faq.ngdoc9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/content/misc/faq.ngdoc b/docs/content/misc/faq.ngdoc
index 20e14767..81ec2cb7 100644
--- a/docs/content/misc/faq.ngdoc
+++ b/docs/content/misc/faq.ngdoc
@@ -32,7 +32,7 @@ templating systems.
### Do I need to worry about security holes in AngularJS?
-Like with any technology, AngularJS is not impervious to attack. Angular does, however, provide
+Like any other technology, AngularJS is not impervious to attack. Angular does, however, provide
built-in protection from basic security holes including cross-site scripting and HTML injection
attacks. AngularJS does round-trip escaping on all strings for you and even offers XSRF protection
for server-side communication.
@@ -90,9 +90,8 @@ framework, provides mocks for many heavy dependencies (server-side communication
### How can I learn more about Angular?
-Watch the July 28, 2010 talk
-"{@link http://www.youtube.com/watch?v=elvcgVSynRg| Angular: A Radically Different Way of Building
-AJAX Apps}".
+Watch the July 17, 2012 talk
+"{@link http://www.youtube.com/watch?v=1CpiB3Wk25U AngularJS Intro + Dependency Injection}".
### How is Angular licensed?
@@ -109,7 +108,7 @@ Creative Commons Attribution-ShareAlike 3.0 Unported License}". If you have some
### How can I get some AngularJS schwag?
We often bring a few t-shirts and stickers to events where we're presenting. If you want to order your own, the folks who
-make our schwag will be happy to do a custom run for you, based on our existing template. By using the design they have on file, you
+make our schwag will be happy to do a custom run for you, based on our existing template. By using the design they have on file,
they'll waive the setup costs, and you can order any quantity you need.
**Stickers**