From 2ea12379273f0551a419e8d55ffb70cb8ac0af78 Mon Sep 17 00:00:00 2001
From: Helen Foster <helen@moodle.org>
Date: Tue, 25 May 2010 15:59:09 +0000
Subject: [PATCH] MDL-21695 changing help and link strings

---
 .../type/calculated/lang/en/qtype_calculated.php  | 13 ++-----------
 .../lang/en/qtype_calculatedsimple.php            | 15 ++-------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/question/type/calculated/lang/en/qtype_calculated.php b/question/type/calculated/lang/en/qtype_calculated.php
index 8a8cc3cbef6..71a6222411b 100644
--- a/question/type/calculated/lang/en/qtype_calculated.php
+++ b/question/type/calculated/lang/en/qtype_calculated.php
@@ -41,17 +41,8 @@ $string['calclength'] = 'Decimal Places';
 $string['calcmax'] = 'Maximum';
 $string['calcmin'] = 'Minimum';
 $string['calculated'] = 'Calculated';
-$string['calculated_help'] = '<p>Calculated questions offers a way to create individual numerical question by the use of wildcards {a},{b}that are substituted with individual values when the quiz is taken.</p>
-<p>The answers are the result of formulas that can use accepted operators as +-*/ and % where % is the modulo operator. 
-It is also possible to use some PHP-style mathematical function.</p>
-<p>Among these there are 24 single-argument function:<b>
-abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sqrt, tan, tanh
-</b>and two two-argument functions<b>
-atan2, pow
-</b>and the functions <b>min</b> and <b>max</b> that can take two or more arguments.</p> 
-<p>It is also possible to use the function <b>pi()</b></p> 
-<p>Possible usage is for example <b>sin({a}) + cos({b}) * 2</b>.</p> 
-';
+$string['calculated_help'] = 'Calculated questions enable individual numerical questions to be created using wildcards that are substituted with individual values when the quiz is taken.';
+$string['addingcalculated_link'] = 'question/type/calculated';
 $string['calculatedsummary'] = 'Calculated questions are like numerical questions but with the numbers used selected randomly from a set when the quiz is taken.';
 $string['correctanswershows'] = 'Correct answer shows';
 $string['correctanswershowsformat'] = 'Format';
diff --git a/question/type/calculatedsimple/lang/en/qtype_calculatedsimple.php b/question/type/calculatedsimple/lang/en/qtype_calculatedsimple.php
index 66fb497d87f..b14a84f1958 100644
--- a/question/type/calculatedsimple/lang/en/qtype_calculatedsimple.php
+++ b/question/type/calculatedsimple/lang/en/qtype_calculatedsimple.php
@@ -24,21 +24,10 @@
  */
 
 $string['addingcalculatedsimple'] = 'Adding a Simple Calculated question';
-$string['addingcalculatedsimple_help'] = 'Simple calculated questions enable individual numerical questions to be created using wildcards that are substituted with individual values when the quiz is taken. Simple calculated questions offer the most used features of the calculated question with a simpler creation interface.';
-$string['addingcalculatedsimple_link'] = 'question/type/calculatedsimple';
 $string['atleastonewildcard'] = 'There must be at least one wild card <strong>{x..}</strong> present in the correct answer formulas';
 $string['calculatedsimple'] = 'Calculated Simple';
-$string['calculatedsimple_help'] = '<p>Calculatedsimple questions are similar to calculated questions but can be edited in a single page process, calculated needing a three pages. These question types offers a way to create individual numerical question by the use of wildcards {a},{b}that are substituted with individual values when the quiz is taken.</p>
-<p>The answers are the result of formulas that can use accepted operators as +-*/ and % where % is the modulo operator. 
-It is also possible to use some PHP-style mathematical function.</p>
-<p>Among these there are 24 single-argument function:<b>
-abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sqrt, tan, tanh
-</b>and two two-argument functions<b>
-atan2, pow
-</b>and the functions <b>min</b> and <b>max</b> that can take two or more arguments.</p> 
-<p>It is also possible to use the function <b>pi()</b></p> 
-<p>Possible usage is for example <b>sin({a}) + cos({b}) * 2</b>.</p> 
-';
+$string['calculatedsimple_help'] = 'Simple calculated questions enable individual numerical questions to be created using wildcards that are substituted with individual values when the quiz is taken. Simple calculated questions offer the most used features of the calculated question with a simpler creation interface.';
+$string['calculatedsimple_link'] = 'question/type/calculatedsimple';
 $string['calculatedsimplesummary'] = 'A simpler version of calculated questions which are like numerical questions but with the numbers used selected randomly from a set when the quiz is taken.';
 $string['converttocalculated'] = 'Save as a new regular calculated question';
 $string['editingcalculatedsimple'] = 'Editing a Simple Calculated question';