diff --git a/help.php b/help.php index 66a0e2c0f11ca..9783c1f1aa6c7 100644 --- a/help.php +++ b/help.php @@ -63,7 +63,7 @@ echo $OUTPUT->heading(format_string(get_string($identifier, $component)), 1, 'helpheading'); // Should be simple wiki only MDL-21695 - echo format_text(get_string($identifier.'_help', $component), FORMAT_MOODLE, $options); + echo format_text(get_string($identifier.'_help', $component), FORMAT_MARKDOWN, $options); if ($sm->string_exists($identifier.'_link', $component)) { // Link to further info in Moodle docs $link = get_string($identifier.'_link', $component); diff --git a/lang/en/moodle.php b/lang/en/moodle.php index f3f2fd74a288d..2943fc78f9fe3 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -722,6 +722,7 @@ $string['forgotteninvalidurl'] = 'Invalid password reset URL'; $string['format'] = 'Format'; $string['format_help'] = 'The course format determines the layout of the course page. + * SCORM format - For displaying a SCORM package in the first section of the course page (as an alternative to using the SCORM/AICC module) * Social format - A forum is displayed on the course page * Topics format - The course page is organised into topic sections diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index abc248f543dbf..001295267c274 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -38,6 +38,7 @@ $string['aggregatetype_help'] = 'Forum aggregation defines how all the ratings given to posts in a forum are combined to form the final grade (for each post and for the whole forum activity). There are 5 aggregate types: + * Average - The mean of all the ratings given to posts in the forum (useful with peer grading when there are a lot of ratings being made) * Count - The number of rated posts becomes the final grade (useful when the number of posts is important). Note that the total cannot exceed the maximum grade for the forum. * Max - The highest rating is returned as the final grade (useful for emphasising the best post) @@ -191,6 +192,7 @@ $string['forumtrackednot'] = 'Unread posts are not being tracked'; $string['forumtype'] = 'Forum type'; $string['forumtype_help'] = 'There are 5 forum types: + * A single simple discussion - A single discussion topic which everyone can reply to * Each person posts one discussion - Each student can post exactly one new discussion topic, which everyone can then reply to * Q and A forum - Students must first post their perspectives before viewing other students\' posts @@ -387,6 +389,7 @@ $string['subscriptionmode_help'] = 'When a participant is subscribed to a forum it means they will receive email copies of forum posts. There are 4 subscription mode options: + * Optional subscription - Participants can choose whether to be subscribed * Forced subscription - Everyone is subscribed and cannot unsubscribe * Auto subscription - Everyone is subscribed initially but can choose to unsubscribe at any time @@ -405,9 +408,10 @@ $string['trackingon'] = 'On'; $string['trackingoptional'] = 'Optional'; $string['trackingtype'] = 'Read tracking for this forum?'; -$string['trackingtype_help'] = 'If enabled, participants can track read and unread messages in the forum and in discussions. +$string['trackingtype_help'] = 'If enabled, participants can track read and unread messages in the forum and in discussions. There are three options: + * Optional - Participants can choose whether to turn tracking on or off * On - Tracking is always on * Off - Tracking is always off'; diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php index fdaebca03e82c..341abbe0941be 100644 --- a/mod/glossary/lang/en/glossary.php +++ b/mod/glossary/lang/en/glossary.php @@ -104,6 +104,7 @@ $string['destination_help'] = 'Entries can either be imported and added to the current glossary or to a new glossary, in which case a new glossary will be created based on information in the XML file.'; $string['displayformat'] = 'Display format'; $string['displayformat_help'] = 'There are 7 display formats: + * Simple, dictionary style - No authors are displayed and attachments are shown as links * Continuous without author - Entries are displayed one after another without any separation apart from the editing icons * Full with author - A forum-like display format showing the author\'s data and with attachments shown as links diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php index 6aaef17ef5699..8f4d31590f2bf 100644 --- a/mod/lesson/lang/en/lesson.php +++ b/mod/lesson/lang/en/lesson.php @@ -26,6 +26,7 @@ $string['accesscontrol'] = 'Access control'; $string['actionaftercorrectanswer'] = 'Action after correct answer'; $string['actionaftercorrectanswer_help'] = 'After answering a question correctly, there are 3 options for the following page: + * Normal - Follow lesson path * Show an unseen page - Pages are shown in a random order with no page shown twice * Show an unanswered page - Pages are shown in a random order, with pages containing unanswered questions shown again'; diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index 72f7de986a531..eb7f0c0a4b1a5 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -118,7 +118,8 @@ $string['bothattempts'] = 'Show students with and without attempts'; $string['braceerror'] = 'Could not find {...} around answers'; $string['browsersecurity'] = 'Browser security'; -$string['browsersecurity_help'] = 'If "Full screen pop-up with some JavaScript security" is selected, +$string['browsersecurity_help'] = 'If "Full screen pop-up with some JavaScript security" is selected, + * The quiz will only start if the student has a JavaScript-enabled web-browser * The quiz appears in a full screen popup window that covers all the other windows and has no navigation controls * Students are prevented, as far as is possible, from using facilities like copy and paste'; @@ -265,6 +266,7 @@ $string['editingquestion'] = 'Editing a question'; $string['editingquiz'] = 'Editing quiz'; $string['editingquiz_help'] = 'When creating a quiz, the main concepts are: + * The quiz, containing questions over one or more pages * The question bank, which stores copies of all questions organised into categories * Random questions - A student gets different questions each time they attempt the quiz and different students can get different questions'; @@ -375,6 +377,7 @@ $string['gradehighest'] = 'Highest grade'; $string['grademethod'] = 'Grading method'; $string['grademethod_help'] = 'When multiple attempts are allowed, the following methods are available for calculating the final quiz grade: + * Highest grade of all attempts * Average (mean) grade of all attempts * First attempt (all other attempts are ignored) diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index 9a082bafea340..752e6f4f38132 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -104,6 +104,7 @@ $string['grademethod_help'] = 'The grading method defines how a final grade for the activity is determined. There are 4 grading methods: + * Learning objects - The number of completed/passed learning objects * Highest grade - The highest score obtained in all passed learning objects * Average grade - The mean of all the scores