From 2c18bbe3af33b6ac5771e666987464a31bf6f70b Mon Sep 17 00:00:00 2001
From: Jonathan Hoguet <jhoguet@gmail.com>
Date: Tue, 16 Feb 2016 18:25:22 -0500
Subject: [PATCH] EMCA should be ECMA

see https://en.wikipedia.org/wiki/ECMAScript
---
 class1.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/class1.html b/class1.html
index 73f74c0..00e6e2b 100644
--- a/class1.html
+++ b/class1.html
@@ -145,12 +145,12 @@ <h3>History of JavaScript</h3>
 						<li class="fragment">Developed by Brendan Eich of Netscape in 1995 (in 10 days!). Originally called Mocha, then LiveScript.</li>
 						<li class="fragment">Java?&mdash;Actually JavaScript has nothing to do with the language Java. Java was just the cool kid in town at the time.</li>
 						<li class="fragment">Script&mdash;Instructions that a computer can run one line at a time</li>
-						<li class="fragment">Standardized in 1997 as EMCAScript (ES6 finalized in 2015, <a href="http://caniuse.com/#search=es6" target="_blank">but not fully supported</a>)</li>
+						<li class="fragment">Standardized in 1997 as ECMAScript (ES6 finalized in 2015, <a href="http://caniuse.com/#search=es6" target="_blank">but not fully supported</a>)</li>
 					</ul>
 					<aside class="notes">
 						<p>IE had own implementation in 1996 called JScript (still in existence).</p>
 						<p>Explain script/interpreted languages vs. compiled</p>
-						<p>Explain what not fully supported means. EMCAScript 5 finalized in 2009, supported in IE9+</p>
+						<p>Explain what not fully supported means. ECMAScript 5 finalized in 2009, supported in IE9+</p>
 					</aside>
 				</section>
 				
@@ -737,4 +737,4 @@ <h2>Questions?</h2>
 		</script>
 
 	</body>
-</html>
\ No newline at end of file
+</html>