Latest changes from Howard

diff --git a/lang/en/help/wiki.html b/lang/en/help/wiki.html
index 91a10f8b923f2bd4cbd956b130a5e7bbeb970b9f..74412267ff7dbcf3d3982fc9b0348a13feb40d26 100644 (file)
--- a/lang/en/help/wiki.html
+++ b/lang/en/help/wiki.html
@@ -33,7 +33,7 @@ can add to insert formatting</p>
 <h3>List Formatting</h3>\r
 \r
 <p>Simple lists can be constructed easily by placing a special character at the start of each line in the list followed by a space.\r
-The list is terminated by a blank line. At present lists cannot be intermixed or nested. Definition list\r
+The list is terminated by a blank line. Lists may be freely nested - and nested lists may change list type. Definition list\r
 definitions and text types may be freely intermixed to obtain the desired effect. The special characters\r
 are as follows...</p>\r
 \r
@@ -45,6 +45,22 @@ are as follows...</p>
   <tr><td>;</td><td>Definition list, text</td></tr>\r
 </table>  \r
 \r
+<p>Nested lists example:</p>\r
+<p><pre>\r
+  * First Bullet\r
+  * Second Bullet\r
+  ## nested line 1\r
+  ## nested line 2\r
+  * Third Bullet\r
+</pre></p>\r
+<p>Produces:\r
+<ul><li>First Bullet</li>\r
+  <li>Second Bullet</li>\r
+  <ol><li>nested line 1</li>\r
+    <li>nested line 2</li></ol>\r
+  <li>Third Bullet\r
+</ul></p>\r
+\r
 <h3>Inline formatting</h3>\r
 \r
 <p>Inline formmating allows part of a line to be marked as having a particular style. The special\r
@@ -84,6 +100,14 @@ the module name, you can link directly to that resource using the syntax:</p>
 <p>ModuleName:nn(Description Text)</p>\r
 <p>eg, <em>resource:36(My New Page)</em>   <em>forum:10(Jump to forum)</em></p>\r
 \r
+<h3>Moodle Picture Links</h3>\r
+\r
+<p>Inline graphics can be placed on wiki pages. You need to upload the graphic and note its path within the file upload area. The syntax is:</p>\r
+\r
+<p>/<em>..path to file..</em>(alt text)</p>\r
+\r
+<p>for example,  /mypics/graphic.jpg(Staff picture)</p>\r
+\r
 <h3>Automatic reformating</h3>\r
 \r
 <p>Many commonly used functions are converted into their XHTML equivalents automatically.. The main ones are as\r