switch mentions of method to function

jameswritescode · jameswritescode · commit 2f7dce981ea9 · 2015-06-05T16:20:06.000-04:00
diff --git a/courses/intro/2_functions.js b/courses/intro/2_functions.js
@@ -39,23 +39,23 @@ failures = {
     "message": "Uh oh, it looks like your code won't run. Here's the error message we're getting"
   },
   'f_no_alert': {
-    'message': "You didn't call the alert method! Try typing `alert();` in the console.",
-    'hint':    'Call the alert method by typing the following: `alert();`'
+    'message': "You didn't call the alert function! Try typing `alert();` in the console.",
+    'hint':    'Call the alert function by typing the following: `alert();`'
   }
 };
 
 module.exports = {
   'id': 2,
-  'title': 'Methods',
+  'title': 'Functions',
   'instructions': `Great job, {{username}}! In JavaScript, when we surround a word with quotes it's called a *string*, and when we're done with a line of code we finish it with a semicolon.
 
-JavaScript also has built-in features, called *methods*. In order to call a method, we simply write its name (this time without quotes) and end it with a set of parentheses. Try calling the \`alert\` method as you see below.
+JavaScript also has built-in features, called *functions*. In order to call a function, we simply write its name (this time without quotes) and end it with a set of parentheses. Try calling the \`alert\` function as you see below.
 
 Don't be afraid when a box pops up &mdash; that's your code working, {{username}}!
 
 <code class=\"inlineCode inlineCode--btn\">alert();</code>`,
   'hints': [
-    'Call the alert method by typing the following: `alert();`'
+    'Call the alert function by typing the following: `alert();`'
   ],
   'tests': tests,
   'failures': failures,
diff --git a/courses/intro/3_string_function_parameter.js b/courses/intro/3_string_function_parameter.js
@@ -57,7 +57,7 @@ failures = {
     "message": "Uh oh, it looks like your code won't run. Here's the error message we're getting"
   },
   'f_no_alert': {
-    'message': 'You can call the alert method like this: `alert();`'
+    'message': 'You can call the alert function like this: `alert();`'
   },
   'f_no_alert_val': {
     'message': "Here's a sample name to see how it works: `alert(\"Taylor\");`"
@@ -66,20 +66,20 @@ failures = {
     'message': "You passed your name, but you didn't pass it as a string. Try adding quotes around it, like this: `\"Johnny\"`"
   },
   'f_string_not_passed': {
-    'message': 'Make sure you pass a string, like `"Johnny"`, into the `alert` method.'
+    'message': 'Make sure you pass a string, like `"Johnny"`, into the `alert` function.'
   }
 };
 
 module.exports = {
   'id': 3,
-  'title': 'String Method Parameter',
+  'title': 'String Function Parameter',
   'instructions': `Nice pop-up box, {{username}}, but there wasn't much in it. How can we get that box to show your name?
 
-Well, many methods (like the \`alert\` method) can take instructions, which we call *parameters*. By sending a string into the \`alert\` method, we can put text on the pop-up box. Try it!
+Well, many functions (like the \`alert\` function) can take instructions, which we call *parameters*. By sending a string into the \`alert\` function, we can put text on the pop-up box. Try it!
 
 <code class=\"inlineCode inlineCode--btn\">alert("{{username}}");</code>`,
   'hints': [
-    "Type in your first name surrounded by double quotes inside the alert method: `alert(\"{{username}}\");`"
+    "Type in your first name surrounded by double quotes inside the alert function: `alert(\"{{username}}\");`"
   ],
   'tests': tests,
   'failures': failures,
diff --git a/courses/intro/6_numbers.js b/courses/intro/6_numbers.js
@@ -47,7 +47,7 @@ describe('set_a_var', function(){
 
 failures = {
   'f_no_alert': {
-    "message": "You didn't call the alert method! Try typing `alert();` in the console."
+    "message": "You didn't call the alert function! Try typing `alert();` in the console."
   },
   'f_no_alert_val': {
     'message': "Here's a sample name to see how it works: `alert(42);`"
@@ -62,7 +62,7 @@ module.exports = {
   'title': 'Numbers',
   'instructions': `Great! Notice how your name printed out on the screen below, showing you the value inside the variable.
 
-So far we have only worked with 1 value type (strings), but JavaScript has many! Another example of a value type is a number. Pass any number of your choosing into the alert method. Just like a method, a number does not get quotations.
+So far we have only worked with 1 value type (strings), but JavaScript has many! Another example of a value type is a number. Pass any number of your choosing into the alert function. Just like a function, a number does not get quotations.
 
 <code class=\"inlineCode inlineCode--btn\">alert(42);</code>`,
   'tests': tests,
diff --git a/courses/intro/8_combining_strings.js b/courses/intro/8_combining_strings.js
@@ -56,7 +56,7 @@ failures = {
     "message": "Uh oh, it looks like your code won't run. Here's the error message we're getting"
   },
   'f_no_alert': {
-    'message': 'You can call the alert method like this: `alert();`'
+    'message': 'You can call the alert function like this: `alert();`'
   },
   'f_no_alert_val': {
     'message': "Your alert message should look like this: `alert(firstName + \" is awesome!\");`"
diff --git a/courses/intro/index.js b/courses/intro/index.js
@@ -3,8 +3,8 @@ var path = require('path');
 
 challenges = [
   '1_string',
-  '2_methods',
-  '3_string_method_parameter',
+  '2_functions',
+  '3_string_function_parameter',
   '4_variables',
   '5_variable_value',
   '6_numbers',
