# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1463584862 -3600
# Node ID a38d24612a67a577f69c70b6a219e0487bc92150
# Parent  5d66adc88f675a0c9265cf5020098530daebbfe2# Parent  a6670226df24ed6f324c025084710c2e824d12d6
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 5d66adc88f67 -r a38d24612a67 js/core.js
--- a/js/core.js	Wed May 18 00:20:43 2016 +0100
+++ b/js/core.js	Wed May 18 16:21:02 2016 +0100
@@ -835,7 +835,7 @@
 			// Must extract the question data
 			var textArea = $(popup.popupContent).find('textarea')[0];
 			if (node.specification.mandatory == true && textArea.value.length == 0) {
-                interfaceContext.lightbox.post("Error","This Question is mandatory");
+                interfaceContext.lightbox.post("Error","This question is mandatory");
 				return;
 			} else {
 				// Save the text content
diff -r 5d66adc88f67 -r a38d24612a67 tests/examples/ABX_example.xml
--- a/tests/examples/ABX_example.xml	Wed May 18 00:20:43 2016 +0100
+++ b/tests/examples/ABX_example.xml	Wed May 18 16:21:02 2016 +0100
@@ -14,7 +14,7 @@
 				<option name="researcher">Research in the field of audio</option>
 			</surveyentry>
 			<surveyentry type="statement" id="test-intro">
-				<statement>This is an example of an 'AB'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
+				<statement>This is an example of an 'ABX'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
 			</surveyentry>
 		</survey>
 		<survey location="after">