Some cleanups - translators may want to check these

diff --git a/lang/en/help/html.html b/lang/en/help/html.html
index e004543532604dd878e3d57a485220c720beac19..37c550fa28bda834452a2425b0f8d238dfb206f0 100644 (file)
--- a/lang/en/help/html.html
+++ b/lang/en/help/html.html
@@ -1,7 +1,10 @@
 <P ALIGN=CENTER><B>Help on writing html</B></P>
 
-<P>When writing HTML in Moodle, you are free to use any HTML tags you like
-   to produce the effect you want.
+<P>When writing HTML in Moodle, you are free to use almost any HTML tags you like
+   to produce the effect you want.</p>
+
+<P>Note that scripting (eg Javascript or VB Script) is not allowed, and will be removed
+   automatically.</P>
 
 <P>Your code will normally be printed on the page within a table cell, 
    so:
@@ -11,3 +14,7 @@
    <LI>be careful about unmatched &lt;/TABLE> tags that may mess up the display.
    </UL>
 
+<p>Smilies (emoticons) will be converted into their graphical equivalent, and 
+   bare URLs will be converted into links.</p>
+
+</p>

diff --git a/lang/en/help/index.html b/lang/en/help/index.html
index 3294c2a992e03252391cbf6a35dd33852dc273e4..d7e353d38d20e8083195532ad1072352176dd887 100755 (executable)
--- a/lang/en/help/index.html
+++ b/lang/en/help/index.html
@@ -52,24 +52,24 @@
 \r
 <p>Quizzes</p>\r
 <ul>\r
+  <li><a href="help.php?module=quiz&file=review.html">Allow review once quiz is closed</a>\r
   <li><a href="help.php?module=quiz&file=attempts.html">Attempts</a>\r
   <li><a href="help.php?module=quiz&file=categories.html">Categories</a>\r
   <li><a href="help.php?module=quiz&file=correctanswers.html">Correct answers</a>\r
   <li><a href="help.php?module=quiz&file=createmultiple.html">Creating multiple quizzes</a>\r
-  <li><a href="help.php?module=quiz&file=feedback.html">Feedback</a>\r
-  <li><a href="help.php?module=quiz&file=grademethod.html">Grade method</a>\r
-  <li><a href="help.php?module=quiz&file=import.html">Import</a>\r
-  <li><a href="help.php?module=quiz&file=match.html">Match</a>\r
+  <li><a href="help.php?module=quiz&file=grademethod.html">Grading method</a>\r
+  <li><a href="help.php?module=quiz&file=import.html">Importing questions</a>\r
+  <li><a href="help.php?module=quiz&file=match.html">Matching questions</a>\r
   <li><a href="help.php?module=quiz&file=maxgrade.html">Maximum grade</a>\r
-  <li><a href="help.php?module=quiz&file=multichoice.html">Multiple choice</a>\r
+  <li><a href="help.php?module=quiz&file=multichoice.html">Multiple choice questions</a>\r
+  <li><a href="help.php?module=quiz&file=timeopen.html">Opening and closing the quiz</a>\r
+  <li><a href="help.php?module=quiz&file=feedback.html">Question Feedback</a>\r
   <li><a href="help.php?module=quiz&file=questiontypes.html">Question types- creating a new question</a>\r
-  <li><a href="help.php?module=quiz&file=random.html">Random</a>\r
+  <li><a href="help.php?module=quiz&file=random.html">Random questions</a>\r
   <li><a href="help.php?module=quiz&file=randomsamatch.html">Random Short-Answer Matching questions</a>\r
-  <li><a href="help.php?module=quiz&file=review.html">Allow review once quiz is closed</a>\r
   <li><a href="help.php?module=quiz&file=shortanswer.html">Short Answer questions</a>\r
   <li><a href="help.php?module=quiz&file=shuffleanswers.html">Shuffle answers</a>\r
   <li><a href="help.php?module=quiz&file=shufflequestions.html">Shuffle questions</a>\r
-  <li><a href="help.php?module=quiz&file=timeopen.html">Opening and closing the quiz</a>\r
   <li><a href="help.php?module=quiz&file=truefalse.html">True/False questions</a>\r
 </ul>\r
 \r
@@ -77,4 +77,5 @@
 <ul>\r
   <li><a href="help.php?module=resource&file=resourcetype.html">Resource Type</a>\r
   <li><a href="help.php?module=resource&file=summary.html">Reading Summary</a>\r
+  <li><a href="help.php?module=resource&file=program.html">Program resources</a>\r
 </ul>\r

diff --git a/lang/en/help/quiz/import.html b/lang/en/help/quiz/import.html
index e50cebe5ea63e87f9e68e58154b2fff017e69b62..a8a2952a51377a897b294e5fa957321dfce1d252 100644 (file)
--- a/lang/en/help/quiz/import.html
+++ b/lang/en/help/quiz/import.html
@@ -16,7 +16,7 @@ we become students of {=anatomy and physiology ~reflexology
 ~science ~experiment}, and in a sense we remain students for life.
 </BLOCKQUOTE>
 
-<P>More info: <? helpbutton("formatmissingword", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=formatmissingword.html&module=quiz">More info about the "Missing Word" format</a></p>
 </UL>
 
 
@@ -37,7 +37,7 @@ we become students of {=anatomy and physiology ~reflexology
 <P>This module can import questions saved in Blackboard's export 
 format.  It relies on XML functions being compiled into your PHP.</P>
 
-<P>More info: <? helpbutton("formatblackboard", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=formatblackboard.html&module=quiz">More info about the "Blackboard" format</a></p>
 </UL>
 
 <P><B>Custom</B></P>
@@ -48,7 +48,7 @@ format.  It relies on XML functions being compiled into your PHP.</P>
 <P>The amount of new code needed is quite small - just enough
    to parse a single question from given text.
 
-<P>More info: <? helpbutton("formatcustom", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=formatcustom.html&module=quiz">More info about the "Custom" format</a></p>
 </UL>
 
 

diff --git a/lang/en/help/quiz/questiontypes.html b/lang/en/help/quiz/questiontypes.html
index f3fc13016045d7b4a62b2e7288ac3b4b7cb820b5..61581c54f1468f380d349f3ca4d41de8f65c932a 100644 (file)
--- a/lang/en/help/quiz/questiontypes.html
+++ b/lang/en/help/quiz/questiontypes.html
@@ -7,7 +7,7 @@
 <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>More info: <? helpbutton("multichoice", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=multichoice.html&module=quiz">More info about Multiple Choice questions</a></p>
 </UL>
 
 <P><B>Short Answer</B></P>
@@ -16,7 +16,7 @@
    types a word or phrase.  There may several possible correct answers,
    with different grades.  Answers may or may not be sensitive to case.
 </P>
-<P>More info: <? helpbutton("shortanswer", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=shortanswer.html&module=quiz">More info about Short Answer questions</a></p>
 </UL>
 
 <P><B>True/False</B></P>
@@ -24,14 +24,31 @@
 <P>In response to a question (that may include a image), the respondent
    selects from two options: True or False.
 </P>
-<P>More info: <? helpbutton("truefalse", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=truefalse.html&module=quiz">More info about True/False questions</a></p>
+</UL>
+
+<P><B>Matching</B></P>
+<UL>
+<P>A list of sub questions is provided, along with a list of answers.  The 
+   respondent must "match" the correct answers with each question.
+</P>
+<p align=right><a href="help.php?file=matching.html&module=quiz">More info about Matching questions</a></p>
+</UL>
+
+<P><B>Random Short-Answer Matching</B></P>
+<UL>
+<P>From the student perspective, this looks just like a Matching question.
+   The difference is that the subquestions are drawn randomly from Short Answer questions 
+   in the current category.
+</P>
+<p align=right><a href="help.php?file=randomsamatching.html&module=quiz">More info about Matching questions</a></p>
 </UL>
 
 <P><B>Random</B></P>
 <UL>
-<P>(Not yet implemented)  Allows you to select a number of other questions from 
-   which one gets randomly selected each time a student attempts the quiz.
+<P>A Random question in a quiz is replaced by a randomly-chosen question
+   from the category that was set.
 </P>
-<P>More info: <? helpbutton("random", "", "quiz") ?></P>
+<p align=right><a href="help.php?file=random.html&module=quiz">More info about Random questions</a></p>
 </UL>
 

diff --git a/lang/en/help/resource/program.html b/lang/en/help/resource/program.html
new file mode 100644 (file)
index 0000000..d573921
--- /dev/null
+++ b/lang/en/help/resource/program.html
@@ -0,0 +1,17 @@
+<P ALIGN=CENTER><B>Program Resources</B></P>
+
+<p>A Program resource is an external resource that is able to accept data 
+   passed to it from Moodle.</p>
+
+<p>The data is passed via HTTP GET (as part of the URL) and includes:</p>
+
+<ul>
+<li>extern_nav: the URL from which the resource is being called
+<li>extern_usr: the username of the current user
+<li>extern_nam: the full name of the current user
+<li>extern_tim: the current time
+<li>extern_pwd: a unique password
+</ul>
+
+<p>All this is due to be revised sometime in the near future.</p>
+

diff --git a/lang/en/help/resource/resourcetype.html b/lang/en/help/resource/resourcetype.html
index 392a1500224ded42a8cb49dfeb8a36f7c661925f..107605dd87e89438a73b86a81830a6b59e0d74c0 100644 (file)
--- a/lang/en/help/resource/resourcetype.html
+++ b/lang/en/help/resource/resourcetype.html
@@ -6,10 +6,12 @@
 
 <P><B>Plain text</B> - the easiest type.  You can just type (edit) the page into a form 
 on the following page.  Some things you type will be automatically formatted, just like 
-forum postings.  See help on typing text: <? helpbutton("text", get_string("helptext")) ?>
+forum postings.  
+<a href="help.php?file=text.html">More info about auto-formatted text</a></p>
 
 <P><B>HTML text</B> - for more advanced users.  No automatic formatting is performed, 
 you need to do it all manually using HTML codes.
+<a href="help.php?file=html.html">More info about HTML text</a></p>
 
 <P><B>Reference</B> - a scholarly reference to a journal or book.
 
@@ -20,13 +22,15 @@ activity they will be taken out of the course (the page you've specified will fi
 
 <P><B>Web page</B> - A URL to somewhere on the web.  Like the previous type, this 
 will display a web page.  Unlike the previous type, though, the page will displayed 
-within a frame, as if it is integrated within the course.
+<b>within a frame</b>, as if it is integrated within the course.
 
 <P><B>Program</B> - an external program that requires information passed to it 
 about the current Moodle user and course.  This allows external web applications 
 to cooperate with Moodle.
+<a href="help.php?file=program.html&module=resource">More info about Program resources</a></p>
 
-<p><b>Wiki text</b> - allows more formatting options that Plain Text without having to learn HTML.
+<p><b>Wiki text</b> - allows more formatting options than Plain Text without having to learn HTML.
 You type plain text but a large range of formatting characters can be included
-(e.g. *this will be bold* /this will be emphasised/) to easily create complex formatting.</p>
+(e.g. *this will be bold* /this will be emphasised/) to easily create complex formatting.
+<a href="help.php?file=wiki.html">More info about Wiki text</a></p>