summaryrefslogtreecommitdiffhomepage
path: root/javascript.html.markdown
diff options
context:
space:
mode:
authorAdam Brenecki <adam@brenecki.id.au>2014-06-11 11:41:14 +0930
committerAdam Brenecki <adam@brenecki.id.au>2014-06-11 11:41:14 +0930
commitb2925f37008ecdb03d78a2d89f1d950e08e7cec0 (patch)
tree82c868083f0b0dfc6a1533c28d3499671d005040 /javascript.html.markdown
parent663e697e018f4ebc8b89b5e77f21ff1066a36252 (diff)
parent659bc7566f1791800a06995a610306cdc8430e71 (diff)
Merge pull request #646 from nati22/master
Changed "complimenting" to "complementing".
Diffstat (limited to 'javascript.html.markdown')
-rw-r--r--javascript.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html.markdown b/javascript.html.markdown
index 76017c17..c59a90c3 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -7,7 +7,7 @@ filename: javascript.js
---
JavaScript was created by Netscape's Brendan Eich in 1995. It was originally
-intended as a simpler scripting language for websites, complimenting the use of
+intended as a simpler scripting language for websites, complementing the use of
Java for more complex web applications, but its tight integration with Web pages
and built-in support in browsers has caused it to become far more common than
Java in web frontends.