From: nfreear <nfreear>
Date: Wed, 23 May 2007 11:59:20 +0000 (+0000)
Subject: Big fix for MDL-9890 "Help should be well-formed, XHTML Strict and semantic"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f79310ed5668f53400aaf1c676a58cf054c1087b;p=moodle.git

Big fix for MDL-9890 "Help should be well-formed, XHTML Strict and semantic"
---

diff --git a/lang/en_utf8/docs/release.html b/lang/en_utf8/docs/release.html
index 235fc449a4..7baefa434e 100644
--- a/lang/en_utf8/docs/release.html
+++ b/lang/en_utf8/docs/release.html
@@ -50,10 +50,10 @@
   <li> Upgrade scripts have been refined and work much better for PostgreSQL installations</li>
   <li> General PostgreSQL port code cleanup</li>
   <li> Upgrading to 1.5.3 will fix any legacy Journal to Online Assignment upgrade issues</li>
-  <li> RSS libraries now support <em>RSS 2.0 categories</em>, see  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3654" target="_blank">bug 3654</a></li>
-  <li> Better accesibilty in file uploads, see  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3662" target="_blank">bug 3662</a></li>
-  <li> Better support for site-wide HTTPS, see <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3848" target="_blank">bug 3848</a></li>
-  <li> We now send away bots (like Googlebot) from that try mangled URLs, see <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3958" target="_blank">bug 3958</a></li>
+  <li> RSS libraries now support <em>RSS 2.0 categories</em>, see  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3654" target="_blank">bug 3654</a></li>
+  <li> Better accesibilty in file uploads, see  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3662" target="_blank">bug 3662</a></li>
+  <li> Better support for site-wide HTTPS, see <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3848" target="_blank">bug 3848</a></li>
+  <li> We now send away bots (like Googlebot) from that try mangled URLs, see <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3958" target="_blank">bug 3958</a></li>
   <li> Better  <a href="http://moodle.org/mod/forum/discuss.php?d=29564" target="_blank">DST support for non-logged-in users</a></li>
   <li> Better  DST support for repeat events in Calendar</li>
   <li> Small fixes to the lesson, choice and grade modules</li>
@@ -66,21 +66,21 @@
   <ul type="circle">
   <li> Fixes to change password/forgotten password with external auth</li>
   <li> Data fetched from external DB or LDAP is now truncated correctly</li> 
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=4305" target="_blank">bug 4305</a> -- better login block behaviour when using secureforms</li>
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=4305" target="_blank">bug 4305</a> -- better login block behaviour when using secureforms</li>
   <li> Better support for utf-8 user data from external auth</li>
   <li> LDAP: General fixes covering sync_users script and logging of errors</li>
-  <li> LDAP: Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3141" target="_blank">bug 3141</a> - Can't update external data
+  <li> LDAP: Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3141" target="_blank">bug 3141</a> - Can't update external data
  with LDAP authentication</li>
 
-  <li> LDAP: Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3992" target="_blank">bug 3992</a> - LDAP password including a
+  <li> LDAP: Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3992" target="_blank">bug 3992</a> - LDAP password including a
  quote does not work - credits go to Kita</li>
   <li> LDAP: Better support for ActiveDirectory.</li> 
-  <li> LDAP: Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3594" target="_blank">bug #3594</a></li> 
+  <li> LDAP: Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3594" target="_blank">bug #3594</a></li> 
   <li> LDAP: Better handling of multi-source field mapping</li>
   <li> LDAP: Fix for using DN as idnumber - thanks fo Jeff Graham - <a href="http://moodle.org/mod/forum/discuss.php?d=28840" target="_blank">http://moodle.org/mod/forum/discuss.php?d=28840</a>
 </li>
 </ul>
-<h4>Enrolment & Metacourses</h4>
+<h4>Enrolment &amp; Metacourses</h4>
   <ul type="circle">
   <li> Metacourses: Prevent normal users to gain access to meta courses via manual enrolment</li>
   <li> Metacourses: better support for MySQL v3.23.x</li>
@@ -103,8 +103,8 @@
   <ul type="circle">
     <li> Big and small optimizations to tracking of read/unread messages, specially for PostgreSQL</li>
     <li> Fixed some PostgreSQL bugs</li>
-    <li> Some more actions are now supported by backup/restore when processing log records, see <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3852">bug 3582</a></li>
-    <li> Now message forum RSS feeds are including category data -- useful under some RSS agregators able to group messages, see <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3654" target="_blank">bug 3654</a></li>
+    <li> Some more actions are now supported by backup/restore when processing log records, see <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3852">bug 3582</a></li>
+    <li> Now message forum RSS feeds are including category data -- useful under some RSS agregators able to group messages, see <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3654" target="_blank">bug 3654</a></li>
     <li> Fixed paging on forum search</li>
 </ul>
 
@@ -113,8 +113,8 @@
   <li> Several performance improvements </li>
   <li> Fixes to the upgrade process, including PostgreSQL syntax and lower memory usage</li>
   <li> Brought in several bugfixes from 1.6dev</li>
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3478" target="_blank">bug 3478</a>: Cannot add RSS feed as course creator</li>
-<li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3793" target="_blank">bug 3793</a>:
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3478" target="_blank">bug 3478</a>: Cannot add RSS feed as course creator</li>
+<li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3793" target="_blank">bug 3793</a>:
   Prevent warning message when configuring a glossary_random block in
  a course which has no glossaries</li>
 
@@ -125,27 +125,27 @@
   <li> Some CSS style fixes</li>
   <li> Better compatibility with themes that contain forms in the headers</li>
   <li> Highlighting of correct answers can now be turned off</li>
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3986" target="_blank">bug 3986</a>: Too many random questions. 
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3986" target="_blank">bug 3986</a>: Too many random questions. 
   (mindforge)</li>
   <li> Fixed 
  <a href="http://moodle.org/mod/forum/discuss.php?d=28466#139179">missing action icons</a></li>
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3899" target="_blank">bug 3899</a> and removed some 'missing
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3899" target="_blank">bug 3899</a> and removed some 'missing
  course object' messages</li>
-  <li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3950" target="_blank">bug 3950</a>: Ee-attempt button inconsistency for multi-attempt quizzes</li>
+  <li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3950" target="_blank">bug 3950</a>: Ee-attempt button inconsistency for multi-attempt quizzes</li>
 
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3953" target="_blank">bug 3953</a>: Quiz/report.php pagesize can be set to 0, credits to Jean-Michel</li>
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3953" target="_blank">bug 3953</a>: Quiz/report.php pagesize can be set to 0, credits to Jean-Michel</li>
 
-  <li> Fixed potential data data corruption <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3915" target="_blank">bug 3915</a></li>
+  <li> Fixed potential data data corruption <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3915" target="_blank">bug 3915</a></li>
 
-  <li> Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3884" target="_blank">bug 3884</a>: Quiz correct highlights missing for 2 of 3 options.</li>
+  <li> Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3884" target="_blank">bug 3884</a>: Quiz correct highlights missing for 2 of 3 options.</li>
 
 
   <li> Fix for the <a href="http://moodle.org/mod/forum/discuss.php?d=26526">Student review highlight doesn't seem to work</a> bug</li>
 
 
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3804" target="_blank">bug 3804</a>: Differences in question types between 1.5 and 1.6</li>
- <li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3822" target="_blank">bug 3822</a>: don't count previews as attempts</li>
-  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3807" target="_blank">bug 3807</a>:  Question numbering issue</li>
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3804" target="_blank">bug 3804</a>: Differences in question types between 1.5 and 1.6</li>
+ <li>  Fixed  <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3822" target="_blank">bug 3822</a>: don't count previews as attempts</li>
+  <li> Fixed <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3807" target="_blank">bug 3807</a>:  Question numbering issue</li>
   <li> Fixes for the <a href="http://moodle.org/mod/forum/discuss.php?d=27553" target="_blank">item analysis
  plug-in</a>, assembled by Jean-Michel</li>
   <li> Now we reset the timeout counter to <a href="http://moodle.org/mod/forum/discuss.php?d=24790#129431" target="_blank">avoid timeouts</a></li>
@@ -164,7 +164,7 @@
 <h4>Wiki</h4>
   <ul type="circle">
   <li> Now paging of older versions is showed
- and working properly, see <a href="http://moodle.org/bugs/bug.php?op=show&bugid=3750" target="_blank">bug 3750</a></li>
+ and working properly, see <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=3750" target="_blank">bug 3750</a></li>
   
   </ul>
 
diff --git a/lang/en_utf8/docs/releaseold.html b/lang/en_utf8/docs/releaseold.html
index 2a0673b335..90246c0c9b 100644
--- a/lang/en_utf8/docs/releaseold.html
+++ b/lang/en_utf8/docs/releaseold.html
@@ -32,7 +32,7 @@
     <dd>
       <ul>
         <li>Preventative measures against attacks to admin functions.</li>
-    <li>Lesson: Safer hiding of lessons (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2733" target="_blank">#2733</a>)</li>  
+    <li>Lesson: Safer hiding of lessons (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2733" target="_blank">#2733</a>)</li>  
       </ul>
     </dd>
 
@@ -57,24 +57,24 @@
     <dd>
       <ul>
     <li>HTML Editor: Fixes to some character encoding problems.</li>
-    <li>Quiz: fixes to export/import dropdown (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2963" target="_blank">#2963</a>)</li> 
+    <li>Quiz: fixes to export/import dropdown (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2963" target="_blank">#2963</a>)</li> 
     <li>Quiz:  Don't throw a fatal error on unknown question, try to continue.</li> 
-    <li>Course Social Forum: Removed misleading link to unsubscribe (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2945" target="_blank">#2945</a>).</li>     
+    <li>Course Social Forum: Removed misleading link to unsubscribe (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2945" target="_blank">#2945</a>).</li>     
     <li>Additional/updated translations.</li> 
     <li>Forums and Groups: Allow students not in a group to post into a discussion which is also not in a group, even if the course is using groups.</li>
     <li>Sitewide HTML Editor settings: Fixed <a href="http://moodle.org/mod/forum/discuss.php?d=21359" target="_blank">Can't save changes in editor configuration</a> form bug.</li>
     <li>Cron: Removed some warnings.</li> 
-    <li>Choice: Choice shows a bad number of answers (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2452" target="_blank">#2452</a>).</li> 
-    <li>Better support for PHP5: Files uploads now use $_FILES rather than deprecated $HTTP_POST_FILES (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2828" target="_blank">#2828</a>)</li> 
+    <li>Choice: Choice shows a bad number of answers (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2452" target="_blank">#2452</a>).</li> 
+    <li>Better support for PHP5: Files uploads now use $_FILES rather than deprecated $HTTP_POST_FILES (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2828" target="_blank">#2828</a>)</li> 
     <li>Backup/Restore: Manual links from lesson pages to resources are now preserved between backup/restore anywhere. (see <a href="http://moodle.org/mod/forum/discuss.php?d=21044" target="_blank">this discussion</a>)</li> 
     <li>Some fixes for Postgres constraint naming.</li> 
-    <li>I18N support: Reset proper encoding    upon login (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2770" target="_blank">#2770</a>).</li> 
-    <li>I18N support: Fixed some instances of garbled characters when using utf-8 in HTML Editor (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2763" target="_blank">#2763</a>)</li> 
+    <li>I18N support: Reset proper encoding    upon login (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2770" target="_blank">#2770</a>).</li> 
+    <li>I18N support: Fixed some instances of garbled characters when using utf-8 in HTML Editor (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2763" target="_blank">#2763</a>)</li> 
     <li>Flash Media Player: Turn off the autoloading of sound files.</li> 
     <li>Flash Media Player: Better handling of filenames files.</li> 
-    <li>Postgres: Fixed sequences out of sequence (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2742" target="_blank">#2742</a>).</li>   
+    <li>Postgres: Fixed sequences out of sequence (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2742" target="_blank">#2742</a>).</li>   
     <li>Backup: Fixed memory limit overrun in backup config page.</li>  
-    <li>Forums: Fixed error warnings when a teacher posts to a forum (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2723" target="_blank">#2723</a>).</li>  
+    <li>Forums: Fixed error warnings when a teacher posts to a forum (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2723" target="_blank">#2723</a>).</li>  
       </ul>
     </dd>
 
@@ -122,28 +122,28 @@
     <dt>Other bug fixes</dt>
     <dd>
       <ul>
-    <li>Installer: Many fixes and updates from HEAD (including <a href="http://moodle.org/bugs/bug.php?op=show&bugid=2625" target="_blank">#2625</a>) .</li>
+    <li>Installer: Many fixes and updates from HEAD (including <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2625" target="_blank">#2625</a>) .</li>
     <li>Installer: We now check for allow_url_fopen() before trying to validate our own URL.</li>
 
         <li>Fixed some forum search problems.</li>
-    <li>Fixed sorting bug on forums (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2613" target="_blank">#2613</a>).</li>
+    <li>Fixed sorting bug on forums (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2613" target="_blank">#2613</a>).</li>
 
         <li>Fixed problems in user searches with trailing spaces.</li>
         <li>Fixed some instances of hardcoded /admin path.</li>
-    <li>Fixed some groups-related bugs (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2133" target="_blank">#2133</a>, <a href="http://moodle.org/bugs/bug.php?op=show&bugid=2550" target="_blank">#2550</a>, <a href="http://moodle.org/bugs/bug.php?op=show&bugid=2363" target="_blank">#2363</a>)</li>
+    <li>Fixed some groups-related bugs (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2133" target="_blank">#2133</a>, <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2550" target="_blank">#2550</a>, <a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2363" target="_blank">#2363</a>)</li>
     <li>Don't send HTML digests to people who want plain text email.</li>
 
     <li>SCORM module &mdash; fixed navbar error.</li>
 
         <li>Chat: Increased maximum socket read size to prevent  empty pages and repeated messages</li>
-    <li>Files: added a &quot;Parent Folder&quot; icon, (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2491" target="_blank">#2491</a>).</li>
+    <li>Files: added a &quot;Parent Folder&quot; icon, (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2491" target="_blank">#2491</a>).</li>
 
     <li>Postgres support: consistency fix in mdl_log table.</li>
 
     <li>Auth plugins: Better cleanup and truncation of data.</li>
     <li>Auth plugins: Fixed external authentication problem &mdash; if logged in as guest, logging in as external auth user fails if it is the first login ever for the account. </li>
     <li>Auth LDAP: Fixed a regression from 1.4.2 where a trailing semicolon in some config fields would break authentication.</li>
-        <li>Auth DB: Database Authentication not fetching user data fields correctly (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2319" target="_blank">#2319</a>).</li>
+        <li>Auth DB: Database Authentication not fetching user data fields correctly (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2319" target="_blank">#2319</a>).</li>
 
         <li>Paypal Enrolment plugin: Now text sent to PayPal can
       be 'sanitised' to avoid some diacritics (Spanish for now) which break the
@@ -151,18 +151,18 @@
       now by PayPal.  This functionality can be easily expanded to other
       characters. </li>
 
-    <li>Backup/restore: If the user isn't admin and the restored course hasn't teachers, add teacher (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2381" target="_blank">#2381</a>)</li>
+    <li>Backup/restore: If the user isn't admin and the restored course hasn't teachers, add teacher (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2381" target="_blank">#2381</a>)</li>
     <li>Backup/restore: Fixed errors with courses with apostrophes in the fullname.</li>
     <li>Backup/restore: Now group members are
       only included (backup and restore) if we have selected to have
-      users (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2486" target="_blank">#2486</a>).</li>
+      users (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2486" target="_blank">#2486</a>).</li>
     <li>Backup/Restore: General tidyup.</li>
 
-    <li>Glossary: Now 0 rates are supported in glossary (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2582" target="_blank">#2582</a>) and better PHP5 support (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2581" target="_blank">#2581</a>).</li>
-    <li>Glossary & Blackboard: import fixes (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2310" target="_blank">#2310</a>).</li>
+    <li>Glossary: Now 0 rates are supported in glossary (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2582" target="_blank">#2582</a>) and better PHP5 support (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2581" target="_blank">#2581</a>).</li>
+    <li>Glossary &amp; Blackboard: import fixes (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2310" target="_blank">#2310</a>).</li>
 
     <li>Calendar: more robust handling of bad data.</li>
-    <li>Calendar: HTML fixes in calendar (<a href="http://moodle.org/bugs/bug.php?op=show&bugid=2350" target="_blank">#2350</a>).</li>
+    <li>Calendar: HTML fixes in calendar (<a href="http://moodle.org/bugs/bug.php?op=show&amp;bugid=2350" target="_blank">#2350</a>).</li>
 
     <li>Course sortorder was broken in 1.4.3 and would sometimes prevent course creation &mdash; all the known problems with sortorder are now fixed. Includes some related fixes in get_categories() calls that would sometimes show up in &quot;My Courses&quot; listings.</li>
 
diff --git a/lang/en_utf8/enrol_authorize.php b/lang/en_utf8/enrol_authorize.php
index c8e9f13d23..ebde88a7ff 100644
--- a/lang/en_utf8/enrol_authorize.php
+++ b/lang/en_utf8/enrol_authorize.php
@@ -5,7 +5,7 @@
 $string['adminacceptccs'] = 'Which credit card types will be accepted?';
 $string['adminaccepts'] = 'Select payment methods allowed and their types';
 $string['adminauthcode'] = 'If an user\'s credit card cannot be captured on the internet directly, obtain authorization code over the phone from customer\'s bank.';
-$string['adminauthorizeccapture'] = 'Order Review & Scheduled-Capture Settings';
+$string['adminauthorizeccapture'] = 'Order Review &amp; Scheduled-Capture Settings';
 $string['adminauthorizeemail'] = 'Email Sending Settings';
 $string['adminauthorizesettings'] = 'Authorize.net Settings';
 $string['adminauthorizewide'] = 'Site-Wide Settings';
diff --git a/lang/en_utf8/help/assignment/index.html b/lang/en_utf8/help/assignment/index.html
index 3abd46fd05..7fbc211f10 100644
--- a/lang/en_utf8/help/assignment/index.html
+++ b/lang/en_utf8/help/assignment/index.html
@@ -1,4 +1,4 @@
-<p>Assignments</p>
+<h2>Assignments</h2>
 
 <ul>
 
diff --git a/lang/en_utf8/help/assignment/types.html b/lang/en_utf8/help/assignment/types.html
index d54f8578dd..d215adf6e3 100644
--- a/lang/en_utf8/help/assignment/types.html
+++ b/lang/en_utf8/help/assignment/types.html
@@ -2,26 +2,31 @@
 
 <p>There are a growing number of assignment types available:</p>
 
-<p><b>Offline activity</b></p><p>This is useful when the assignment
+<h2>Offline activity</h2>
+<p>This is useful when the assignment
 is performed outside of Moodle.  It could be something elsewhere on
-the web or face-to-face.</p><p>Students can see a description of the
+the web or face-to-face.</p> <p>Students can see a description of the
 assignment, but can't upload files or anything.  Grading works normally,
 and students will get notifications of their grades.</p>
-<hr size="1" />
+<hr />
 
-<p><b>Online text</b></p><p>This assignment type asks users to edit a
+<h2>Online text</h2>
+<p>This assignment type asks users to edit a
 text, using the normal editing tools.  Teachers can grade them online,
 and even add inline comments or changes.</p>
 <p>(If you are familiar with older versions of Moodle, this Assignment
 type does the same thing as the old Journal module used to do.)</p>
-<hr size="1" />
+<hr />
 
-<p><b>Upload a single file</b></p><p>This type of assignment allows each
+<h2>Upload a single file</h2>
+<p>This type of assignment allows each
 participant to upload a single file, of any type.</p> <p>This might be
 a Word processor document, or an image, a zipped web site, or anything
-you ask them to submit.</p><hr size="1" />
+you ask them to submit.</p>
+<hr />
 
-<p><b>Advanced uploading of files</b></p><p>This type of assignment allows
+<h2>Advanced uploading of files</h2>
+<p>This type of assignment allows
 each participant to upload one or more files in any format. These might be
 a Word processor documents, images, a zipped web site, or anything you
 ask them to submit.</p>
@@ -34,4 +39,4 @@ progress status or any other text information.</p>
 the participant. You can review the current status at any time,
 unfinished assignments are marked as Draft. You can revert any ungraded
 assignment back to draft status.</p>
-<hr size="1" />
+<hr />
diff --git a/lang/en_utf8/help/attendance/index.html b/lang/en_utf8/help/attendance/index.html
index ef024e1061..522e93a658 100644
--- a/lang/en_utf8/help/attendance/index.html
+++ b/lang/en_utf8/help/attendance/index.html
@@ -1,4 +1,4 @@
-<p>Attendance</p>
+<h2>Attendance</h2>
 
 <ul>
   <li><a href="help.php?module=attendance&amp;file=autoattend.html">Automatic Attendance Logging</a></li>
diff --git a/lang/en_utf8/help/blog/index.html b/lang/en_utf8/help/blog/index.html
index d66dea0b6e..91af5417c3 100644
--- a/lang/en_utf8/help/blog/index.html
+++ b/lang/en_utf8/help/blog/index.html
@@ -1,4 +1,4 @@
-<p>Blog</p>
+<h2>Blog</h2>
 
 <ul>
   <li><a href="help.php?module=blog&amp;file=publish_state.html">Publish to</a></li>
diff --git a/lang/en_utf8/help/chat/index.html b/lang/en_utf8/help/chat/index.html
index b9aeb82e22..a0772ddb14 100644
--- a/lang/en_utf8/help/chat/index.html
+++ b/lang/en_utf8/help/chat/index.html
@@ -1,4 +1,4 @@
-<p>Chat module</p>
+<h2>Chat module</h2>
 <ul>
   <li><a href="help.php?module=chat&amp;file=chatting.html">Using Chat</a></li>
 </ul>
diff --git a/lang/en_utf8/help/choice/index.html b/lang/en_utf8/help/choice/index.html
index c470b477a4..4bd645e8eb 100644
--- a/lang/en_utf8/help/choice/index.html
+++ b/lang/en_utf8/help/choice/index.html
@@ -1,4 +1,4 @@
-<p>Choices</p>
+<h2>Choices</h2>
 
 <ul>
   <li><a href="help.php?module=choice&amp;file=limit.html">Choice Limit</a></li>
diff --git a/lang/en_utf8/help/courseformats.html b/lang/en_utf8/help/courseformats.html
index f67da85553..4f6f2fc394 100644
--- a/lang/en_utf8/help/courseformats.html
+++ b/lang/en_utf8/help/courseformats.html
@@ -1,20 +1,20 @@
 <h1>Moodle course formats</h1>
 
-<p><b>Weekly format</b></p>
+<h2>Weekly format</h2>
 <ul>
 The course is organised week by week, with a clear start date and a finish date.
 Each week consists of activities.  Some of them, like assignments, may have 
 "open windows" of, say, two weeks after which they become unavailable.
 </ul>
 
-<p><b>Topics format</b></p>
+<h2>Topics format</h2>
 <ul>
 Very similar to the weekly format, except that each "week" is called a topic.
 A "topic" is not restricted to any time limit.  You don't need to specify any
 dates.
 </ul>
 
-<p><b>Social format</b></p>
+<h2>Social format</h2>
 <ul>
 This format is oriented around one main forum, the Social forum, which appears
 listed on the main page.  It is useful for situations that are more freeform.
diff --git a/lang/en_utf8/help/data/index.html b/lang/en_utf8/help/data/index.html
index 7ef3ce3b46..6d7990e8c5 100644
--- a/lang/en_utf8/help/data/index.html
+++ b/lang/en_utf8/help/data/index.html
@@ -1,4 +1,4 @@
-<p>Data</p>
+<h2>Data</h2>
 
 <ul>
 
diff --git a/lang/en_utf8/help/dialogue/index.html b/lang/en_utf8/help/dialogue/index.html
index c4d56bef21..618b36a596 100644
--- a/lang/en_utf8/help/dialogue/index.html
+++ b/lang/en_utf8/help/dialogue/index.html
@@ -1,4 +1,4 @@
-<p>Dialogues</p>
+<h2>Dialogues</h2>
 
 <ul>
   <li><a href="help.php?module=dialogue&amp;file=addsubject.html">Add Subject to a Dialogue</a></li> 
diff --git a/lang/en_utf8/help/emoticons.html b/lang/en_utf8/help/emoticons.html
index a793dde87c..5e3b1e4cd2 100644
--- a/lang/en_utf8/help/emoticons.html
+++ b/lang/en_utf8/help/emoticons.html
@@ -7,108 +7,111 @@
     <tr>
       <td><a href="javascript:inserttext(':-)')"><img src="pix/s/smiley.gif" class="icon" alt="" /></a></td>
       <td>smile</td>
-      <td><font face="courier">:-)</font></td>
+      <td><code>:-)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':-D')"><img src="pix/s/biggrin.gif" class="icon" alt="" /></a></td>
       <td>big grin</td>
-      <td><font face="courier">:-D</font></td>
+      <td><code>:-D</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(';-)')"><img src="pix/s/wink.gif" class="icon" alt="" /></a></td>
       <td>wink</td>
-      <td><font face="courier">;-)</font></td>
+      <td><code>;-)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':-/')"><img src="pix/s/mixed.gif" class="icon" alt="" /></a></td>
       <td>mixed</td>
-      <td><font face="courier">:-/</font></td>
+      <td><code>:-/</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('V-.')"><img src="pix/s/thoughtful.gif" class="icon" alt="" /></a></td>
       <td>thoughtful</td>
-      <td><font face="courier">V-.</font></td>
+      <td><code>V-.</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':-P')"><img src="pix/s/tongueout.gif" class="icon" alt="" /></a></td>
       <td>tongue out</td>
-      <td><font face="courier">:-P</font></td>
+      <td><code>:-P</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('B-)')"><img src="pix/s/cool.gif" class="icon" alt="" /></a></td>
       <td>cool</td>
-      <td><font face="courier">B-)</font></td>
+      <td><code>B-)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('^-)')"><img src="pix/s/approve.gif" class="icon" alt="" /></a></td>
       <td>approve</td>
-      <td><font face="courier">^-)</font></td>
+      <td><code>^-)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('8-)')"><img src="pix/s/wideeyes.gif" class="icon" alt="" /></a></td>
       <td>wide eyes</td>
-      <td><font face="courier">8-)</font></td>
+      <td><code>8-)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('8-o')"><img src="pix/s/surprise.gif" class="icon" alt="" /></a></td>
       <td>surprise</td>
-      <td><font face="courier">8-o</font></td>
+      <td><code>8-o</code></td>
     </tr>
     </table>
   </td>
+
   <td>
     <table border="0" align="center" cellpadding="5">
     <tr>
       <td><a href="javascript:inserttext(':-(')"><img src="pix/s/sad.gif" class="icon" alt="" /></a></td>
       <td>sad</td>
-      <td><font face="courier">:-(</font></td>
+      <td><code>:-(</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('8-.')"><img src="pix/s/shy.gif" class="icon" alt="" /></a></td>
       <td>shy</td>
-      <td><font face="courier">8-.</font></td>
+      <td><code>8-.</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':-I')"><img src="pix/s/blush.gif" class="icon" alt="" /></a></td>
       <td>blush</td>
-      <td><font face="courier">:-I</font></td>
+      <td><code>:-I</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':-X')"><img src="pix/s/kiss.gif" class="icon" alt="" /></a></td>
       <td>kisses</td>
-      <td><font face="courier">:-X</font></td>
+      <td><code>:-X</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext(':o)')"><img src="pix/s/clown.gif" class="icon" alt="" /></a></td>
       <td>clown</td>
-      <td><font face="courier">:o)</font></td>
+      <td><code>:o)</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('P-|')"><img src="pix/s/blackeye.gif" class="icon" alt="" /></a></td>
       <td>black eye</td>
-      <td><font face="courier">P-|</font></td>
+      <td><code>P-|</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('8-[')"><img src="pix/s/angry.gif" class="icon" alt="" /></a></td>
       <td>angry</td>
-      <td><font face="courier">8-[</font></td>
+      <td><code>8-[</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('xx-P')"><img src="pix/s/dead.gif" class="icon" alt="" /></a></td>
       <td>dead</td>
-      <td><font face="courier">xx-P</font></td>
+      <td><code>xx-P</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('|-.')"><img src="pix/s/sleepy.gif" class="icon" alt="" /></a></td>
       <td>sleepy</td>
-      <td><font face="courier">|-.</font></td>
+      <td><code>|-.</code></td>
     </tr>
     <tr>
       <td><a href="javascript:inserttext('}-]')"><img src="pix/s/evil.gif" class="icon" alt="" /></a></td>
       <td>evil</td>
-      <td><font face="courier">}-]</font></td>
+      <td><code>}-]</code></td>
     </tr>
     </table>
+    </td>
+  </tr>
 </table>
 
 <p>When writing online, it can sometimes difficult to express emotion with plain text.
diff --git a/lang/en_utf8/help/exercise/grading.html b/lang/en_utf8/help/exercise/grading.html
index c085fa6c68..a80747af51 100644
--- a/lang/en_utf8/help/exercise/grading.html
+++ b/lang/en_utf8/help/exercise/grading.html
@@ -5,7 +5,7 @@
     exercise by the two groups, thus the explanation given here is divided into
     two parts.</p>
 
-<p><b>For Students</b></p>
+<h2>For Students</h2>
 
 <p>The assessment form is used mainly to show you how your work will be
     assessed by the teacher. You are required to complete this form <b>before</b>
@@ -32,7 +32,7 @@
     and their comments. Their grade will normally form the main part of the
     final grade you receive from this Exercise.</p>
 
-<p><b>For the Teacher</b></p>
+<h2>For the Teacher</h2>
 
 <p>The assessment form is used to grade the submissions of the students.
     These grades normally form the major component of the students' final grade
diff --git a/lang/en_utf8/help/exercise/index.html b/lang/en_utf8/help/exercise/index.html
index 823960c9c7..493c93b045 100644
--- a/lang/en_utf8/help/exercise/index.html
+++ b/lang/en_utf8/help/exercise/index.html
@@ -1,4 +1,4 @@
-<p>Exercises</p>
+<h2>Exercises</h2>
 <ul>
   <li><a href="help.php?module=exercise&amp;file=administration.html">Administration Page</a></li>
   <li><a href="help.php?module=exercise&amp;file=elements.html">Assessment Elements</a></li>
diff --git a/lang/en_utf8/help/filters.html b/lang/en_utf8/help/filters.html
index aae6206e5f..db988d4f07 100644
--- a/lang/en_utf8/help/filters.html
+++ b/lang/en_utf8/help/filters.html
@@ -14,7 +14,7 @@
    If you have more that one unhidden you can change the order in which they
    are applied with the up and down arrows.</p> 
    
-<p><b>TeX notation</b></p>
+<h2>TeX notation</h2>
 
 <div class="indent">
   <p>TeX notation is primarily used to generate inline mathematical formulae
@@ -29,14 +29,14 @@
   called MikTeX available also.</p>
   <p>The settings page allows the LaTeX and Ghostscript binary paths to be
   configured, along with the LaTeX preamble.</p>
-  <p><b>More info</b></p>
+  <h3>More info</h3>
   <p><a href="http://www.miktex.org/">MiKTeX</a><br />
      <a href="http://www.forkosh.com/mimetex.html">MimeTeX</a><br />
      <a href="http://www.latex-project.org/">LaTeX</a><br />
      <a href="http://www.ghostscript.com/">ghostscript</a></p>
 </div>
 
-<p><b>Word Censorship</b></p>
+<h2>Word Censorship</h2>
 
 <div class="indent">
   <p>Word Censorship scans text for 'bad words' from a pre-defined list. 
@@ -46,7 +46,7 @@
   mousing over will pop up the original word.</p>
 </div>
 
-<p><b>Resource Names Auto-Linking</b></p>
+<h2>Resource Names Auto-Linking</h2>
 
 <div class="indent">
   <p>Resource Name Auto-linking scans text for resource titles that
@@ -56,7 +56,7 @@
   'Introduction' in the text will be linked regardless of what it refers to.</p>
 </div>
 
-<p><b>Activity Names Auto-Linking</b></p>
+<h2>Activity Names Auto-Linking</h2>
 
 <div class="indent">
   <p>Activity Name Auto-linking scans text for activity titles that
@@ -66,7 +66,7 @@
   'Quiz' in the text will be linked regardless of what it refers to.</p>
 </div>
 
-<p><b>Glossary Auto-Linking</b></p>
+<h2>Glossary Auto-Linking</h2>
 
 <div class="indent">
   <p>This filter scans the text for keywords used in any glossary in the course. Note,
@@ -75,7 +75,7 @@
   </p>
 </div>
 
-<p><b>Email Protection</b></p>
+<h2>Email Protection</h2>
 
 <div class="indent">
   <p>The Email Protection filter scans the text for any email addresses. Where found
@@ -84,7 +84,7 @@
   are open.</p>
 </div>
 
-<p><b>Tidy</b></p>
+<h2>Tidy</h2>
 
 <div class="indent">
   <p>Tidy scans text for HTML constructs. Where found it applies rules that attempt
@@ -92,7 +92,7 @@
   PHP installation for this to work.</p>
 </div>
 
-<p><b>Multi-Language Content</b></p>
+<h2>Multi-Language Content</h2>
 
 <div class="indent">
   <p>This filter enables resources to be created in multiple languages. The resource
diff --git a/lang/en_utf8/help/forum/forumtype.html b/lang/en_utf8/help/forum/forumtype.html
index 5400a15513..a37b487edd 100644
--- a/lang/en_utf8/help/forum/forumtype.html
+++ b/lang/en_utf8/help/forum/forumtype.html
@@ -13,7 +13,7 @@ new discussion topic (everyone can reply to them though).  This is useful when
 you want each student to start a discussion about, say, their reflections on 
 the week's topic, and everyone else responds to these.</p>
 
-<p><b>Q And A Forum</b> - The Q & A forum requires students to post their 
+<p><b>Q And A Forum</b> - The Q &amp; A forum requires students to post their 
 perspectives before viewing other students' postings. After the initial posting,
  students can view and respond to others' postings. This feature allows equal 
 initial posting opportunity among all students, thus encouraging original and 
diff --git a/lang/en_utf8/help/forum/index.html b/lang/en_utf8/help/forum/index.html
index 13208821f9..9de6ccb5b5 100644
--- a/lang/en_utf8/help/forum/index.html
+++ b/lang/en_utf8/help/forum/index.html
@@ -1,4 +1,4 @@
-<p>Forums</p>
+<h2>Forums</h2>
 <ul>
   <li><a href="help.php?module=forum&amp;file=allowdiscussions.html">Allow discussions</a></li>
   <li><a href="help.php?module=forum&amp;file=attachment.html">Attachment</a></li>
diff --git a/lang/en_utf8/help/glossary/index.html b/lang/en_utf8/help/glossary/index.html
index 510096a7b5..7a133e8c6a 100644
--- a/lang/en_utf8/help/glossary/index.html
+++ b/lang/en_utf8/help/glossary/index.html
@@ -1,7 +1,8 @@
-<p>Glossary</p>
+<h2>Glossary</h2>
+
+<ul class="unlist">
+<li><h3>Glossary level help files</h3>
 
-<blockquote>
-Glossary level help files:
 <ul>
   <li><a href="help.php?module=glossary&amp;file=allowprintview.html">Allow Print View</a></li>
   <li><a href="help.php?module=glossary&amp;file=defaultapproval.html">Approval of entries</a></li>
@@ -24,14 +25,16 @@ Glossary level help files:
   <li><a href="help.php?module=glossary&amp;file=rsstype.html">RSS feed for this glossary</a></li>
   <li><a href="help.php?module=glossary&amp;file=rssarticles.html">Number of RSS recent articles</a></li>
 </ul>
-</blockquote>
 
-<blockquote>
-Entry level help files:
+</li>
+<li><h3>Entry level help files</h3>
+
 <ul>
   <li><a href="help.php?module=glossary&amp;file=usedynalinkentry.html">Enabling automatic linking in a entry</a></li>
   <li><a href="help.php?module=glossary&amp;file=aliases2.html">Keywords / Aliases</a></li>
   <li><a href="help.php?module=glossary&amp;file=casesensitive.html">Case sensitive auto-linking</a></li>
   <li><a href="help.php?module=glossary&amp;file=fullmatch.html">Whole words auto-linking</a></li>
 </ul>
-</blockquote>
+
+</li>
+</ul>
diff --git a/lang/en_utf8/help/grade/index.html b/lang/en_utf8/help/grade/index.html
index f4f689bd80..091bde856d 100644
--- a/lang/en_utf8/help/grade/index.html
+++ b/lang/en_utf8/help/grade/index.html
@@ -1,4 +1,4 @@
-<p>Grade</p>
+<h2>Grade</h2>
 <ul>
   <li><a href="help.php?module=grade&amp;file=category.html">Category</a></li>
   <li><a href="help.php?module=grade&amp;file=exceptions.html">Exceptions</a></li>
diff --git a/lang/en_utf8/help/groupmode.html b/lang/en_utf8/help/groupmode.html
index 33de66ae37..b32777f024 100644
--- a/lang/en_utf8/help/groupmode.html
+++ b/lang/en_utf8/help/groupmode.html
@@ -1,21 +1,20 @@
 <h1>Group Mode</h1>
 
-<p>The group mode can be one of three levels:
-   <ul>
-      <li>No groups - there are no sub groups, everyone is part of one big community</li>
-      <li>Separate groups - each group can only see their own group, others are invisible</li>
-      <li>Visible groups - each group works in their own group, but can also see other groups</li>
-   </ul>
-</p>
+<p>The group mode can be one of three levels:</p>
+<ul>
+    <li>No groups - there are no sub groups, everyone is part of one big community</li>
+    <li>Separate groups - each group can only see their own group, others are invisible</li>
+    <li>Visible groups - each group works in their own group, but can also see other groups</li>
+</ul>
 
 <p>The group mode can be defined at two levels:</p>
 
 <dl>
    <dt><b>1. Course level</b></dt>
-   <dd>The group mode defined at the course level is the default mode 
-       for all activities defined within that course<br /><br /></dd>
+   <dd><p>The group mode defined at the course level is the default mode 
+       for all activities defined within that course</p></dd>
    <dt><b>2. Activity level</b></dt>
-   <dd>Each activity that supports groups can also define its own 
-       grouping mode.  If the course is set to "<a href="help.php?module=moodle&file=groupmodeforce.html">force group mode</a>" then 
-       the setting for each activity is ignored.</dd>
+   <dd><p>Each activity that supports groups can also define its own 
+       grouping mode.  If the course is set to "<a href="help.php?module=moodle&amp;file=groupmodeforce.html">force group mode</a>" then 
+       the setting for each activity is ignored.</p></dd>
 </dl>
diff --git a/lang/en_utf8/help/hotpot/index.html b/lang/en_utf8/help/hotpot/index.html
index bc93c35c79..1716faaff5 100644
--- a/lang/en_utf8/help/hotpot/index.html
+++ b/lang/en_utf8/help/hotpot/index.html
@@ -1,4 +1,4 @@
-<p>Hot Potatoes</p>
+<h2>Hot Potatoes</h2>
 <ul>
     <li><a href="help.php?module=hotpot&amp;file=addquizchain.html">Add quiz chain</a></li>
     <li><a href="help.php?module=hotpot&amp;file=analysistable.html">Analysis table</a></li>
diff --git a/lang/en_utf8/help/hotpot/mediaplayers.html b/lang/en_utf8/help/hotpot/mediaplayers.html
index 5651dcdf90..e03a3ade96 100644
--- a/lang/en_utf8/help/hotpot/mediaplayers.html
+++ b/lang/en_utf8/help/hotpot/mediaplayers.html
@@ -1,6 +1,6 @@
 <h1>Relative URLs, media players and Hot Potatoes</h1>
 
-<p><b>Definitions</b></p>
+<h2>Definitions</h2>
 
 <div class="indent">
     <p><i>URL</i><br />
@@ -19,10 +19,10 @@
     </p>
 </div>
 
-<p><b>Relative URLs in Hot Potatoes quizzes</b></p>
+<h2>Relative URLs in Hot Potatoes quizzes</h2>
 <p>Relative URLs are a convenient way to specify images, sounds and videos in a Hot Potatoes quiz, because they allow the quiz to be viewed and tested on a local PC, before being uploaded to a Moodle site. When the quiz is uploaded to the Moodle site, the multimedia files must also be uploaded, so that they are available when the quiz is administered via Moodle.</p>
 <p>For security reasons, Moodle does not allow direct access to course files. All requests for files in a given course go through a guardian script which verfies that the person requesting the file is enrolled in the course. However, this mechanism can break  relative links used in the quiz, because the normal rules for deriving an absolute URL from a relative URL do not work.</p>
 <p>The solution is simple enough: <font color="red"><b>all relative URLs must be converted to absolute URLs </b></font> by the time the quiz reaches the browser. In the case of Hot Potatoes quizzes, the URLs will be converted by Moodle, so content creators do not have to bother with this tedious and error-prone task. </p>
 
-<p><b>Media players in Hot Potatoes quizzes </b></p>
+<h2>Media players in Hot Potatoes quizzes </h2>
 <p>Some media players will not accept the media file if it comes via the script which guards the course files. In this situation, it is necessary to replace the media player with one that is known to be compatible with Moodle. You can do this yourself by modifying the reference to the media player in the quiz, or you can force Moodle to do it by setting the &quot;Force media plugins&quot; option on the quiz's settings page to &quot;Yes&quot;.</p>
diff --git a/lang/en_utf8/help/hotpot/reportcontent.html b/lang/en_utf8/help/hotpot/reportcontent.html
index b68d72a51b..dbe3cb6be8 100644
--- a/lang/en_utf8/help/hotpot/reportcontent.html
+++ b/lang/en_utf8/help/hotpot/reportcontent.html
@@ -1,7 +1,7 @@
 <h1>Report Content</h1>
 <p>You can specify different content for the Hot Potatoes reports.</p>
 
-<p><b>Selecting the type of report</b></p>
+<h2>Selecting the type of report</h2>
 <div class="indent">
     <p>
         <b>Overview</b><br />
@@ -31,10 +31,10 @@
         The report contains the following tables:
     </p>
     <ul>
-        <li>the <a href="help.php?module=hotpot&file=responsestable.html">responses table</a>, 
+        <li>the <a href="help.php?module=hotpot&amp;file=responsestable.html">responses table</a>, 
         which shows how each user responded to each question in each of their attempts at the quiz.</li>
 
-        <li>the <a href="help.php?module=hotpot&file=analysistable.html">item analysis table</a>, 
+        <li>the <a href="help.php?module=hotpot&amp;file=analysistable.html">item analysis table</a>, 
         which lists the responses to each question and the frequency of each response.</li>
     </ul>
     <p>
@@ -46,17 +46,17 @@
         program, such as Microsoft Excel.
 
         Details of the columns in this report are available in the 
-        <a href="help.php?module=hotpot&file=clickreporttable.html">click trail table</a>
+        <a href="help.php?module=hotpot&amp;file=clickreporttable.html">click trail table</a>
         help file.
     </p>
     <p>
         The click trail report is only available if 
-        <a href="help.php?module=hotpot&file=clickreporting.html">click reporting</a> 
+        <a href="help.php?module=hotpot&amp;file=clickreporting.html">click reporting</a> 
         has been enabled for this HotPot activity.
     </p>
 </div>
 
-<p><b>Selecting users</b></p>
+<h2>Selecting users</h2>
 <div class="indent">
     <p>
         <b>All users</b><br />
@@ -88,7 +88,7 @@
     </p>
 </div>
 
-<p><b>Selecting grades</b></p>
+<h2>Selecting grades</h2>
 <div class="indent">
     <p>
         <b>All attempts</b><br />
@@ -106,4 +106,4 @@
         <b>Last attempt</b><br />
         The report will only include the responses from the most recent attempt by each user.
     </p>
-</div>
+</div>
\ No newline at end of file
diff --git a/lang/en_utf8/help/hotpot/reportformat.html b/lang/en_utf8/help/hotpot/reportformat.html
index 1ec4338d02..bd4a36fdcb 100644
--- a/lang/en_utf8/help/hotpot/reportformat.html
+++ b/lang/en_utf8/help/hotpot/reportformat.html
@@ -3,7 +3,7 @@
     You can specify different output formats for the Hot Potatoes reports.
 </p>
 
-<p><b>Report Format</b></p>
+<h2>Report Format</h2>
 <div class="indent">
     <p>
         <b>HTML</b><br />
@@ -20,7 +20,7 @@
     </p>
 </div>
 
-<p><b>Encoding</b></p>
+<h2>Encoding</h2>
 <div class="indent">
     <p>
         A list of encodings may be offered which allows you to force the report values 
@@ -33,7 +33,7 @@
     </p>
 </div>
 
-<p><b>Wrap data</b></p>
+<h2>Wrap data</h2>
 <div class="indent">
     <p>
         <b>Yes</b><br />
@@ -46,7 +46,7 @@
     </p>
 </div>
 
-<p><b>Show legend</b></p>
+<h2>Show legend</h2>
 <div class="indent">
     <p>
         <b>Yes</b><br />
diff --git a/lang/en_utf8/help/index.html b/lang/en_utf8/help/index.html
index 7dc521637e..612fa99e88 100644
--- a/lang/en_utf8/help/index.html
+++ b/lang/en_utf8/help/index.html
@@ -1,7 +1,7 @@
 
-<p><b>Index of Help files</b></p>
+<h1>Index of Help files</h1>
 
-<p>General</p>
+<h2>General</h2>
 <ul>
   <li><a href="help.php?file=accessibility.html">Accessibility</a></li>
   <li><a href="help.php?file=cookies.html">Cookies</a></li>
@@ -9,7 +9,7 @@
   <li><a href="help.php?file=search.html">How to search</a></li>
 </ul>
 
-<p>Roles</p>
+<h2>Roles</h2>
 <ul>
   <li><a href="help.php?file=roles.html">Roles</a></li>
   <li><a href="help.php?file=contexts.html">Contexts</a></li>
@@ -18,7 +18,7 @@
   <li><a href="help.php?file=overrides.html">Overrides</a></li>
 </ul>
 
-<p>Administration</p>
+<h2>Administration</h2>
 <ul>
   <li><a href="help.php?file=advancedsettings.html">Advanced settings</a></li>
   <li><a href="help.php?file=authchange.html">Changing authentication method</a></li>
@@ -30,7 +30,7 @@
   <li><a href="help.php?file=uploadusers.html">Upload users</a></li>
 </ul>
 
-<p>Setting up courses</p>
+<h2>Setting up courses</h2>
 <ul>
 
   <li><a href="help.php?file=mods.html">Activity Modules</a></li>
@@ -67,7 +67,7 @@
   <li><a href="help.php?file=participationreport.html">Participation report</a></li>
 </ul>
 
-<p>Reading and Writing</p>
+<h2>Reading and Writing</h2>
 <ul>
   <li><a href="help.php?file=advanced_markdown.html">Advanced Use of Markdown</a></li>
   <li><a href="help.php?file=questions.html">Asking Questions</a></li>
diff --git a/lang/en_utf8/help/install.html b/lang/en_utf8/help/install.html
index 0ff1f86101..f0c8696641 100644
--- a/lang/en_utf8/help/install.html
+++ b/lang/en_utf8/help/install.html
@@ -1,12 +1,12 @@
 <h1>Installing Moodle</h1>
-<h2>Don't panic! <img src="http://moodle.org/pix/s/smiley.gif" alt="don't panic!" /></h2>
+<h2>Don't panic! <img src="http://moodle.org/pix/s/smiley.gif" alt="" /></h2>
 <blockquote>
   <p>This guide explains how to install Moodle for the first time.  For some of these steps it goes into a lot of detail to try and cover the majority of possible
      web server setups, so this document may look long and complicated.  Don't panic, once you know how to do it you can install Moodle in minutes!</p>
   <p>If you have problems please read this document carefully - most common issues are answered in here.
      If you still have trouble, you can seek help from 
-   <a href="http://moodle.org/help">Moodle Help</a></p>
-  <p>Another option is to contact a <a href="http://moodle.com/hosting/">web hosting company</a>
+   <a target="_blank" href="http://moodle.org/help">Moodle Help</a></p>
+  <p>Another option is to contact a <a target="_blank" href="http://moodle.com/hosting/">web hosting company</a>
      who can completely maintain Moodle for you, so that you can ignore all this and get straight into educating!
 </p>
   <p>&nbsp;  </p>
@@ -34,13 +34,13 @@
     and on Windows XP, Mac OS X and Netware 6 operating systems</p>
   <p>The requirements for Moodle are as follows:</p>
   <ol>
-    <li>Web server software. Most people use <a href="http://www.apache.org/" >Apache</a>, 
+    <li>Web server software. Most people use <a href="http://www.apache.org/" target="_blank">Apache</a>, 
       but Moodle should work fine under any web server that supports PHP, such 
       as IIS on Windows platforms.</li>
-    <li><a href="http://www.php.net/">PHP</a> scripting language (version 4.1.0 
+    <li><a href="http://www.php.net/" target="_blank">PHP</a> scripting language (version 4.1.0 
       or later). PHP 5 is supported as of Moodle 1.4. </li>
-    <li>a working database server: <a href="http://www.mysql.com/">MySQL</a> 
-      or <a href="http://www.postgresql.org/">PostgreSQL</a> are 
+    <li>a working database server: <a href="http://www.mysql.com/" target="_blank">MySQL</a> 
+      or <a href="http://www.postgresql.org/" target="_blank">PostgreSQL</a> are 
       completely supported and recommended for use with Moodle. </li>
   </ol>
   <p>Most web hosts support all of this by default. If you are signed up with 
@@ -53,7 +53,7 @@
 <h3 class="sectionheading"><a name="downloading"></a>2. Download and copy files into place </h3>
 <blockquote>
   <p>There are two ways to get Moodle, as a compressed package and via CVS. These 
-    are explained in detail on the download page: <a href="http://moodle.org/download/">http://moodle.org/download/</a></p>
+    are explained in detail on the download page: <a href="http://moodle.org/download/" target="_blank">http://moodle.org/download/</a></p>
   <p>After downloading and unpacking the archive, or checking out the files via 
     CVS, you will be left with a directory called &quot;moodle&quot;, containing 
     a number of files and folders.</p>
@@ -70,7 +70,7 @@
     you oriented:</p>
   <blockquote>
     <table><tr>
-      <td valign="top">config.php</td>
+      <td width="130" valign="top">config.php</td>
       <td valign="top">-</td>
       <td valign="top">
         contains basic settings. This file does not come with Moodle - you will create it. </td>
@@ -264,10 +264,10 @@ php_value post_max_size 2M
       unsigned NOT NULL default '0', enddate int(10) unsigned NOT NULL default 
       '0', timemodified int(10) unsigned NOT NULL default '0', PRIMARY KEY (id)) 
       TYPE=MyISAM</p>
-    <p style="color: #006600">SUCCESS</p>
+    <p><font color="#006600">SUCCESS</font></p>
   </blockquote>
-  <p>...and so on, followed by: <span style="color: #006600">Main databases set up 
-      successfully.</span> </p>
+  <p>...and so on, followed by: <font color="#006600">Main databases set up 
+      successfully.</font> </p>
   <blockquote>
     <p class="style3">If you don't see these, then there must have been some problem with the database 
         or the configuration settings you defined in config.php. Check that PHP isn't 
@@ -288,7 +288,7 @@ php_value post_max_size 2M
       This is easy to fix: just turn off the &quot;secureforms&quot; setting, then 
       try to continue again.</p>
   </blockquote>
-  <p>Next you will see more  pages that print lots of status messages as they set up all the tables required by the various Moodle module. As before, they should all be <span style="color:#006600">green</span>.</p>
+  <p>Next you will see more  pages that print lots of status messages as they set up all the tables required by the various Moodle module. As before, they should all be <font color="#006600">green</font>.</p>
   <p>Scroll down the very bottom of the page and press the &quot;Continue&quot; link.</p>
   <p>The next page is a form where you can define parameters for your Moodle site 
     and the front page, such as the name, format, description and so on. Fill 
@@ -330,6 +330,7 @@ php_value post_max_size 2M
   <p>But you are not done installing yet! There is one very important thing still to do (see the next section on cron). </p>
 </blockquote>
 <p>&nbsp;</p>
+
 <h3 class="sectionheading"><a name="cron"></a>6. Set up cron -- IMPORTANT! </h3>
 <blockquote> 
   <p>Some of Moodle's modules require continual checks to perform tasks. For example, 
@@ -355,14 +356,16 @@ php_value post_max_size 2M
   </blockquote>
   <p>Now, you need to set up some of way of running the script automatically and 
     regularly.</p>
-  <p><b>On Windows systems</b></p>
+
+  <h4>On Windows systems</h4>
   <blockquote>
-    <p>The simplest way is to use this little package <a href="http://moodle.org/download/modules/moodle-cron-for-windows.zip" title="Click to download this package (150k)"><strong>moodle-cron-for-windows.zip</strong></a> which makes this whole thing very easy by installing a small Windows service. Run it and forget about it!</p>
+    <p>The simplest way is to use this little package <a href="http://moodle.org/download/modules/moodle-cron-for-windows.zip" title="Click to download this package (150k)" target="_blank"><strong>moodle-cron-for-windows.zip</strong></a> which makes this whole thing very easy by installing a small Windows service. Run it and forget about it!</p>
   </blockquote>
   <p><strong>On web hosting services</strong></p>
   <blockquote>
     <p> Your web-based control panel may have a web page that allows you to set up this cron process. For example, on Cpanel system, look for a button called &quot;Cron jobs&quot;. In there you can put the same sort of Unix commands as listed below. </p>
   </blockquote>
+
   <h4> Using the command line on Unix </h4>
   <blockquote>
     <p>There are different command line programs you can use to call the page from the command line. Not all of them may be available on a given server.</p>
@@ -385,6 +388,7 @@ php_value post_max_size 2M
     </pre>
     </blockquote>
   </blockquote>
+
   <h4>Using the crontab program on Unix </h4>
   <blockquote>
     <p> All that Cpanel does is provide a web interface to a Unix utility known as crontab. If you have a command line, you can set up crontab yourself using the command:</p>
@@ -401,6 +405,7 @@ php_value post_max_size 2M
   </blockquote>
   <p>&nbsp;</p>
 </blockquote>
+
 <h3 class="sectionheading"><a name="course"></a>7. Create a new course</h3>
 <blockquote>
   <p>Now that Moodle is running properly, you can try creating a new course to play with. </p>
@@ -419,6 +424,6 @@ php_value post_max_size 2M
   <p>See the &quot;<a href="http://docs.moodle.org/en/Teacher_documentation">Teacher Documentation</a>&quot; for more details 
     on course-building.</p>
   <p>&nbsp;</p>
-  <p style="text-align:center"><strong>Happy exploring and happy Moodling!</strong></p>
-  <p style="test-align:center"><strong>If you like Moodle, please consider <a href="http://moodle.org/donations/">donating</a> to help us cover our costs! </strong></p>
+  <p align="center"><strong>Happy exploring and happy Moodling!</strong></p>
+  <p align="center"><strong>If you like Moodle, please consider <a href="http://moodle.org/donations/" target="_blank">donating</a> to help us cover our costs! </strong></p>
 </blockquote>
diff --git a/lang/en_utf8/help/lesson/import.html b/lang/en_utf8/help/lesson/import.html
index e3f1fb4f3b..bc10351ca7 100644
--- a/lang/en_utf8/help/lesson/import.html
+++ b/lang/en_utf8/help/lesson/import.html
@@ -5,7 +5,7 @@
 
 <p>A number of file formats are supported:</p>
 
-<p><b>GIFT format</b></p>
+<h2>GIFT format</h2>
 <ul>
 <p>GIFT is the most comprehensive import format available for importing 
    Moodle quiz questions from a text file.  It was designed to be an easy 
@@ -26,10 +26,10 @@ Who's buried in Grant's tomb?{=no one =nobody}
 When was Ulysses S. Grant born?{#1822}
 </pre>
 
-<p align="right"><a href="help.php?file=formatgift.html&module=quiz">More info about the "GIFT" format</a></p>
+<p align="right"><a href="help.php?file=formatgift.html&amp;module=quiz">More info about the "GIFT" format</a></p>
 </ul>
 
-<p><b>Aiken format</b></p>
+<h2>Aiken format</h2>
 <ul>
 <p>The Aiken format is a very simple way of creating multiple choice questions using a very clear human-readable format. Here is an example of the format:</p>
 <pre>
@@ -41,11 +41,11 @@ D. To aid victims who may be seeking help
 ANSWER: A
 </pre>
 
-<p align="right"><a href="help.php?file=formataiken.html&module=quiz">More info about the "Aiken" format</a></p>
+<p align="right"><a href="help.php?file=formataiken.html&amp;module=quiz">More info about the "Aiken" format</a></p>
 </ul>
 
 
-<p><b>Missing Word</b></p>
+<h2>Missing Word</h2>
 <ul>
 <p>This format only supports multiple choice questions.
 Each answer is separated with a tilde (~), and the correct answer is 
@@ -56,11 +56,11 @@ we become students of {=anatomy and physiology ~reflexology
 ~science ~experiment}, and in a sense we remain students for life.
 </blockquote>
 
-<p align="right"><a href="help.php?file=formatmissingword.html&module=quiz">More info about the "Missing Word" format</a></p>
+<p align="right"><a href="help.php?file=formatmissingword.html&amp;module=quiz">More info about the "Missing Word" format</a></p>
 </ul>
 
 
-<p><b>AON</b></p>
+<h2>AON</h2>
 <ul>
 <p>This is the same as Missing Word Format, except that after importing 
    the questions all Short-Answer questions are converted four at a time
@@ -72,15 +72,15 @@ we become students of {=anatomy and physiology ~reflexology
 </ul>
 
 
-<p><b>Blackboard</b></p>
+<h2>Blackboard</h2>
 <ul>
 <p>This module can import questions saved in Blackboard's export 
 format.  It relies on XML functions being compiled into your PHP.</p>
 
-<p align="right"><a href="help.php?file=formatblackboard.html&module=quiz">More info about the "Blackboard" format</a></p>
+<p align="right"><a href="help.php?file=formatblackboard.html&amp;module=quiz">More info about the "Blackboard" format</a></p>
 </ul>
 
-<p><b>Course Test Manager</b></p>
+<h2>Course Test Manager</h2>
 <ul>
 <p>This module can import questions saved in a Course Test Manager test bank.
 It relies on different ways of accessing the test bank, which is in a Microsoft Access 
@@ -94,10 +94,10 @@ to transfer data to moodle on the Linux server.</p>
 using this import class.</p>
 
 
-<p align="right"><a href="help.php?file=formatctm.html&module=quiz">More info about the "CTM" format</a></p>
+<p align="right"><a href="help.php?file=formatctm.html&amp;module=quiz">More info about the "CTM" format</a></p>
 </ul>
 
-<p><b>Custom</b></p>
+<h2>Custom</h2>
 <ul>
 <p>If you have your own format that you need to import, you can 
    implement it yourself by editing mod/quiz/format/custom.php</p>
@@ -105,7 +105,7 @@ using this import class.</p>
 <p>The amount of new code needed is quite small - just enough
    to parse a single question from given text.</p>
 
-<p align="right"><a href="help.php?file=formatcustom.html&module=quiz">More info about the "Custom" format</a></p>
+<p align="right"><a href="help.php?file=formatcustom.html&amp;module=quiz">More info about the "Custom" format</a></p>
 </ul>
 
 
diff --git a/lang/en_utf8/help/lesson/index.html b/lang/en_utf8/help/lesson/index.html
index 1bb64d7d41..cc39148c9e 100644
--- a/lang/en_utf8/help/lesson/index.html
+++ b/lang/en_utf8/help/lesson/index.html
@@ -1,4 +1,4 @@
-<p>Lessons</p>
+<h2>Lessons</h2>
 
 <ul>
 <li> <a href="help.php?module=lesson&amp;file=activitylink.html">Activity Link</a></li>
diff --git a/lang/en_utf8/help/quiz/analysisdownload.html b/lang/en_utf8/help/quiz/analysisdownload.html
index a5d5a54fa2..c7d160813b 100644
--- a/lang/en_utf8/help/quiz/analysisdownload.html
+++ b/lang/en_utf8/help/quiz/analysisdownload.html
@@ -7,15 +7,15 @@ presented as a table with appropriate titles, as on the screen. If
 the table is paged, all data for all pages will be downloaded in a
 single file. </p>
 
-<p><b>Excel Spreadsheet format:</b></p> <p>You will get an .xls
+<h2>Excel Spreadsheet format:</h2> <p>You will get an .xls
 spreadsheet document.</p>
 
-<p><b>OpenOffice Writer format:</b></p> <p>The data will we
+<h2>OpenOffice Writer format:</h2> <p>The data will we
 presented within a table in an OpenOffice .sxw text document.<br />
 
 This format will be available only if you have installed the
 PHPWriter library in the /moodle/lib subdirectory.</p>
 
-<p><b>Text format</b></p> <p>In this case, data will be stored as a
+<h2>Text format</h2> <p>In this case, data will be stored as a
 regular text file. A line for each row in the table with data
 separated by tabstops.</p>
diff --git a/lang/en_utf8/help/quiz/analysisoptions.html b/lang/en_utf8/help/quiz/analysisoptions.html
index 70f4aaf3d1..ddc50625d6 100644
--- a/lang/en_utf8/help/quiz/analysisoptions.html
+++ b/lang/en_utf8/help/quiz/analysisoptions.html
@@ -3,13 +3,13 @@
 <p>You can determine which quiz attempts are included in the
 analysis by setting the following parameters: </p>
 
-<p><b>Attempt selection:</b></p><p> It may be convenient to analyze
+<h2>Attempt selection:</h2><p> It may be convenient to analyze
 just one quiz attempt for each user. This particular attempt may be
 the one with the highest overall score, the first attempt or the
 last attempt of those performed. Alternatively all attempts data may
 be combined for a cumulative analysis.</p>
 
-<p><b>Rejection of low scores:</b></p> <p>Sometimes users are just
+<h2>Rejection of low scores:</h2> <p>Sometimes users are just
 browsing the quiz, exploring it, and not going through it for a
 grade. It is common that such 'trial' attempts get very low scores.
 These attempts can be excluded from analysis by setting a low limit
@@ -17,5 +17,5 @@ for the score of the attempts to analyze. This limit is specified as
 a percentage (0-100) of the maximum grade achievable in the
 quiz.</p>
 
-<p><b>Page size:</b></p> <p>You choose how many questions per page
+<h2>Page size:</h2> <p>You choose how many questions per page
 you want to see displayed on screen.</p>
diff --git a/lang/en_utf8/help/quiz/calculated.html b/lang/en_utf8/help/quiz/calculated.html
index 2baecf89f0..85cd4e1fa7 100644
--- a/lang/en_utf8/help/quiz/calculated.html
+++ b/lang/en_utf8/help/quiz/calculated.html
@@ -1,67 +1,69 @@
 <h1>Calculated questions</h1>
-Calculated questions offers a way to create individual numerical question by the use of wildcards that are substituted with individual values when the quiz is taken.
-<br />Below is a shrunken view of the main editing page with some example inputs:<br />
+
+<p>Calculated questions offers a way to create individual numerical question by the use of wildcards that are substituted with individual values when the quiz is taken.
+<br />Below is a shrunken view of the main editing page with some example inputs:
+</p>
 
 <table><tbody>
 <tr valign="top">
-    <td align="right"><p><b>Question:</b></p>
-    </td>
+    <th scope="col" align="right">Question:</th>
     <td>
         <textarea id="questiontext" name="questiontext" rows="5" cols="40" wrap="virtual">How much is {a} + {b} ?</textarea>
 </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b>Image to display:</b></p></td>
+    <th scope="col" align="right">Image to display:</th>
     <td>
     <select name="image"><option value="" selected="selected">None</option><option value="grevture.gif">grevture.gif</option></select>
     </td>
 </tr>
 
 <tr valign="top">
-<td align="right"><p><b>Correct Answer Formula:</b></p></td>
+<th scope="col" align="right">Correct Answer Formula:</th>
     <td>
     <input align="left" type="text" id="formula0" name="answer[]" size="20" value="{a} + {b}" />&nbsp;&nbsp;
     <input type="hidden" name="fraction[]" value="1.0" />
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b>Tolerance:</b></p></td>
+    <th scope="col" align="right">Tolerance:</th>
     <td>
     <input align="left" type="text" id="tolerance0&quot;" name="tolerance[]" size="15" value="0.01" />±
     </td>
 </tr>
 <tr valign="top">
-<td align="right"><p><b>Tolerance Type:</b></p></td>
+<th scope="col" align="right">Tolerance Type:</th>
     <td>
     <select name="tolerancetype[]"><option value="1" selected="selected">Relative</option><option value="2">Nominal</option><option value="3">Geometric</option></select>
     </td>
 </tr>
 <tr valign="top">
-<td align="right"><p><b>Significant Figures:</b></p></td>
+<th scope="col" align="right">Significant Figures:</th>
     <td>
     <select name="correctanswerlength[]"><option value="1">1</option><option value="2" selected="selected">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select>
     </td>
 </tr>
 </tbody></table>
 
-<br />
+<p>
 In the question text input and "Correct Answer Formula" {a} and {b} can be seen. These and any other {name} can be used as a wildcard that is substituted by some value when the quiz is taken. Also, the correct answer is calculated when the quiz is submitted using the expression in "Correct Answer Formula", which is calculated as a numerical expression after the substitution of the wildcards. The possible wildcard values are set or generated on a later page in "editing wizard" for calculated questions...
-<br/>The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:<br /><b>
+</p> <p>
+The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:<br /><b>
 abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sprt, tan, tanh
 </b><br />and two two-argument functions<br /><b>
 atan2, pow
 </b><br />and the functions <b>min</b> and <b>max</b> that can take two or more arguments. It is also possible to use the function <b>pi</b> that takes no arguments but do not forget the use the parentheses - the correct usage is <b>pi()</b>. Similarly the other function must have their argument(s) within parentheses. Possible usage is for example <b>sin({a}) + cos({b}) * 2</b>. It should not be any problem to wrap functions within each other like <b>cos(deg2rad({a} + 90))</b> etc.
 <br />More details on how to use these PHP-style functions can be found in the <a target="phpmathdoc" href="http://www.php.net/manual/en/ref.math.php">documentation at the PHP web site</a>
-<br /><br />
+</p> <p>
 As for numerical questions it is possible to allow a margin within which all responses are accepted as correct. The "Tolerance" field is used for this. However, there are three different types of tolerances. These are <b>Relative, Nominal and Geometric</b>. If we say that the correct answer at quiz time is calculated to 200 and the tolerance is set to 0.5 then the different tolerance types work like this:
-<br /><br /><b>Relative:</b> A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300.  (200 ± 100)<br />
+</p> <p><b>Relative:</b> A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300.  (200 ± 100)<br />
 This is useful if the magnitude of the correct answer can differ greatly between different wildcard values.
-<br /><br /><b>Nominal:</b>  This is the simplest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 ± 0.5)<br />
+</p> <p><b>Nominal:</b>  This is the simplest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 ± 0.5)<br />
 This tolerance type can be useful if the differences between different correct answers are small.
-<br /><br /><b>Geometric:</b> The upper limit of the tolerance interval is calculated as 200 + 0.5*200 and is the same as for the relative case. The lower limit is calculated as 200/(1 + 0.5). The correct response must then be between 133.33 and 300.<br />
+</p> <p><b>Geometric:</b> The upper limit of the tolerance interval is calculated as 200 + 0.5*200 and is the same as for the relative case. The lower limit is calculated as 200/(1 + 0.5). The correct response must then be between 133.33 and 300.<br />
 This is useful for complex calculation that must have great tolerances where relative tolerances of 1 or more would be used for the upper limit but clearly not acceptable for the lower limit as it would make zero a correct answer for all cases.
-<br /><br />
+</p> <p>
 The field <b>Significant Figures</b> does only relate to how the correct answer should be presented in the review or the reports. Examples: If it is set to 3 then the correct answer 13.333 would be presented as 13.3; 1236 would be presented as 1240; 23 would be presented as 23.0 etc.
-<br /><br />
+</p> <p>
 The feedback field and the optional unit fields work just like they do for numerical questions.
-<br />
\ No newline at end of file
+</p>
\ No newline at end of file
diff --git a/lang/en_utf8/help/quiz/categories_edit.html b/lang/en_utf8/help/quiz/categories_edit.html
index 8bbe51b297..e79ceecf80 100644
--- a/lang/en_utf8/help/quiz/categories_edit.html
+++ b/lang/en_utf8/help/quiz/categories_edit.html
@@ -10,7 +10,7 @@
    available to all courses on this server, so that 
    other courses can use your questions in their quizzes.</p>
 
-<p><b>Field descriptions</b></p>
+<h2>Field descriptions</h2>
 
 <p><b>Parent:</b> The category in which this one will be placed.  If
    no other categories have been created, only 'Top' will be
diff --git a/lang/en_utf8/help/quiz/export.html b/lang/en_utf8/help/quiz/export.html
index 43637a0e5f..7d5353309f 100644
--- a/lang/en_utf8/help/quiz/export.html
+++ b/lang/en_utf8/help/quiz/export.html
@@ -13,7 +13,7 @@
 
 <p>The format(s) currently supported are:</p>
 
-<p><b>GIFT format</b></p>
+<h2>GIFT format</h2>
 <ul>
 <p>GIFT is the most comprehensive import/export format available for exporting 
    Moodle quiz questions to a text file.  It was designed to be an easy 
@@ -35,11 +35,11 @@ Who's buried in Grant's tomb?{=no one =nobody}
 When was Ulysses S. Grant born?{#1822}
 </pre>
 
-<p align="right"><a href="help.php?file=formatgift.html&module=quiz">More info about the "GIFT" format</a></p>
+<p align="right"><a href="help.php?file=formatgift.html&amp;module=quiz">More info about the "GIFT" format</a></p>
 </ul>
 
 
-<p><b>Moodle XML format</b></p>
+<h2>Moodle XML format</h2>
 <ul>
 <p>This Moodle specific format exports quiz questions in a simple XML format. They
 can then be imported into another quiz category or used in some other process such as
@@ -47,7 +47,7 @@ an XSLT transformation. The XML format will export images attached to questions
 base64).</p>
 </ul>
 
-<p><b>IMS QTI 2.0</b></p>
+<h2>IMS QTI 2.0</h2>
 <ul>
 <p>Exports in the standard IMS QTI (version 2.0) format. Note that this generates a group of files within
   a single 'zip' file.</p>
@@ -55,7 +55,7 @@ base64).</p>
  (external site in new window)</p>
 </ul>
 
-<p><b>XHTML</b></p>
+<h2>XHTML</h2>
 <ul>
 <p>Exports the category as a single page of 'strict' XHTML. Each question is clearly placed in its own
 &lt;div&gt; tag. If you want to use this page as-is, you will need to at least edit the &lt;form&gt; tag at the
diff --git a/lang/en_utf8/help/quiz/import.html b/lang/en_utf8/help/quiz/import.html
index f1e0ebc421..3bd3ea64bd 100644
--- a/lang/en_utf8/help/quiz/import.html
+++ b/lang/en_utf8/help/quiz/import.html
@@ -5,7 +5,7 @@
    or by choosing a suitable file already in the
    course Files area.  </p>
 
-<p><b>A note about character encodings</b></p>
+<h2>A note about character encodings</h2>
 
 <p>If your file contains non-ascii characters then it must use UTF-8 encoding. 
    You may be able to select or convert to UTF-8 using your favourite editor,
@@ -15,7 +15,7 @@
 
 <p>A number of file formats are supported:</p>
 
-<p><b>GIFT format</b></p>
+<h2>GIFT format</h2>
 <ul>
 <p>GIFT is the most comprehensive import format available for importing 
    Moodle quiz questions from a text file.  It was designed to be an easy 
@@ -36,10 +36,10 @@ Who's buried in Grant's tomb?{=no one =nobody}
 When was Ulysses S. Grant born?{#1822}
 </pre>
 
-<p align="right"><a href="help.php?file=formatgift.html&module=quiz">More info about the "GIFT" format</a></p>
+<p align="right"><a href="help.php?file=formatgift.html&amp;module=quiz">More info about the "GIFT" format</a></p>
 </ul>
 
-<p><b>Missing Word</b></p>
+<h2>Missing Word</h2>
 <ul>
 <p>This format only supports multiple choice questions and
 short answer question, depending on the number of answers. One
@@ -61,20 +61,20 @@ we become students of {=anatomy and physiology ~reflexology
  and in a sense we remain students for life.
 </blockquote>
 
-<p align="right"><a href="help.php?file=formatmissingword.html&module=quiz">More info about the "Missing Word" format</a></p>
+<p align="right"><a href="help.php?file=formatmissingword.html&amp;module=quiz">More info about the "Missing Word" format</a></p>
 </ul>
 
-<p><b>Blackboard</b></p>
+<h2>Blackboard</h2>
 <ul>
 <p>This module can import questions saved in Blackboard's export 
 format.  It relies on XML functions being compiled into your PHP.
 Note that this version <strong>does not</strong> work with Blackboard
 Version 6 and newer.</p>
 
-<p align="right"><a href="help.php?file=formatblackboard.html&module=quiz">More info about the "Blackboard" format</a></p>
+<p align="right"><a href="help.php?file=formatblackboard.html&amp;module=quiz">More info about the "Blackboard" format</a></p>
 </ul>
 
-<p><b>Blackboard V6+</b></p>
+<h2>Blackboard V6+</h2>
 <ul>
 <p>This module can import questions saved in Blackboard's export
 format. It provides limited support for Blackboard Version 6 and
@@ -83,15 +83,15 @@ must upload the zip file exported from Blackboard.</p>
 </ul>
 
 
-<p><b>WebCT</b></p>
+<h2>WebCT</h2>
 <ul>
 <p>This module can import questions saved in WebCT's text-based format.</p>
 
-<p align="right"><a href="help.php?file=formatwebct.html&module=quiz">More info about the "WebCT" format</a></p>
+<p align="right"><a href="help.php?file=formatwebct.html&amp;module=quiz">More info about the "WebCT" format</a></p>
 </ul>
 
 
-<p><b>Course Test Manager</b></p>
+<h2>Course Test Manager</h2>
 <ul>
 <p>This module can import questions saved in a Course Test Manager test bank.
 It relies on different ways of accessing the test bank, which is in a Microsoft Access 
@@ -104,40 +104,40 @@ to transfer data to moodle on the Linux server.</p>
 using this import class.</p>
 
 
-<p align="right"><a href="help.php?file=formatctm.html&module=quiz">More info about the "CTM" format</a></p>
+<p align="right"><a href="help.php?file=formatctm.html&amp;module=quiz">More info about the "CTM" format</a></p>
 </ul>
 
 
 
-<p><b>Embedded answers (Cloze)</b></p>
+<h2>Embedded answers (Cloze)</h2>
 <ul>
 <p>This special purpose format imports just one type of question, the 
 Embedded Answers (also known as Cloze) format.
 </p>
 
-<p align="right"><a href="help.php?file=multianswer.html&module=quiz">More info about the "Cloze" format</a></p>
+<p align="right"><a href="help.php?file=multianswer.html&amp;module=quiz">More info about the "Cloze" format</a></p>
 </ul>
 
-<p><b>Learnwise format</b></p>
+<h2>Learnwise format</h2>
 <ul>
 <p>This format can import multiple choice questions saved in Learnwise's XML
 format.</p>
 </ul>
 
-<p><b>Examview format</b></p>
+<h2>Examview format</h2>
 <ul>
 <p>This format can import from Examview 4 XML files. Note that the older
 versions of Examview are not supported.</p>
 </ul>
 
-<p><b>Moodle XML format</b></p>
+<h2>Moodle XML format</h2>
 <ul>
 <p>This Moodle specific format imports quiz questions that have previously been
 exported in the same format. The format is straightforward and is best demonstrated
 by exporting a category in the Moodle XML format. The XML format is capabable of 
 importing image files.
 </p>
-<p align="right"><a href="help.php?file=formatxml.html&module=quiz">More info about the "Moodle XML" format</a></p>
+<p align="right"><a href="help.php?file=formatxml.html&amp;module=quiz">More info about the "Moodle XML" format</a></p>
 </ul>
 
 <p>Import and Export formats are a pluggable resource. Other optional formats may be available in the
diff --git a/lang/en_utf8/help/quiz/index.html b/lang/en_utf8/help/quiz/index.html
index 8d68bffd37..e0971b5464 100644
--- a/lang/en_utf8/help/quiz/index.html
+++ b/lang/en_utf8/help/quiz/index.html
@@ -1,4 +1,4 @@
-<p>Quizzes</p>
+<h2>Quizzes</h2>
 <ul>
   <li><a href="help.php?module=quiz&amp;file=adaptive.html">Adaptive mode</a></li>
   <li><a href="help.php?module=quiz&amp;file=analysisdownload.html">Analysis Download</a></li>
diff --git a/lang/en_utf8/help/quiz/itemanalysis.html b/lang/en_utf8/help/quiz/itemanalysis.html
index 212c1f0640..54672dda2f 100644
--- a/lang/en_utf8/help/quiz/itemanalysis.html
+++ b/lang/en_utf8/help/quiz/itemanalysis.html
@@ -4,7 +4,7 @@
 performance of each question for the function of assessment. The statistical parameters used are 
 calculated as explained by classical test theory (ref. 1)</p>
 
-<p><b>Facility Index (% Correct)</b></p>
+<h2>Facility Index (% Correct)</h2>
 <p>This is a measure of how easy or difficult is a question for quiz-takers. 
 It is calculated as:
 <br />
@@ -17,13 +17,13 @@ If questions can be distributed dicotomically into correct / uncorrect categorie
 this parameter coincides with the percentage of users that answer the question correctly. </p>
 
 </p>
-<p><b>Standard Deviation (SD)</b></p>
+<h2>Standard Deviation (SD)</h2>
 <p>This parameter measures the spread of answers in the response population. If all users 
 answers the same, then SD=0. SD is calculated as the statistical stadard deviation for the 
 sample of fractional scores (achieved/maximum) at each particular question.  
 </p>
 
-<p><b>Discrimination Index (DI)</b></p>
+<h2>Discrimination Index (DI)</h2>
 <p>This provides a rough indicator of the performance of each item to separate proficient 
 <i>vs.</i> less-proficient users. This parameter is calculated by first dividing learners into thirds 
 based on the overall score in the quiz. Then the average score at the analyzed item is calculated for 
@@ -40,7 +40,7 @@ and X<sub>bottom</sub>) is the analog sum for users with the lower 1/3 grades fo
 If the index goes below 0.0 it means that more of the weaker learners got the item right than the stronger learners.  
 Such items should be discarded as worthless.  In fact, they reduce the accuracy of the overall score for the quiz. </p>
 
-<p><b>Discrimination Coefficient (DC)</b></p>
+<h2>Discrimination Coefficient (DC)</h2>
 <p>This is another measure of the separating power of the item to distinguish proficient from weak learners.<br/>
 The discrimination coefficient is a correlation coefficient between scores at the item and at the whole quiz. Here it is calculated as:
 
diff --git a/lang/en_utf8/help/quiz/overviewdownload.html b/lang/en_utf8/help/quiz/overviewdownload.html
index 91a516aec3..72638e8f09 100644
--- a/lang/en_utf8/help/quiz/overviewdownload.html
+++ b/lang/en_utf8/help/quiz/overviewdownload.html
@@ -7,9 +7,9 @@ presented as a table with appropriate titles, as on the screen. If
 the table is paged, all data for all pages will be downloaded in a
 single file. </p>
 
-<p><b>Excel Spreadsheet format:</b></p> <p>You will get an .xls
+<h2>Excel Spreadsheet format:</h2> <p>You will get an .xls
 spreadsheet document.</p>
 
-<p><b>Text format</b></p> <p>In this case, data will be stored as a
+<h2>Text format</h2> <p>In this case, data will be stored as a
 regular text file. A line for each row in the table with data
 separated by tabstops.</p>
diff --git a/lang/en_utf8/help/quiz/questiontypes.html b/lang/en_utf8/help/quiz/questiontypes.html
index 48d0dba80f..413a1a909b 100644
--- a/lang/en_utf8/help/quiz/questiontypes.html
+++ b/lang/en_utf8/help/quiz/questiontypes.html
@@ -2,24 +2,24 @@
 
 <p>You can add a variety of different types of questions to a category:</p>
 
-<p><b>Multiple Choice</b></p>
+<h2>Multiple Choice</h2>
 <ul>
 <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 align="right"><a href="help.php?file=multichoice.html&module=quiz">More info about Multiple Choice questions</a></p>
+<p align="right"><a href="help.php?file=multichoice.html&amp;module=quiz">More info about Multiple Choice questions</a></p>
 </ul>
 
-<p><b>Short Answer</b></p>
+<h2>Short Answer</h2>
 <ul>
 <p>In response to a question (that may include a image), the respondent 
    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 align="right"><a href="help.php?file=shortanswer.html&module=quiz">More info about Short Answer questions</a></p>
+<p align="right"><a href="help.php?file=shortanswer.html&amp;module=quiz">More info about Short Answer questions</a></p>
 </ul>
 
-<p><b>Numerical</b></p>
+<h2>Numerical</h2>
 <ul>
 <p>From the student perspective, a numerical question looks just
     like a short-answer question.
@@ -27,70 +27,70 @@
     to have an accepted error. This allows a continuous range of answers
     to be set.
 </p>
-<p align="right"><a href="help.php?file=numerical.html&module=quiz">More info about Numerical questions</a></p>
+<p align="right"><a href="help.php?file=numerical.html&amp;module=quiz">More info about Numerical questions</a></p>
 </ul>
 
-<p><b>True/False</b></p>
+<h2>True/False</h2>
 <ul>
 <p>In response to a question (that may include a image), the respondent
    selects from two options: True or False.
 </p>
-<p align="right"><a href="help.php?file=truefalse.html&module=quiz">More info about True/False questions</a></p>
+<p align="right"><a href="help.php?file=truefalse.html&amp;module=quiz">More info about True/False questions</a></p>
 </ul>
 
-<p><b>Matching</b></p>
+<h2>Matching</h2>
 <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=match.html&module=quiz">More info about Matching questions</a></p>
+<p align="right"><a href="help.php?file=match.html&amp;module=quiz">More info about Matching questions</a></p>
 </ul>
 
-<p><b>Embedded Answers (Cloze)</b></p>
+<h2>Embedded Answers (Cloze)</h2>
 <ul>
 <p>These very flexible questions consist of a passage of text (in Moodle format) that 
    has various answers embedded within it, including multiple choice, 
    short answers and numerical answers.
 </p>
-<p align="right"><a href="help.php?file=multianswer.html&module=quiz">More info about Embedded Answers questions</a></p>
+<p align="right"><a href="help.php?file=multianswer.html&amp;module=quiz">More info about Embedded Answers questions</a></p>
 </ul>
 
-<p><b>Random Short-Answer Matching</b></p>
+<h2>Random Short-Answer Matching</h2>
 <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=randomsamatch.html&module=quiz">More info about Matching questions</a></p>
+<p align="right"><a href="help.php?file=randomsamatch.html&amp;module=quiz">More info about Matching questions</a></p>
 </ul>
 
-<p><b>Random</b></p>
+<h2>Random</h2>
 <ul>
 <p>A Random question in a quiz is replaced by a randomly-chosen question
    from the category that was set.
 </p>
-<p align="right"><a href="help.php?file=random.html&module=quiz">More info about Random questions</a></p>
+<p align="right"><a href="help.php?file=random.html&amp;module=quiz">More info about Random questions</a></p>
 </ul>
 
-<p><b>Description</b></p>
+<h2>Description</h2>
 <ul>
 <p>This is not a real question.  It simply prints some text (and possibly graphics)
    without requiring an answer.  This can be used to provide some information to 
    be used by a following group of questions, for example.
 </p>
-<p align="right"><a href="help.php?file=description.html&module=quiz">More info about Description questions</a></p>
+<p align="right"><a href="help.php?file=description.html&amp;module=quiz">More info about Description questions</a></p>
 </ul>
 
-<p><b>Calculated</b></p>
+<h2>Calculated</h2>
 <ul>
 <p>Calculated questions offer a way to create individual numerical questions by the 
    use of wildcards that are substituted with individual values when the quiz is taken.
 </p>
-<p align="right"><a href="help.php?file=calculated.html&module=quiz">More info about Calculated questions</a></p>
+<p align="right"><a href="help.php?file=calculated.html&amp;module=quiz">More info about Calculated questions</a></p>
 </ul>
 
-<p><b>Essay</b></p>
+<h2>Essay</h2>
 <ul>
 <p>In response to a question (that may include an image) the respondent writes an answer in essay format.</p>
-<p align="right"><a href="help.php?file=essay.html&module=quiz">More info about Essay questions</a></p>
+<p align="right"><a href="help.php?file=essay.html&amp;module=quiz">More info about Essay questions</a></p>
 </ul>
\ No newline at end of file
diff --git a/lang/en_utf8/help/quiz/responsesdownload.html b/lang/en_utf8/help/quiz/responsesdownload.html
index d15c49c932..1f94aeacf9 100644
--- a/lang/en_utf8/help/quiz/responsesdownload.html
+++ b/lang/en_utf8/help/quiz/responsesdownload.html
@@ -9,9 +9,9 @@ all data for all pages will always be downloaded in a
 single file. Users with no attempt for this quiz will be included 
 in the file if you check the corresponding option.</p>
 
-<p><b>Excel Spreadsheet format:</b></p> <p>You will get an .xls
+<h2>Excel Spreadsheet format:</h2> <p>You will get an .xls
 spreadsheet document.</p>
 
-<p><b>Text format</b></p> <p>In this case, data will be stored as a
+<h2>Text format</h2> <p>In this case, data will be stored as a
 regular text file. A line for each row in the table with data
 separated by tabstops.</p>
diff --git a/lang/en_utf8/help/quiz/responsesoptions.html b/lang/en_utf8/help/quiz/responsesoptions.html
index 224db6a50a..e623323286 100644
--- a/lang/en_utf8/help/quiz/responsesoptions.html
+++ b/lang/en_utf8/help/quiz/responsesoptions.html
@@ -1,9 +1,9 @@
 <h1>Responses Options</h1>
 
-<p><b>Page size:</b></p> <p>You choose how many attempts per page
+<h2>Page size:</h2> <p>You choose how many attempts per page
 you want to see displayed on screen.</p>
 
-<p><b>Show students with no attempts:</b></p> It may be convenient 
+<h2>Show students with no attempts:</h2> It may be convenient 
 to not only show students with attempts for this quiz but also
 students that not yet attempted it.</p>
 
diff --git a/lang/en_utf8/help/resource/deploy.html b/lang/en_utf8/help/resource/deploy.html
index 9ccdf80057..99418dc733 100644
--- a/lang/en_utf8/help/resource/deploy.html
+++ b/lang/en_utf8/help/resource/deploy.html
@@ -1,4 +1,4 @@
-<p><b>Deploy All</b></p>
+<h1>Deploy All</h1>
 
 <ul>
 
diff --git a/lang/en_utf8/help/resource/imsparameters.html b/lang/en_utf8/help/resource/imsparameters.html
index 5be8377ffe..334c2c62a5 100644
--- a/lang/en_utf8/help/resource/imsparameters.html
+++ b/lang/en_utf8/help/resource/imsparameters.html
@@ -1,4 +1,4 @@
-<p><b>IMS Content Package Parameters</b></p>
+<h1>IMS Content Package Parameters</h1>
 
 <ul>
 
diff --git a/lang/en_utf8/help/resource/index.html b/lang/en_utf8/help/resource/index.html
index a3bb0bcd2b..d320f10509 100644
--- a/lang/en_utf8/help/resource/index.html
+++ b/lang/en_utf8/help/resource/index.html
@@ -1,4 +1,4 @@
-<p>Resource module</p>
+<h2>Resource module</h2>
 <ul>
   <li><a href="help.php?module=resource&amp;file=summary.html">Reading Summary</a></li>
   <li><a href="help.php?module=resource&amp;file=types.html">Resource Types</a>
diff --git a/lang/en_utf8/help/resource/type/directory.html b/lang/en_utf8/help/resource/type/directory.html
index bea97064a4..f069cda493 100644
--- a/lang/en_utf8/help/resource/type/directory.html
+++ b/lang/en_utf8/help/resource/type/directory.html
@@ -1,4 +1,4 @@
-<p><b>Directory</b></p>
+<h1>Directory</h1>
 
 <ul>
 <p>The directory resource can display a whole directory (and its subdirectories) from your course files area.
diff --git a/lang/en_utf8/help/resource/type/file.html b/lang/en_utf8/help/resource/type/file.html
index 000bc772d7..884714863f 100644
--- a/lang/en_utf8/help/resource/type/file.html
+++ b/lang/en_utf8/help/resource/type/file.html
@@ -1,4 +1,4 @@
-<p><b>Files and web pages</b></p>
+<h1>Files and web pages</h1>
 
 <ul>
 <p>This resource type allows you to link to any web page or other file 
diff --git a/lang/en_utf8/help/resource/type/html.html b/lang/en_utf8/help/resource/type/html.html
index 04bab0683d..08e719e8d7 100644
--- a/lang/en_utf8/help/resource/type/html.html
+++ b/lang/en_utf8/help/resource/type/html.html
@@ -1,4 +1,4 @@
-<p><b>HTML page</b></p>
+<h1>HTML page</h1>
 
 <ul>
 <p>This sort of resource makes it easy to develop a complete single web page 
diff --git a/lang/en_utf8/help/resource/type/ims.html b/lang/en_utf8/help/resource/type/ims.html
index 7f540cb99c..74cb49c15e 100644
--- a/lang/en_utf8/help/resource/type/ims.html
+++ b/lang/en_utf8/help/resource/type/ims.html
@@ -1,4 +1,4 @@
-<p><b>IMS Content Packages</b></p>
+<h1>IMS Content Packages</h1>
 
 <ul>
 
diff --git a/lang/en_utf8/help/resource/type/label.html b/lang/en_utf8/help/resource/type/label.html
index 6ca72cbc62..d49c5c121a 100644
--- a/lang/en_utf8/help/resource/type/label.html
+++ b/lang/en_utf8/help/resource/type/label.html
@@ -1,4 +1,4 @@
-<p><b>Labels</b></p>
+<h1>Labels</h1>
 
 <ul>
 <p>Labels are a little different from other resources because they are 
diff --git a/lang/en_utf8/help/resource/type/text.html b/lang/en_utf8/help/resource/type/text.html
index 7adbd3d39b..26b8799128 100644
--- a/lang/en_utf8/help/resource/type/text.html
+++ b/lang/en_utf8/help/resource/type/text.html
@@ -1,4 +1,4 @@
-<p><b>Text page</b></p>
+<h1>Text page</h1>
 
 <ul>
 <p>This type of resource is a simple page written using plain text.</p>
@@ -6,6 +6,6 @@
 <p>A number of formatting types are available to help turn your plain 
    text into nice-looking web pages.</p>
 
-<p align="right"><a href="help.php?module=moodle&file=textformat.html">More about these text formats.</a></p>
+<p align="right"><a href="help.php?module=moodle&amp;file=textformat.html">More about these text formats.</a></p>
 
 </ul>
diff --git a/lang/en_utf8/help/richtext.html b/lang/en_utf8/help/richtext.html
index 455b4bd912..7378fac4a4 100644
--- a/lang/en_utf8/help/richtext.html
+++ b/lang/en_utf8/help/richtext.html
@@ -17,30 +17,30 @@
 
 <p>In addition to formatting text, this editor provides a number of extra features you may find useful.
 
-<p><b>Paste text in from other Applications</b></p>
+<h2>Paste text in from other Applications</h2>
 <ul>
 <p>You can cut and paste rich text from other Windows applications such as Microsoft Word
    straight into this editor, and your formatting will be preserved.  Just use the normal cut and paste
    menus in your web browser (or Control-C and Control-V).</p>
 </ul>
 
-<p><b>Inserting images <img alt="" src="lib/editor/htmlarea/images/ed_image.gif" /></b></p>
+<h2>Inserting images <img alt="" src="lib/editor/htmlarea/images/ed_image.gif" /></h2>
 <ul>
 <p>If you have images that are already published on a web site and accessible via a URL, you can include these images in your texts using the "Insert Image" button.</p>
 </ul>
 
-<p><b>Inserting Tables <img alt="" src="lib/editor/htmlarea/images/insert_table.gif" /></b></p>
+<h2>Inserting Tables <img alt="" src="lib/editor/htmlarea/images/insert_table.gif" /></h2>
 <ul>
 <p>To add layout to your texts, you can use the "Insert Tables" button in the toolbar.  
 </ul>
 
-<p><b>Inserting Links <img alt="" src="lib/editor/htmlarea/images/ed_link.gif" /> /</b></p>
+<h2>Inserting Links <img alt="" src="lib/editor/htmlarea/images/ed_link.gif" /> /</h2>
 <ul>
 <p>To make a new link, first type the text that you want to be a link.  Then select it and click the link button in the toolbar.  Type the URL you want to link to and it's done!</p>
 </ul>
 
 
-<p><b>Inserting smilies (emoticons) <img alt="" src="pix/s/smiley.gif" class="icon" /></b></p>
+<h2>Inserting smilies (emoticons) <img alt="" src="pix/s/smiley.gif" class="icon" /></h2>
 <ul>
 <p>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).</p>
 
@@ -51,52 +51,52 @@
           <tr>
             <td><img alt="" src="pix/s/smiley.gif" class="icon" /></td>
             <td>smile</td>
-            <td nowrap="nowrap"><font face="Courier">:-)</font></td>
+            <td nowrap="nowrap"><code>:-)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/biggrin.gif" class="icon" /></td>
             <td>big grin</td>
-            <td nowrap="nowrap"><font face="Courier">:-D</font></td>
+            <td nowrap="nowrap"><code>:-D</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/wink.gif" class="icon" /></td>
             <td>wink</td>
-            <td nowrap="nowrap"><font face="Courier">;-)</font></td>
+            <td nowrap="nowrap"><code>;-)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/mixed.gif" class="icon" /></td>
             <td>mixed</td>
-            <td nowrap="nowrap"><font face="Courier">:-/</font></td>
+            <td nowrap="nowrap"><code>:-/</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/thoughtful.gif" class="icon" /></td>
               <td>thoughtful</td>
-              <td nowrap="nowrap"><font face="Courier">V-.</font></td>
+              <td nowrap="nowrap"><code>V-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/tongueout.gif" class="icon" /></td>
             <td>tongue out</td>
-            <td nowrap="nowrap"><font face="Courier">:-P</font></td>
+            <td nowrap="nowrap"><code>:-P</code></td>
          </tr>
           <tr>
             <td><img alt="" src="pix/s/cool.gif" class="icon" /></td>
             <td>cool</td>
-            <td nowrap="nowrap"><font face="Courier">B-)</font></td>
+            <td nowrap="nowrap"><code>B-)</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/approve.gif" class="icon" /></td>
               <td>approve</td>
-              <td nowrap="nowrap"><font face="Courier">^-)</font></td>
+              <td nowrap="nowrap"><code>^-)</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/wideeyes.gif" class="icon" /></td>
               <td>wide eyes</td>
-              <td nowrap="nowrap"><font face="Courier">8-)</font></td>
+              <td nowrap="nowrap"><code>8-)</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/surprise.gif" class="icon" /></td>
               <td>surprise</td>
-              <td nowrap="nowrap"><font face="Courier">8-o</font></td>
+              <td nowrap="nowrap"><code>8-o</code></td>
             </tr>
         </table>
         </td>
@@ -105,54 +105,56 @@
             <tr>
               <td><img alt="" src="pix/s/sad.gif" class="icon" /></td>
               <td>sad</td>
-              <td nowrap="nowrap"><font face="Courier">:-(</font></td>
+              <td nowrap="nowrap"><code>:-(</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/shy.gif" class="icon" /></td>
               <td>shy</td>
-              <td nowrap="nowrap"><font face="Courier">8-.</font></td>
+              <td nowrap="nowrap"><code>8-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/blush.gif" class="icon" /></td>
             <td>blush</td>
-            <td nowrap="nowrap"><font face="Courier">:-I</font></td>
+            <td nowrap="nowrap"><code>:-I</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/kiss.gif" class="icon" /></td>
               <td>kisses</td>
-              <td nowrap="nowrap"><font face="Courier">:-X</font></td>
+              <td nowrap="nowrap"><code>:-X</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/clown.gif" class="icon" /></td>
             <td>clown</td>
-            <td nowrap="nowrap"><font face="Courier">:o)</font></td>
+            <td nowrap="nowrap"><code>:o)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/blackeye.gif" class="icon" /></td>
             <td>black eye</td>
-            <td nowrap="nowrap"><font face="Courier">P-|</font></td>
+            <td nowrap="nowrap"><code>P-|</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/angry.gif" class="icon" /></td>
               <td>angry</td>
-              <td nowrap="nowrap"><font face="Courier">8-[</font></td>
+              <td nowrap="nowrap"><code>8-[</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/dead.gif" class="icon" /></td>
               <td>dead</td>
-              <td nowrap="nowrap"><font face="Courier">xx-P</font></td>
+              <td nowrap="nowrap"><code>xx-P</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/sleepy.gif" class="icon" /></td>
               <td>sleepy</td>
-              <td nowrap="nowrap"><font face="Courier">|-.</font></td>
+              <td nowrap="nowrap"><code>|-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/evil.gif" class="icon" /></td>
             <td>evil</td>
-            <td nowrap="nowrap"><font face="Courier">}-]</font></td>
+            <td nowrap="nowrap"><code>}-]</code></td>
           </tr>
         </table>
+        </td>
+      </tr>
     </table>
 
 </ul>
diff --git a/lang/en_utf8/help/scorm/advanced.html b/lang/en_utf8/help/scorm/advanced.html
index a2ad2e96d9..af40fcbd55 100644
--- a/lang/en_utf8/help/scorm/advanced.html
+++ b/lang/en_utf8/help/scorm/advanced.html
@@ -1,3 +1,3 @@
-<p><b>Parameters Settings</b></p>
+<h1>Parameters Settings</h1>
 
 <p>Clicking this button will shown additional settings to configure package display.</p>
diff --git a/lang/en_utf8/help/scorm/autocontinue.html b/lang/en_utf8/help/scorm/autocontinue.html
index b17942eea4..f675957f2a 100644
--- a/lang/en_utf8/help/scorm/autocontinue.html
+++ b/lang/en_utf8/help/scorm/autocontinue.html
@@ -1,4 +1,4 @@
-<p><b>Auto-Continue</b></p>
+<h1>Auto-Continue</h1>
 
 <p>If Auto-continue is set to Yes, when a Learning Object calls the &quot;close communication&quot; method,
 the next available Learning Object is launched automatically.</p>
diff --git a/lang/en_utf8/help/scorm/grademethod.html b/lang/en_utf8/help/scorm/grademethod.html
index ad5d717d4a..41d16fac6a 100644
--- a/lang/en_utf8/help/scorm/grademethod.html
+++ b/lang/en_utf8/help/scorm/grademethod.html
@@ -1,10 +1,10 @@
-<p><b>Grade methods</b></p>
+<h1>Grade methods</h1>
 
-<p>The results of a SCORM/AICC Package activity shown in Grades pages can be rated in several modes:
-    <ul>
+<p>The results of a SCORM/AICC Package activity shown in Grades pages can be rated in several modes:</p>
+<ul>
     <li><b>Learning Objects</b><br />This mode shows the number of completed/passed Learning Objects for the activity. The max value is the number of Package's Learning Objects .</li>
     <li><b>Highest grade</b><br />The grade page will display the highest score obtained by users in all passed Learning Objects.</li>
     <li><b>Average grade</b><br />If you choose this mode Moodle will calculate the average of all scores.</li>
     <li><b>Sum grade</b><br />With this mode all the scores will be added.</li>
-</p>
+</ul>
 
diff --git a/lang/en_utf8/help/scorm/index.html b/lang/en_utf8/help/scorm/index.html
index a70832ba81..083cc148ce 100644
--- a/lang/en_utf8/help/scorm/index.html
+++ b/lang/en_utf8/help/scorm/index.html
@@ -1,4 +1,4 @@
-<p>SCORMs</p>
+<h2>SCORMs</h2>
 
 <ul>
 
diff --git a/lang/en_utf8/help/scorm/maxgrade.html b/lang/en_utf8/help/scorm/maxgrade.html
index 0e3e0a57f5..3f358fc8bd 100644
--- a/lang/en_utf8/help/scorm/maxgrade.html
+++ b/lang/en_utf8/help/scorm/maxgrade.html
@@ -1,4 +1,4 @@
-<p><b>Maximum grade</b></p>
+<h1>Maximum grade</h1>
 
 <p>If you choose one of the last three grade methods (Highest,Average or Sum) this setting will define the max grade displayed in the Grade page.</p>
 
diff --git a/lang/en_utf8/help/scorm/package.html b/lang/en_utf8/help/scorm/package.html
index 205eb902f4..2fc79d08ab 100644
--- a/lang/en_utf8/help/scorm/package.html
+++ b/lang/en_utf8/help/scorm/package.html
@@ -1,4 +1,4 @@
-<p><b>Packages file</b></p>
+<h1>Packages file</h1>
 
 <p>The package is a particular file with <b>zip</b> (or pif) extension that contains
    valid AICC or SCORM course definition files.</p>
diff --git a/lang/en_utf8/help/scorm/size.html b/lang/en_utf8/help/scorm/size.html
index 59dce4d859..6ed7e14d8c 100644
--- a/lang/en_utf8/help/scorm/size.html
+++ b/lang/en_utf8/help/scorm/size.html
@@ -1,3 +1,3 @@
-<p><b>Size</b></p>
+<h1>Size</h1>
 
 <p>These two settings define the Learning Objects frame/window height and width.</p> 
diff --git a/lang/en_utf8/help/survey/index.html b/lang/en_utf8/help/survey/index.html
index 5756a3d289..2aedb66e96 100644
--- a/lang/en_utf8/help/survey/index.html
+++ b/lang/en_utf8/help/survey/index.html
@@ -1,4 +1,4 @@
-<p>Survey module</p>
+<h2>Survey module</h2>
 <ul>
   <li><a href="help.php?file=surveys.html">Available surveys</a> </li>
 </ul>
diff --git a/lang/en_utf8/help/surveys.html b/lang/en_utf8/help/surveys.html
index ac6b28cce3..8daddc928e 100644
--- a/lang/en_utf8/help/surveys.html
+++ b/lang/en_utf8/help/surveys.html
@@ -12,7 +12,7 @@ your participants.
 <a target="paper" href="http://dougiamas.com/writing/herdsa2002">http://dougiamas.com/writing/herdsa2002</a>)</p>
 
 <hr />
-<p><b>COLLES - Constructivist On-Line Learning Environment Survey</b></p>
+<h2>COLLES - Constructivist On-Line Learning Environment Survey</h2>
 <ul>
   <p>The COLLES comprises an economical 24 statements grouped into six scales, 
     each of which helps us address a key question about the quality of the on-line 
@@ -78,7 +78,7 @@ COLLES and the authors of it at:
 
 
 <hr />
-<p><b>ATTLS - Attitudes to Thinking and Learning Survey</b></p>
+<h2>ATTLS - Attitudes to Thinking and Learning Survey</h2>
 <ul>
 
 <p>The theory of 'ways of knowing', originally from the field of gender research (Belenky et al., 1986) provides us with a survey tool to examine the quality of discourse within a collaborative environment. </p>
@@ -89,11 +89,11 @@ COLLES and the authors of it at:
 
 <p>Studies have shown that these two learning styles are independent of each other (Galotti et al., 1999; Galotti et al., 2001). Additionally, they are only a reflection of learning attitudes, not learning capacities or intellectual power. </p>
 
-<p><i>Belenky, M. F., Clinchy, B. M., Goldberger, N. R., & Tarule, J. M. (1986). Women's Ways of Knowing: The Development of Self, Voice, and Mind. New York: Basic Books, Inc. </i></p>
+<p><i>Belenky, M. F., Clinchy, B. M., Goldberger, N. R., &amp; Tarule, J. M. (1986). Women's Ways of Knowing: The Development of Self, Voice, and Mind. New York: Basic Books, Inc. </i></p>
 
-<p><i>Galotti, K. M., Clinchy, B. M., Ainsworth, K., Lavin, B., & Mansfield, A. F. (1999). A New Way of Assessing Ways of Knowing: The Attitudes Towards Thinking and Learning Survey (ATTLS). Sex Roles, 40(9/10), 745-766.</i></p>
+<p><i>Galotti, K. M., Clinchy, B. M., Ainsworth, K., Lavin, B., &amp; Mansfield, A. F. (1999). A New Way of Assessing Ways of Knowing: The Attitudes Towards Thinking and Learning Survey (ATTLS). Sex Roles, 40(9/10), 745-766.</i></p>
 
-<p><i>Galotti, K. M., Reimer, R. L., & Drebus, D. W. (2001). Ways of knowing as learning styles: Learning MAGIC with a partner. Sex Roles, 44(7/8), 419-436.</i></p>
+<p><i>Galotti, K. M., Reimer, R. L., &amp; Drebus, D. W. (2001). Ways of knowing as learning styles: Learning MAGIC with a partner. Sex Roles, 44(7/8), 419-436.</i></p>
 
 
 </ul>
diff --git a/lang/en_utf8/help/text.html b/lang/en_utf8/help/text.html
index 2eca397c8b..32b44ad291 100644
--- a/lang/en_utf8/help/text.html
+++ b/lang/en_utf8/help/text.html
@@ -2,7 +2,7 @@
 
 Writing text in Moodle works pretty much the way you would expect, but you also have the ability to include "smilies", "URL addresses" and some HTML tags in your text.
 
-<p><b>Smilies (emoticons)</b></p>
+<h2>Smilies (emoticons)</h2>
 <ul>
 <p>To embed these small icons in your text, just type the associated code.  These codes themselves are like little pictures if you turn your head to the left when looking at them.</p>
 
@@ -13,119 +13,122 @@ Writing text in Moodle works pretty much the way you would expect, but you also
           <tr>
             <td><img alt="" src="pix/s/smiley.gif" class="icon" /></td>
             <td>smile</td>
-            <td><font face="Courier">:-)</font></td>
+            <td><code>:-)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/biggrin.gif" class="icon" /></td>
             <td>big grin</td>
-            <td><font face="Courier">:-D</font></td>
+            <td><code>:-D</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/wink.gif" class="icon" /></td>
             <td>wink</td>
-            <td><font face="Courier">;-)</font></td>
+            <td><code>;-)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/mixed.gif" class="icon" /></td>
             <td>mixed</td>
-            <td><font face="Courier">:-/</font></td>
+            <td><code>:-/</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/thoughtful.gif" class="icon" /></td>
               <td>thoughtful</td>
-              <td><font face="Courier">V-.</font></td>
+              <td><code>V-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/tongueout.gif" class="icon" /></td>
             <td>tongue out</td>
-            <td><font face="Courier">:-P</font></td>
+            <td><code>:-P</code></td>
          </tr>
           <tr>
             <td><img alt="" src="pix/s/cool.gif" class="icon" /></td>
             <td>cool</td>
-            <td><font face="Courier">B-)</font></td>
+            <td><code>B-)</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/approve.gif" class="icon" /></td>
               <td>approve</td>
-              <td><font face="Courier">^-)</font></td>
+              <td><code>^-)</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/wideeyes.gif" class="icon" /></td>
               <td>wide eyes</td>
-              <td><font face="Courier">8-)</font></td>
+              <td><code>8-)</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/surprise.gif" class="icon" /></td>
               <td>surprise</td>
-              <td><font face="Courier">8-o</font></td>
+              <td><code>8-o</code></td>
             </tr>
         </table>
         </td>
+
         <td>
         <table border="0" align="center" cellpadding="10">
             <tr>
               <td><img alt="" src="pix/s/sad.gif" class="icon" /></td>
               <td>sad</td>
-              <td><font face="Courier">:-(</font></td>
+              <td><code>:-(</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/shy.gif" class="icon" /></td>
               <td>shy</td>
-              <td><font face="Courier">8-.</font></td>
+              <td><code>8-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/blush.gif" class="icon" /></td>
             <td>blush</td>
-            <td><font face="Courier">:-I</font></td>
+            <td><code>:-I</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/kiss.gif" class="icon" /></td>
               <td>kisses</td>
-              <td><font face="Courier">:-X</font></td>
+              <td><code>:-X</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/clown.gif" class="icon" /></td>
             <td>clown</td>
-            <td><font face="Courier">:o)</font></td>
+            <td><code>:o)</code></td>
           </tr>
           <tr>
             <td><img alt="" src="pix/s/blackeye.gif" class="icon" /></td>
             <td>black eye</td>
-            <td><font face="Courier">P-|</font></td>
+            <td><code>P-|</code></td>
           </tr>
             <tr>
               <td><img alt="" src="pix/s/angry.gif" class="icon" /></td>
               <td>angry</td>
-              <td><font face="Courier">8-[</font></td>
+              <td><code>8-[</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/dead.gif" class="icon" /></td>
               <td>dead</td>
-              <td><font face="Courier">xx-P</font></td>
+              <td><code>xx-P</code></td>
             </tr>
             <tr>
               <td><img alt="" src="pix/s/sleepy.gif" class="icon" /></td>
               <td>sleepy</td>
-              <td><font face="Courier">|-.</font></td>
+              <td><code>|-.</code></td>
             </tr>
           <tr>
             <td><img alt="" src="pix/s/evil.gif" class="icon" /></td>
             <td>evil</td>
-            <td><font face="Courier">}-]</font></td>
+            <td><code>}-]</code></td>
           </tr>
         </table>
+        </td>
+      </tr>
     </table>
 
 </ul>
 
-<p><b>URLs</b></p>
+<h2>URLs</h2>
 <ul>
 <p>Any "word" starting with <b>www.</b> or <b>http://</b> will automatically be turned into a clickable link.</p>
 <p>For example:  <a href="http://www.yahoo.com">www.yahoo.com</a> or <a href="http://curtin.edu">http://curtin.edu</a></p>
 </ul>
 
-<p><b>HTML tags</b></p>
+<h2>HTML tags</h2>
 <ul>
 <p>You can use a limited subset of HTML tags to add emphasis to your texts.</p>
 <table border="0" cellpadding="5" cellspacing="5">
diff --git a/lang/en_utf8/help/textformat.html b/lang/en_utf8/help/textformat.html
index 665539909d..453970e98c 100644
--- a/lang/en_utf8/help/textformat.html
+++ b/lang/en_utf8/help/textformat.html
@@ -7,7 +7,7 @@
 <p><b>Usually you can just leave this setting to the default value and things 
       should work as you expect</b>.</p>
 
-<p><b>1. Moodle auto-format</b></p>
+<h2>1. Moodle auto-format</h2>
 
 <ul>
 <p>This format is best for when you are using normal web forms for entry
@@ -26,7 +26,7 @@
 </ul>
 
 
-<p><b>2. HTML format</b></p>
+<h2>2. HTML format</h2>
 
 <ul>
 <p>This format assumes the text is pure HTML.  If you are using the 
@@ -42,7 +42,7 @@
 </ul>
 
 
-<p><b>3. Plain text format</b></p>
+<h2>3. Plain text format</h2>
 
 <ul>
 <p>This format is useful when you need to include lots of code 
@@ -53,7 +53,7 @@
 </ul>
 
 
-<p><b>4. Markdown text format</b></p>
+<h2>4. Markdown text format</h2>
 
 <ul>
 <p>Markdown format tries to make it easy as possible to type 
diff --git a/lang/en_utf8/help/uploadgroups.html b/lang/en_utf8/help/uploadgroups.html
index f7a1de24a7..ebfcb179e5 100644
--- a/lang/en_utf8/help/uploadgroups.html
+++ b/lang/en_utf8/help/uploadgroups.html
@@ -10,11 +10,11 @@
     <blockquote>
       <p><strong>Required fieldnames:</strong> these fields must be included in the first record, and defined for each user</p>
       <p></p>
-      <font color="#990000" face="Courier New, Courier, mono">groupname</font>
+      <code class="example1">groupname</code>
       <p><strong>Default fieldnames:</strong> these are optional - if they are not included then the values are taken from the current language and current course</p>
-      <p><font color="#990000" face="Courier New, Courier, mono">idnumber, coursename, lang</font> </p>
+      <p><code class="example1">idnumber, coursename, lang</code> </p>
       <p><strong>Optional fieldnames: </strong>all of these are completely optional. </p>
-      <p> <font color="#990000" face="Courier New, Courier, mono">description, picture, hidepicture</font></p>
+      <p> <code class="example1">description, picture, hidepicture</code></p>
     </blockquote>
     </li>
   <li>Commas within the data should be encoded as &amp;#44 - the script will automatically decode these back to commas. </li>
@@ -26,8 +26,8 @@
 </ul>
    
 <p>Here is an example of a valid import file:</p>
-<p><font size="-1" face="Courier New, Courier, mono"></font>groupname,idnumber,lang,description,picture <br />
+<p><code>groupname,idnumber,lang,description,picture <br />
 group1, Phil101, en, this group requires extra attention!, 0 <br />
 group2, Math243, , ,
-</p>
+</code></p>
 
diff --git a/lang/en_utf8/help/uploadusers.html b/lang/en_utf8/help/uploadusers.html
index 11ab944fc4..9b7b222df9 100644
--- a/lang/en_utf8/help/uploadusers.html
+++ b/lang/en_utf8/help/uploadusers.html
@@ -9,13 +9,12 @@
   <li>The first record of the file is special, and contains a list of fieldnames. This defines the format of the rest of the file.
     <blockquote>
       <p><strong>Required fieldnames:</strong> these fields must be included in the first record, and defined for each user</p>
-      <p></p>
-      <font color="#990000" face="Courier New, Courier, mono">username, password, firstname, lastname, email</font></p>
-</p>
+      <p><code class="example1">username, password, firstname, lastname, email</code></p>
+
       <p><strong>Default fieldnames:</strong> these are optional - if they are not included then the values are taken from the primary admin</p>
-      <p><font color="#990000" face="Courier New, Courier, mono">institution, department, city, country, lang, auth, timezone</font> </p>
+      <p><code class="example1">institution, department, city, country, lang, auth, timezone</code> </p>
       <p><strong>Optional fieldnames: </strong>all of these are completely optional. The  course names are the &quot;shortnames&quot; of the courses - if present then the user  will be enrolled as students in those courses. Group names must be associated to the corresponding courses, i.e. group1 to course1, etc.</p>
-      <p> <font color="#990000" face="Courier New, Courier, mono">idnumber, icq, phone1, phone2, address, url, description, mailformat, maildisplay, htmleditor, autosubscribe, course1, course2, course3, course4, course5, group1, group2, group3, group4, group5, type1, type2, type3, type4, type5, role1, role2, role3, role4, role5</font></p>
+      <p> <code class="example1">idnumber, icq, phone1, phone2, address, url, description, mailformat, maildisplay, htmleditor, autosubscribe, course1, course2, course3, course4, course5, group1, group2, group3, group4, group5, type1, type2, type3, type4, type5, role1, role2, role3, role4, role5</code></p>
     </blockquote>
     </li>
   <li>Commas within the data should be encoded as &amp;#44 - the script will automatically decode these back to commas. </li>
@@ -29,14 +28,15 @@
   
   
 <p>Here is an example of a valid import file:</p>
-<p><font size="-1" face="Courier New, Courier, mono">username, password, firstname, lastname, email, lang, idnumber, maildisplay, course1, group1, type1<br />
+<p><code>username, password, firstname, lastname, email, lang, idnumber, maildisplay, course1, group1, type1<br />
 jonest, verysecret, Tom, Jones, jonest@someplace.edu, en, 3663737, 1, Intro101, Section 1, 1<br />
-reznort, somesecret, Trent, Reznor, reznort@someplace.edu, en_us, 6736733, 0, Advanced202, Section 3, 3</font></p>
+reznort, somesecret, Trent, Reznor, reznort@someplace.edu, en_us, 6736733, 0, Advanced202, Section 3, 3
+</code></p>
 
-<h1>Updating existing accounts</h1>
+<h2>Updating existing accounts</h2>
 
 <p>By default Moodle assumes that you will be creating new user accounts, and skips records where the username matches an existing account. However, if you set "Update existing accounts" to <b>Yes</b>, the existing user account will be updated. </p>
 
-<p>When updating existing accounts you can change usernames as well. Set "Allow renames" to <b>Yes</b> and include in your file a field called <font color="#990000" face="Courier New, Courier, mono">oldusername</font>.</p>
+<p>When updating existing accounts you can change usernames as well. Set "Allow renames" to <b>Yes</b> and include in your file a field called <code class="example1">oldusername</code>.</p>
 
 <p><b>Warning:</b> any errors updating existing accounts can affect your users badly. Be careful when using the options to update.</p>
diff --git a/lang/en_utf8/help/wiki/index.html b/lang/en_utf8/help/wiki/index.html
index f8109128a7..4d4d957696 100644
--- a/lang/en_utf8/help/wiki/index.html
+++ b/lang/en_utf8/help/wiki/index.html
@@ -1,4 +1,4 @@
-<p>Wiki module</p>
+<h2>Wiki module</h2>
 <ul>
 <li><a href="help.php?module=wiki&amp;file=ewikiacceptbinary.html">Allow Binary Files</a></li>
 <li><a href="help.php?module=wiki&amp;file=revertauthorfieldpattern.html">Author for reverting mass changes</a></li>
diff --git a/lang/en_utf8/help/workshop/index.html b/lang/en_utf8/help/workshop/index.html
index de0384edbe..0a08764a83 100644
--- a/lang/en_utf8/help/workshop/index.html
+++ b/lang/en_utf8/help/workshop/index.html
@@ -1,4 +1,4 @@
-<p>Workshop module</p>
+<h2>Workshop module</h2>
 <ul>
   <li><a href="help.php?module=workshop&amp;file=addcommenttobank.html">Add Comment to Bank</a></li>
   <li><a href="help.php?module=workshop&amp;file=agreeassessments.html">Agreement of Assessments</a></li>
diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index fbb1a51b6d..88c96b1106 100644
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1049,7 +1049,7 @@ $string['noticenewerbackup'] = 'This backup file has been created with Moodle $a
 $string['notifications'] = 'Notifications';
 $string['notifyloginfailuresmessage'] = '$a->time, IP: $a->ip, User: $a->info';
 $string['notify'] = 'Notify';
-$string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&chooselog=1&modid=site_errors.';
+$string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&amp;chooselog=1&amp;modid=site_errors.';
 $string['notifyloginfailuresmessagestart'] = 'Here is a list of failed login attempts at $a since you were last notified';
 $string['notifyloginfailuressubject'] = '$a :: Failed logins notification';
 $string['notincluded'] = 'Not included';