merging previous commit to HEAD

diff --git a/lang/en_utf8/help/quiz/timelimit.html b/lang/en_utf8/help/quiz/timelimit.html
index 0c01c5d799f7828c40e5e563ccf3676a18899bc0..c24be7058e875d3f639da05108cdd9fa6f7d9ea2 100644 (file)
--- a/lang/en_utf8/help/quiz/timelimit.html
+++ b/lang/en_utf8/help/quiz/timelimit.html
@@ -3,12 +3,12 @@
 <p>By default, quizzes do not have a time limit, which allows
    students as much time as they need to complete the quiz.</p>
 
-<p>If you do specify a time limit, the several things are done to try and
+<p>If you do specify a time limit, then several things are done to try and
    ensure that quizzes are completed within that time:</p>
 
 <ul>
   <li>Javascript support in the browser becomes mandatory - this allows
-      the timer to work correctly.</li>
+      the timer to work correctly</li>
   <li>A floating timer window is shown with a countdown</li>
   <li>When the timer has run out, the quiz is submitted automatically
       with whatever answers have been filled in so far</li>