From 0e9ab5017ba44ccfbd2a0a98495f854fd63eb3e3 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 19 Jun 2015 16:17:59 -0700 Subject: [PATCH] Merge branch 'Lemony-Andrew-master' into staging Conflicts: server/views/coursewares/showBonfire.jade --- challenges/basic-bonfires.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/challenges/basic-bonfires.json b/challenges/basic-bonfires.json index df4b6bc16c..08c797f58c 100644 --- a/challenges/basic-bonfires.json +++ b/challenges/basic-bonfires.json @@ -853,7 +853,7 @@ "difficulty": "2.03", "description": [ "Perform a search and replace on the sentence using the arguments provided and return the new sentence.", - "First argument is the sentence the perform the search and replace on.", + "First argument is the sentence to perform the search and replace on.", "Second argument is the word that you will be replacing (before).", "Third argument is what you will be replacing the second argument with (after).", "NOTE: Preserve the case of the original word when you are replacing it. For example if you mean to replace the word 'Book' with the word 'dog', it should be replaced as 'Dog'", @@ -990,7 +990,8 @@ "expect(fearNotLetter('yz')).to.be.undefined;" ], "MDNlinks": [ - "String.charCodeAt()" + "String.charCodeAt()", + "String.fromCharCode()" ], "challengeType": 5, "nameCn": "",