merging jambazov > trunk

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

diff --git a/forum/skins/default/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html
index bcbe76cea04c8e21f73578d4f538201e4aaf6a18..39e1f3c2a34aac7088b6764175c9ba57ec52d6f1 100644 (file)
--- a/forum/skins/default/templates/answer_edit_tips.html
+++ b/forum/skins/default/templates/answer_edit_tips.html
@@ -1,5 +1,5 @@
 <!-- template answer_edit_tips.html -->
-{% load i18n %}
+{% load i18n general_sidebar_tags %}
 <div class="boxC">
     <p class="subtitle darkred">{% trans "answer tips" %}</p>
     <div>
@@ -17,39 +17,10 @@
             </li>
         </ul>
         <p class='info-box-follow-up-links'>
-            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">faq »</a>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">faq &raquo;</a>
         </p>
     </div>
 </div>
 
-<div class="boxC">
-    <p class="subtitle">{% trans "Markdown tips" %}</p>
-    <ul class="list-item">
-        <li>
-            {% trans "*italic* or __italic__" %}
-        </li>
-        <li>
-                       {% trans "**bold** or __bold__" %}
-        </li>
-        <li>
-            <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
-
-        </li>
-        <li>
-            <b>{% trans "image" %}</b>:![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
-        </li>
-        <li>
-                       {% trans "numbered list:" %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-                       {% trans "basic HTML tags are also supported" %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-        <a href="{% url markdown_help %}" target="_blank">{% trans "learn more about Markdown" %} </a>
-    </p>
-</div>
+{% markdown_help %}
 <!-- end template answer_edit_tips.html -->