merge jambazov -> trunk

[osqa.git] / forum / skins / default / templates / markdown_help.html

diff --git a/forum/skins/default/templates/markdown_help.html b/forum/skins/default/templates/markdown_help.html
index dfdd33a39a4293126edb1930a3b78e2a023c5413..78e11ce71b97b2e07e616b85212862cf7d904312 100644 (file)
--- a/forum/skins/default/templates/markdown_help.html
+++ b/forum/skins/default/templates/markdown_help.html
@@ -158,7 +158,7 @@
                     <code>***{% trans "This is bold and italics" %}***</code>
                 </td>
                 <td>
-                    <strong><i>{% trans "This is italics" %}</i></strong>
+                    <strong><i>{% trans "This is bold and italics" %}</i></strong>
                 </td>
             </tr></table>
             <table class="section-example"><tr>
@@ -166,7 +166,7 @@
                     <code>___{% trans "This is also bold and italics" %}___</code>
                 </td>
                 <td>
-                    <strong><i>{% trans "This is italics" %}</i></strong>
+                    <strong><i>{% trans "This is also bold and italics" %}</i></strong>
                 </td>
             </tr></table>
         </div>
@@ -247,4 +247,4 @@
             <div class="section-description">{% blocktrans %}There's a lot more to the Markdown syntax than is mentioned here.  But for creative writers, this covers a lot of the necessities.  To find out more about Markdown than you'd ever want to really know, <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank" rel="nofollow">go to the Markdown page where it all started</a>.{% endblocktrans %}</div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}