Merge remote-tracking branch 'upstream/pull/4433'

[rails.git] / app / views / shared / _markdown_help.html.erb

diff --git a/app/views/shared/_markdown_help.html.erb b/app/views/shared/_markdown_help.html.erb
index 5bd8c4955deb47b2af277a304e1dc8189631d151..d2576bfcc959d81580cac5730f3159d039104fa6 100644 (file)
--- a/app/views/shared/_markdown_help.html.erb
+++ b/app/views/shared/_markdown_help.html.erb
@@ -1,4 +1,6 @@
-<h5><%= t ".title_html" %></h5>
+<h5>
+  <%= t ".heading_html", :kramdown_link => link_to(t(".kramdown"), t(".kramdown_url")) %>
+</h5>
 <dl>
   <dt><%= t ".headings" %></dt>
   <dd># <%= t ".heading" %><br>
@@ -16,4 +18,7 @@
 
   <dt><%= t ".image" %></dt>
   <dd>![<%= t ".alt" %>](<%= t ".url" %>)</dd>
+
+  <dt><%= t ".codeblock" %></dt>
+  <dd>~~~<br><%= t ".codeblock" %><br>~~~</dd>
 </dl>