# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1299360552 0
# Node ID 1688873085e08885247fb6090a45c2a2c494f81b
# Parent  b76af55aafe426d9a8f85e5835ced601824c7433
Updated the markdown help template for the new strikethrough and newline handling.

diff -r b76af55aafe4 -r 1688873085e0 gpp/templates/core/markdown_help.html
--- a/gpp/templates/core/markdown_help.html	Sat Mar 05 21:00:00 2011 +0000
+++ b/gpp/templates/core/markdown_help.html	Sat Mar 05 21:29:12 2011 +0000
@@ -17,11 +17,11 @@
       <th>Manual Line Breaks</th>
       <td>
 <pre>To insert a line break  
-end a line with two or more spaces.
+just type return.
 </pre></td>
       <td>
          <p>To insert a line break <br />
-         end a line with two or more spaces.</p>
+         just type return.</p>
       </td>
    </tr>
    <tr>
@@ -30,11 +30,17 @@
 <pre>*italic*
 _italic_
 **bold**
-__bold__</pre></td>
+__bold__
+***bold and italic***
+___bold and italic___
+</pre></td>
       <td><i>italic</i><br />
          <i>italic</i><br />
          <b>bold</b><br />
-         <b>bold</b></td>
+         <b>bold</b><br />
+         <b><i>bold and italic</i></b><br />
+         <b><i>bold and italic</i></b>
+      </td>
    </tr>
    <tr>
       <th>Inline links</th>
@@ -159,7 +165,7 @@
    </tr>
    <tr>
       <th>Strikethrough</th>
-      <td><pre>--This text is deleted--</pre></td>
+      <td><pre>---This text is deleted---</pre></td>
       <td><del>This text is deleted</del></td>
    </tr>
 </table>