summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTommaso <p.tommy93@gmail.com>2015-10-18 13:27:46 +0200
committerTommaso <p.tommy93@gmail.com>2015-10-18 13:27:46 +0200
commit834846cdba4adbfe61fcb485cbe39b179b799722 (patch)
tree390852f578c569132d98a9f902f806b0c8ea4699
parent1aaf79b6e56b7d4947335dd60613f8096b66b0d9 (diff)
parent6e5262ef69e4faeae1f4726a71a814c3144425f0 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--javascript.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html.markdown b/javascript.html.markdown
index 937354eb..9c4f06fc 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -324,7 +324,7 @@ i; // = 5 - not undefined as you'd expect in a block-scoped language
// scope.
(function(){
var temporary = 5;
- // We can access the global scope by assiging to the "global object", which
+ // We can access the global scope by assigning to the "global object", which
// in a web browser is always `window`. The global object may have a
// different name in non-browser environments such as Node.js.
window.permanent = 10;