diff --git a/lang/en_utf8/help/enrol/imsenterprise/unenrol.html b/lang/en_utf8/help/enrol/imsenterprise/unenrol.html index c4f532f4835..3cdf8b72354 100644 --- a/lang/en_utf8/help/enrol/imsenterprise/unenrol.html +++ b/lang/en_utf8/help/enrol/imsenterprise/unenrol.html @@ -12,7 +12,7 @@

The third method is slightly different. It does not require this config setting to be activated, and can be specified well in advance of the unenrolment date:

diff --git a/lang/en_utf8/help/exercise/gradingstrategy.html b/lang/en_utf8/help/exercise/gradingstrategy.html index 6caafd405b2..e9faa719844 100644 --- a/lang/en_utf8/help/exercise/gradingstrategy.html +++ b/lang/en_utf8/help/exercise/gradingstrategy.html @@ -20,7 +20,7 @@ actual number depending on the size and complexity of the assignment. An exercise assignment with only one element is allowed and has a similar assessment strategy to the standard Moodle Assignment. - +

Elements have the following three features:

  1. The DESCRIPTION of the assessment element. This should clearly state what @@ -53,6 +53,7 @@ experimental feature.

+
  1. Error Banded Grading: In this type of assignment the submissions are graded on a set of Yes/No scales. The grade is determined by the "Grade Table " which gives the relationship between the number of diff --git a/lang/en_utf8/help/feedback/mods.html b/lang/en_utf8/help/feedback/mods.html index eb4945e4154..eb3ceef86ee 100644 --- a/lang/en_utf8/help/feedback/mods.html +++ b/lang/en_utf8/help/feedback/mods.html @@ -1,8 +1,5 @@ -  +

     Feedbacks -

    - + diff --git a/lang/en_utf8/help/feedback/preview.html b/lang/en_utf8/help/feedback/preview.html index dcfa2763c16..42548adcca3 100644 --- a/lang/en_utf8/help/feedback/preview.html +++ b/lang/en_utf8/help/feedback/preview.html @@ -1,11 +1,6 @@ -TRANSLATORS: DO NOT TRANSLATE YET, THESE NEED REVIEW +

    Preview

    - -   - - diff --git a/lang/en_utf8/help/grade/aggregation.html b/lang/en_utf8/help/grade/aggregation.html index 48118e106e7..4aa0ce06278 100644 --- a/lang/en_utf8/help/grade/aggregation.html +++ b/lang/en_utf8/help/grade/aggregation.html @@ -14,19 +14,19 @@ the gradebook administrator. Caution in interpreting these "empty grades" is thu
    Mean of grades
    The sum of all grades divided by the total number of grades.
    A1 70/100, A2 20/80, A3 10/10, category max 100:
    - (0.7 + 0.25 + 1.0)/3 = 0.65 --> 65/100
    + (0.7 + 0.25 + 1.0)/3 = 0.65 --> 65/100
    Weighted mean
    Each grade item can be given a weight, which is then used in the arithmetic mean aggregation to influence the importance of each item in the overall mean.
    A1 70/100 weight 10, A2 20/80 weight 5, A3 - 10/10 weight 3, category max 100:
    (0.7*10 + 0.25*5 + 1.0*3)/18 = 0.625 --> 62.5/100
    + 10/10 weight 3, category max 100:
    (0.7*10 + 0.25*5 + 1.0*3)/18 = 0.625 --> 62.5/100
    Simple weighted mean
    The difference from Weighted mean is that weight is calculated as Maximum grade - Minimum grade for each item. 100 point assignment has weight 100, 10 point assignment has weight 10.
    A1 70/100, A2 20/80, A3 10/10, category max 100:
    - (0.7*100 + 0.25*80 + 1.0*10)/190 = 0.526 --> 52.6/100
    + (0.7*100 + 0.25*80 + 1.0*10)/190 = 0.526 --> 52.6/100
    Mean of grades (with extra credits)
    Arithmetic mean with a twist. An old, now unsupported aggregation strategy provided here only @@ -35,17 +35,17 @@ the gradebook administrator. Caution in interpreting these "empty grades" is thu
    Median of grades
    The middle grade (or the mean of the two middle grades) when grades are arranged in order of size. The advantage over the mean is that it is not affected by outliers (grades which are uncommonly far from the mean).
    A1 70/100, A2 20/80, A3 10/10, category max 100:
    - median(0.7 ; 0.25 ; 1.0) = 0.7 --> 70/100
    + median(0.7 ; 0.25 ; 1.0) = 0.7 --> 70/100
    Smallest grade
    The result is the smallest grade after normalisation. It is usually used in combination with Aggregate only non-empty grades.
    A1 70/100, A2 20/80, A3 10/10, category max 100:
    - min(0.7 ; 0.25 ; 1.0) = 0.25 --> 25/100
    + min(0.7 ; 0.25 ; 1.0) = 0.25 --> 25/100
    Highest grade
    The result is the highest grade after normalisation.
    A1 70/100, A2 20/80, A3 10/10, category max 100:
    - max(0.7 ; 0.25 ; 1.0) = 1.0 --> 100/100
    + max(0.7 ; 0.25 ; 1.0) = 1.0 --> 100/100
    Mode of grades
    The mode is the grade that occurs the most frequently. It is more often used for non-numerical grades. @@ -53,7 +53,7 @@ the gradebook administrator. Caution in interpreting these "empty grades" is thu However it loses its meaning once there is more than one most frequently occurring grade (only one is kept), or when all the grades are different from each other.
    A1 70/100, A2 35/50, A3 20/80, A4 10/10, A5 7/10 category max 100:
    - mode(0.7 ; 0.7 ; 0.25 ; 1.0 ; 0.7) = 0.7 --> 70/100
    + mode(0.7 ; 0.7 ; 0.25 ; 1.0 ; 0.7) = 0.7 --> 70/100
    Sum of grades
    The sum of all grade values. Scale grades are ignored. This is the only type that does not convert the diff --git a/lang/en_utf8/help/grade/exceptions.html b/lang/en_utf8/help/grade/exceptions.html index 8c88cbf9410..803e0bdd666 100644 --- a/lang/en_utf8/help/grade/exceptions.html +++ b/lang/en_utf8/help/grade/exceptions.html @@ -1,16 +1,17 @@

    Exceptions

    +

    This can be used to exclude students from individual assignments. This is useful if two class sections merge or a student transfers from a different section several weeks into a semester. -It is also useful for extenuating circumstances: sickness, injury, etc. -
    -There are three columns:

    +It is also useful for extenuating circumstances: sickness, injury, etc.

    + +

    There are three columns:

    • Left: Is students for the course that are "Included in Grading" for an particular graded item.
    • Middle: A listing of all graded items followed by a total number of students excluded from grading in parenthesis.
    • Right: A list of students that are excluded from a particular assignment
    • -
        +

      To exclude students click the assignment in the middle and then click the students name in the left column (holding down CTRL or APPLE will allow selection of multiple items). Then click diff --git a/lang/en_utf8/help/hotpot/forceplugins.html b/lang/en_utf8/help/hotpot/forceplugins.html index 3a93590a21b..fe9de8660ca 100644 --- a/lang/en_utf8/help/hotpot/forceplugins.html +++ b/lang/en_utf8/help/hotpot/forceplugins.html @@ -8,8 +8,9 @@

      Yes
      Moodle will force the quiz to use Moodle-compatible media players to play files like: -

      • avi
      • mpeg
      • mpg
      • mp3
      • mov
      • wmv

      +
      • avi
      • mpeg
      • mpg
      • mp3
      • mov
      • wmv
      +

      More information: diff --git a/lang/en_utf8/help/hotpot/studentfeedback.html b/lang/en_utf8/help/hotpot/studentfeedback.html index 62221461a97..ab8442f06dc 100644 --- a/lang/en_utf8/help/hotpot/studentfeedback.html +++ b/lang/en_utf8/help/hotpot/studentfeedback.html @@ -3,8 +3,8 @@ If this option is enabled, a link to a popup feedback window will be displayed whenever the student clicks on the "Check" button. The feedback window allows students to send feedback to the teacher regarding the quiz. -

      +

      This option can have the following settings:

      diff --git a/lang/en_utf8/help/portfolio/boxnet_apikey.html b/lang/en_utf8/help/portfolio/boxnet_apikey.html index a1d2febfd7d..f7ab8cff5e3 100644 --- a/lang/en_utf8/help/portfolio/boxnet_apikey.html +++ b/lang/en_utf8/help/portfolio/boxnet_apikey.html @@ -1,5 +1,10 @@

      Box.net API Key

      -

      Visit enabled.box.net and register a developer account. You can then navigate to My projects, and create a new one.

      -

      For all the settings, Moodle doesn't care what you put in except for the callback url, which should be $CFG->wwwroot/portfolio/add.php?postcontrol=1.

      -

      Box.net will append the relevant authentication tokens to the url (detecting it already contains ? and everything already)

      +

      Visit enabled.box.net and register a +developer account. You can then navigate to My projects, and create a new one.

      + +

      For all the settings, Moodle doesn't care what you put in except for the +callback url, which should be $CFG->wwwroot/portfolio/add.php?postcontrol=1.

      + +

      Box.net will append the relevant authentication tokens to the url (detecting +it already contains ? and everything already)

      diff --git a/lang/en_utf8/help/qformat_gift/gift.html b/lang/en_utf8/help/qformat_gift/gift.html index 427066ed25e..23d82a63978 100644 --- a/lang/en_utf8/help/qformat_gift/gift.html +++ b/lang/en_utf8/help/qformat_gift/gift.html @@ -72,19 +72,19 @@ The sun rises in the east.{T}

      Matching:
      - Matching pairs begin with an equal sign (=) and are separated by this symbol "->". There must be at least three matching pairs.

      + Matching pairs begin with an equal sign (=) and are separated by this symbol "->". There must be at least three matching pairs.

       Matching Question. {
      -    =subquestion1 -> subanswer1
      -    =subquestion2 -> subanswer2
      -    =subquestion3 -> subanswer3
      +    =subquestion1 -> subanswer1
      +    =subquestion2 -> subanswer2
      +    =subquestion3 -> subanswer3
       }
       
       Match the following countries with their corresponding capitals. {
      -    =Canada -> Ottawa
      -    =Italy  -> Rome
      -    =Japan  -> Tokyo
      -    =India  -> New Delhi
      +    =Canada -> Ottawa
      +    =Italy  -> Rome
      +    =Japan  -> Tokyo
      +    =India  -> New Delhi
       }
       

      Matching questions do not support feedback or percentage answer weights.

      @@ -278,23 +278,23 @@ up to the next modifier or the end of the file will be added to the specified ca category modifier the category specified on the import screen will be used. Note that for this to work the from file: box must be ticked on the import screen.

      -

      To include a category modifier include a line like this (with a blank line before and after): +

      To include a category modifier include a line like this (with a blank line before and after):

       $CATEGORY: tom/dick/harry
       
      -or simply +

      or simply

       $CATEGORY: mycategory
       
      -...the first example specifies a path of nested categories. In this cae the questions will go into harry. The +

      ...the first example specifies a path of nested categories. In this cae the questions will go into harry. The categories are created if they do not exist.

      -

      Other Options:
      +

      Other Options:
      Short Answer questions can be made case sensitive by changing "0" to "1" in the following line:
      $question->usecase = 0; // Ignore case

      -

      + diff --git a/lang/en_utf8/help/qformat_webct/webct.html b/lang/en_utf8/help/qformat_webct/webct.html index e12b358d425..ccf8b26fbc9 100644 --- a/lang/en_utf8/help/qformat_webct/webct.html +++ b/lang/en_utf8/help/qformat_webct/webct.html @@ -14,7 +14,7 @@ :TITLE:Short Answer Question :QUESTION:H What is the name of the WebCT Learning Hub? -<br /> +<br /> :IMAGE:dotcomLogoc.gif :ANSWERS:1 :CASE:0 diff --git a/lang/en_utf8/help/richtext2.html b/lang/en_utf8/help/richtext2.html index 3711183d6f1..3f0d092451c 100644 --- a/lang/en_utf8/help/richtext2.html +++ b/lang/en_utf8/help/richtext2.html @@ -45,4 +45,4 @@

      To embed these small icons in your text, click on the smiley icon in the toolbar. A dialog will pop up that allows you to select from the following smiley icons. (Alternatively, you can just type the corresponding code straight into your text and it will be converted later when your text is displayed).

      ##emoticons_html##
      -
       
      +