Updated info about Markdown format in the general help file, and also

completed renaming of Wiki format to Wiki-like format.

diff --git a/lang/en/help/textformat.html b/lang/en/help/textformat.html
index 463eb6ae149bea67125f5f4e7ca6e14287619842..b880d0705c5ad19aaf76fc20b13dd249e2e6843a 100644 (file)
--- a/lang/en/help/textformat.html
+++ b/lang/en/help/textformat.html
@@ -53,13 +53,31 @@
 </UL>
 
 
-<P><B>4. Wiki text format</B></P>
+<P><B>4. Markdown text format</B></P>
+
+<UL>
+<P>Markdown format tries to make it easy as possible to type 
+   well-formatted XHTML pages using nothing but text written
+   more or less like you would write an email.</p>
+
+<p>It's very good for writing clean text pages with some headings
+   and some lists but without many links or images.</p>
+
+<p align=right><a href="help.php?file=markdown.html">More info about the Markdown format</a></p>
+</UL>
+
+
+
+<P><B>5. Wiki-like text format</B></P>
 <UL>
-<P>This format uses a special way of typing text known as the 
-   Wiki format.
-<P>This format allows you to type text in a way that still looks
-   very readable, but can also be automatically converted into 
-   HTML text with headings, lists and other complex formatting.
+<P>This format uses special codes for typing text known as the 
+   Wiki way.  If you already know the Wiki way of creating pages
+   and want to use it everywhere in Moodle, then this format is 
+   for you.</p>
+
+<P>Note that this isn't a <b>real</b> Wiki, so you can't use CamelCase
+   for creating new pages.  It may also be slightly different from the 
+   Wiki module in Moodle, so be aware.</p>
 
 <p align=right><a href="help.php?file=wiki.html">More info about the Wiki format</a></p>
 </UL>

diff --git a/lang/en/help/wiki.html b/lang/en/help/wiki.html
index e7cca1b1eb18db66b242a0599fcfdaca81ab9db1..2aa192115dfe818b87f56ce3f73028fa354b3735 100644 (file)
--- a/lang/en/help/wiki.html
+++ b/lang/en/help/wiki.html
@@ -1,4 +1,4 @@
-<p align="center"><b>Help on Writing Wiki Formatted Pages</b></p>\r
+<p align="center"><b>Writing pages using Wiki-like formatting</b></p>\r
 \r
 <p>\r
   Wiki formatted pages provide a facility for marking up plain text with intuitive, human readable\r