MDL-14467 - qtype_multichoice help file in the wrong place - merged from 1.8/1.9 stable.

In addition, move the other multichoice help file to the correct location, and update all references.

lang/en_utf8/help/qtype_multichoice/multichoice.html

+<h1>Multiple Choice questions</h1>
+
+<p>In response to a question (that may include a image) the respondent 
+   chooses from multiple answers. There are two types of multiple choice 
+   questions - single answer and multiple answer.</p>
+
+<p>Single-answer questions allow one and only one answer to be chosen.
+   Generally all the grades for such a question should be positive.</p>
+
+<p>Multiple-answer questions allow one or more answers to be chosen - each answer 
+   may carry a positive or negative grade, so that choosing ALL the options 
+   will not necessarily result in good grade.  If the total grade is negative 
+   then the total grade for this question will be zero.  Careful, it is 
+   possible to create questions that have scores greater than 100%.</p>
+
+<p>Finally, each answer (right or wrong) should include feedback - this feedback
+   will be shown to the respondent next to each of their answers (if the quiz 
+   itself is configured to show feedback).
+</p>

lang/en_utf8/help/qtype_multichoice/multichoiceshuffle.html

+<h1>Shuffle answers</h1>
+
+<p>If you set this option to &quot;Yes&quot;, then the order of the answers
+ is randomly shuffled each time a student starts an attempt at a quiz
+ containing this question - provided that &quot;Shuffle within questions&quot; in
+ the Quiz settings is set to &quot;Yes&quot;.</p>
+
+<p>The intention is simply to make it a little harder for students 
+   to copy from each other.</p>
\ No newline at end of file

lang/en_utf8/help/quiz/index.html

@@ -30,8 +30,8 @@
   <li><a href="help.php?module=quiz&amp;file=matchgrades.html">Match Grades</a></li>
   <li><a href="help.php?module=quiz&amp;file=matchshuffle.html">Shuffle</a></li>
   <li><a href="help.php?module=quiz&amp;file=maxgrade.html">Maximum grade</a></li>
-  <li><a href="help.php?module=quiz&amp;file=multichoice.html">Multiple choice questions</a></li>
-  <li><a href="help.php?module=quiz&amp;file=multichoiceshuffle.html">Shuffle answers (Multiple choice)</a></li>
+  <li><a href="help.php?module=qtype_multichoice&amp;file=multichoice.html">Multiple choice questions</a></li>
+  <li><a href="help.php?module=qtype_multichoice&amp;file=multichoiceshuffle.html">Shuffle answers (Multiple choice)</a></li>
   <li><a href="help.php?module=quiz&amp;file=numerical.html">Numerical questions</a></li>
   <li><a href="help.php?module=quiz&amp;file=timeopen.html">Opening and closing the quiz</a></li>
   <li><a href="help.php?module=quiz&amp;file=overallfeedback.html">Overall Feedback</a></li>

lang/en_utf8/help/quiz/multichoice.html

+<!-- This file should now be deleted. It has been moved from the quiz folder to the 
+qtype_multichoice folder. However, it remains here for backward compatibility reasons. -->
 <h1>Multiple Choice questions</h1>
 
 <p>In response to a question (that may include a image) the respondent 

lang/en_utf8/help/quiz/multichoiceshuffle.html

+<!-- This file should now be deleted. It has been moved from the quiz folder to the 
+qtype_multichoice folder. However, it remains here for backward compatibility reasons. -->
 <h1>Shuffle answers</h1>
 
 <p>If you set this option to &quot;Yes&quot;, then the order of the answers

question/type/multichoice/edit_multichoice_form.php

@@ -26,7 +26,7 @@ class question_edit_multichoice_form extends question_edit_form {
         $mform->setDefault('single', 1);
 
         $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleanswers', 'qtype_multichoice'), null, null, array(0,1));
-        $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'quiz'));
+        $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'qtype_multichoice'));
         $mform->setDefault('shuffleanswers', 1);
 
         $numberingoptions = $QTYPES[$this->qtype()]->get_numbering_styles();