diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 96295004a..94581104f 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -5,8 +5,8 @@
 <%= error_messages_for 'content' %>
 <div class="contextual">
 <%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
-                            :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
+<%= link_to l(:label_help), '/help/wiki_syntax.html',
+                            :onclick => "window.open('#{ url_for '/help/wiki_syntax.html' }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
 </div>
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
new file mode 100644
index 000000000..f02eb62ab
--- /dev/null
+++ b/public/help/wiki_syntax.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Wiki formatting</title>
+<link rel="stylesheet" href="html.css" type="text/css">
+<style>
+h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
+table { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
+table td code { font-size: 1.2em; }
+table td h1 { font-size: 1.8em; text-align: left; }
+table td h2 { font-size: 1.4em; text-align: left; }
+table td h3 { font-size: 1.2em; text-align: left; }
+
+</style>
+</head>
+<body>
+
+<h1>Wiki Syntax Quick Reference</h1>
+
+<table width="100%">
+<tr><th colspan="3">Font Styles</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr>
+<tr><th></th><td>&lt;pre><br>&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
+<pre>
+ lines
+ of code
+</pre>
+</td></tr>
+
+<tr><th colspan="3">Lists</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
+
+<tr><th colspan="3">Headings</th></tr>
+<tr><th></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
+<tr><th></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+
+<tr><th colspan="3">Links</th></tr>
+<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
+<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
+<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+
+<tr><th colspan="3">Inline images</th></tr>
+<tr><th></th><td>!<em>image_url</em>!</td><td></td></tr>
+<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Font Styles
	Strong	Strong
	_Italic_	Italic
	+Underline+	Underline
	-Deleted-	~~Deleted~~
	??Quote??	Quote
	@Code@	`Code`
	<pre> lines of code </pre>	+ + lines + of code + +
Lists
	* Item 1 * Item 2	Item 1 Item 2
	# Item 1 # Item 2	Item 1 Item 2
Headings
	h1. Title 1	Title 1
	h2. Title 2	Title 2
	h3. Title 3	Title 3
Links
	http://foo.bar	http://foo.bar
	[[Wiki page]]	Wiki page
	Issue #12	Issue #12
	Revision r43	Revision r43
Inline images
	!image_url!
	!attached_image!