summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2021-08-11 21:40:56 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2021-08-11 21:40:56 +0000
commit9af2ba2c13d2dc706bdf1387110c13b82175a0cf (patch)
treeeab705cebf67e7daaa30532a62dbdb1c8dfba205 /public
parentfe4d0d93da6f95408582e53b425e89fc40751f6f (diff)
downloadredmine-9af2ba2c13d2dc706bdf1387110c13b82175a0cf.tar.gz
redmine-9af2ba2c13d2dc706bdf1387110c13b82175a0cf.zip
Adds CommonMark Markdown (GitHub Flavored) as third text formatting option (#32424).
Patch by Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@21156 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public')
-rw-r--r--public/help/en/wiki_syntax_common_mark.html87
-rw-r--r--public/help/en/wiki_syntax_detailed_common_mark.html361
-rw-r--r--public/help/wiki_syntax_detailed.css3
3 files changed, 451 insertions, 0 deletions
diff --git a/public/help/en/wiki_syntax_common_mark.html b/public/help/en/wiki_syntax_common_mark.html
new file mode 100644
index 000000000..bda25b13b
--- /dev/null
+++ b/public/help/en/wiki_syntax_common_mark.html
@@ -0,0 +1,87 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Wiki formatting</title>
+<link rel="stylesheet" type="text/css" href="../wiki_syntax.css" />
+</head>
+<body>
+
+<h1>Wiki Syntax Quick Reference (CommonMark Markdown (GitHub Flavored))</h1>
+
+<table style="width:100%">
+<tr><th colspan="3">Font Styles <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#5" target="_blank">more</a>)</span></th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">**Strong**</td><td style="width:50%;"><strong>Strong</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>*Italic*</td><td><em>Italic</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>~~Deleted~~</td><td><del>Deleted</del></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>`Inline Code`</td><td><code>Inline Code</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>```<br />&nbsp;lines<br />&nbsp;of code<br />```</td><td>
+<pre>
+ lines
+ of code
+</pre>
+</td></tr>
+
+<tr><th colspan="3">Highlighted code <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#13" target="_blank">more</a>)</span></th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_precode.png" style="border: 1px solid #bbb;" alt="Highlighted code" /></th><td>```ruby<br />3.times do<br />&nbsp;&nbsp;puts 'Hello'<br />end<br />```</td><td>
+<pre><code class="ruby syntaxhl"><span class="mi">3</span><span class="p">.</span><span class="nf">times</span> <span class="k">do</span>
+ <span class="nb">puts</span> <span class="s1">'Hello'</span>
+<span class="k">end</span>
+</code></pre>
+</td></tr>
+
+<tr><th colspan="3">Line breaks and Paragraphs</th></tr>
+<tr><th></th><td>An empty line<br><br>creates<br>a new paragraph.</td><td><p>An empty line</p><p>creates a new paragraph.</p></td></tr>
+<tr><th></th><td>End a line with a backslash\<br> or two spaces to insert a manual line break.</td><td><p>End a line with a backslash<br>or two spaces to insert a manual line break.</p></td></tr>
+
+<tr><th colspan="3">Lists</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />&nbsp;&nbsp;* Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td>1. Item 1<br />&nbsp;&nbsp;&nbsp;1. Sub<br />2. Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+
+<tr><th colspan="3">Headings <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#8" target="_blank">more</a>)</span></th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td># Title 1</td><td><h1>Title 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>## Title 2</td><td><h2>Title 2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>### Title 3</td><td><h3>Title 3</h3></td></tr>
+
+<tr><th colspan="3">Links <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#4" target="_blank">more</a>)</span></th></tr>
+<tr><th></th><td>www.foo.bar</td><td><a href="#">www.foo.bar</a></td></tr>
+<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
+<tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr>
+
+<tr><th colspan="3">Redmine links <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#3" target="_blank">more</a>)</span></th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></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>##12</td><td><a href="#">Bug #12</a>: The issue subject</td></tr>
+<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
+<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
+
+<tr><th colspan="3">Inline images <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#7" target="_blank">more</a>)</span></th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>![](<em>image_url</em>)</td><td></td></tr>
+<tr><th></th><td>![](<em>attached_image</em>)</td><td></td></tr>
+
+<tr><th colspan="3">Tables</th></tr>
+<tr>
+ <th></th>
+ <td>| A | B | C |<br />|---|---|---|<br />| A | B | C |<br />| D | E | F |</td>
+ <td>
+ <table class="sample">
+ <tbody>
+ <th>A</th><th>B</th><th>C</th>
+ <tr><td>A</td><td>B</td><td>C</td></tr>
+ <tr><td>D</td><td>E</td><td>F</td></tr>
+ </tbody>
+ </table>
+ </td>
+</tr>
+
+<tr><th colspan="3">Raw HTML <span class="more_info">(<a href="wiki_syntax_detailed_common_mark.html#15" target="_blank">more</a>)</span></th></tr>
+<tr>
+ <th></th><td>HTML is &lt;del&gt;not&lt;/del&gt; &lt;u&gt;allowed&lt;/u&gt;.</td><td>HTML is <del>not</del> <u>allowed</u>.<td>
+</tr>
+
+</table>
+
+<p><a href="wiki_syntax_detailed_common_mark.html" onclick="window.open('wiki_syntax_detailed_common_mark.html', '', ''); return false;">More Information</a></p>
+</body>
+</html>
+
diff --git a/public/help/en/wiki_syntax_detailed_common_mark.html b/public/help/en/wiki_syntax_detailed_common_mark.html
new file mode 100644
index 000000000..64198fd17
--- /dev/null
+++ b/public/help/en/wiki_syntax_detailed_common_mark.html
@@ -0,0 +1,361 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>RedmineWikiFormatting (CommonMark Markdown (GitHub Flavored))</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="../wiki_syntax_detailed.css" />
+</head>
+
+<body>
+<h1><a name="1" class="wiki-page"></a>Wiki formatting (CommonMark Markdown (GitHub Flavored))</h1>
+
+ <ul class='toc'>
+ <li><a href='#2'>Links</a></li>
+ <ul>
+ <li><a href='#3'>Redmine links</a></li>
+ <li><a href='#4'>External links</a></li>
+ </ul>
+ <li><a href='#5'>Text formatting</a></li>
+ <ul>
+ <li><a href='#6'>Font style</a></li>
+ <li><a href='#7'>Inline images</a></li>
+ <li><a href='#8'>Headings</a></li>
+ <li><a href='#10'>Blockquotes</a></li>
+ <li><a href='#11'>Table of content</a></li>
+ <li><a href='#14'>Horizontal Rule</a></li>
+ </ul>
+ <li><a href='#12'>Macros</a></li>
+ <li><a href='#13'>Code highlighting</a></li>
+ <li><a href='#15'>Raw HTML</a></li>
+ </ul>
+
+ <h2><a name="2" class="wiki-page"></a>Links</h2>
+
+ <h3><a name="3" class="wiki-page"></a>Redmine links</h3>
+
+ <p>Redmine allows hyperlinking between resources (issues, changesets, wiki pages...) from anywhere wiki formatting is used.</p>
+ <ul>
+ <li>Link to an issue: <strong>#124</strong> (displays <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
+ <li>Link to an issue including tracker name and subject: <strong>##124</strong> (displays <a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (New)">Bug #124</a>: bulk edit doesn't change the category or fixed version properties)</li>
+ <li>Link to an issue note: <strong>#124-6</strong>, or <strong>#124#note-6</strong></li>
+ <li>Link to an issue note within the same issue: <strong>#note-6</strong></li>
+ </ul>
+
+ <p>Wiki links:</p>
+
+ <ul>
+ <li><strong>[[Guide]]</strong> displays a link to the page named 'Guide': <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[Guide#further-reading]]</strong> takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[#further-reading]]</strong> link to the anchor "further-reading" of the current page: <a href="#" class="wiki-page">#further-reading</a></li>
+ <li><strong>[[Guide|User manual]]</strong> displays a link to the same page but with a different text: <a href="#" class="wiki-page">User manual</a></li>
+ </ul>
+
+ <p>You can also link to pages of an other project wiki:</p>
+
+ <ul>
+ <li><strong>[[sandbox:some page]]</strong> displays a link to the page named 'Some page' of the Sandbox wiki</li>
+ <li><strong>[[sandbox:]]</strong> displays a link to the Sandbox wiki main page</li>
+ </ul>
+
+ <p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
+
+ <p>Links to other resources:</p>
+
+ <ul>
+ <li>Documents:
+ <ul>
+ <li><strong>document#17</strong> (link to document with id 17)</li>
+ <li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
+ <li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
+ <li><strong>sandbox:document:"Some document"</strong> (link to a document with title "Some document" in other project "sandbox")</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Versions:
+ <ul>
+ <li><strong>version#3</strong> (link to version with id 3)</li>
+ <li><strong>version:1.0.0</strong> (link to version named "1.0.0")</li>
+ <li><strong>version:"1.0 beta 2"</strong></li>
+ <li><strong>sandbox:version:1.0.0</strong> (link to version "1.0.0" in the project "sandbox")</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Attachments:
+ <ul>
+ <li><strong>attachment:file.zip</strong> (link to the attachment of the current object named file.zip)</li>
+ <li>For now, attachments of the current object can be referenced only (if you're on an issue, it's possible to reference attachments of this issue only)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Changesets:
+ <ul>
+ <li><strong>r758</strong> (link to a changeset)</li>
+ <li><strong>commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash)</li>
+ <li><strong>svn1|r758</strong> (link to a changeset of a specific repository, for projects with multiple repositories)</li>
+ <li><strong>commit:hg|c6f4d0fd</strong> (link to a changeset with a non-numeric hash of a specific repository)</li>
+ <li><strong>sandbox:r758</strong> (link to a changeset of another project)</li>
+ <li><strong>sandbox:commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash of another project)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Repository files:
+ <ul>
+ <li><strong>source:some/file</strong> (link to the file located at /some/file in the project's repository)</li>
+ <li><strong>source:some/file@52</strong> (link to the file's revision 52)</li>
+ <li><strong>source:some/file#L120</strong> (link to line 120 of the file)</li>
+ <li><strong>source:some/file@52#L120</strong> (link to line 120 of the file's revision 52)</li>
+ <li><strong>source:"some file@52#L120"</strong> (use double quotes when the URL contains spaces</li>
+ <li><strong>export:some/file</strong> (force the download of the file)</li>
+ <li><strong>source:svn1|some/file</strong> (link to a file of a specific repository, for projects with multiple repositories)</li>
+ <li><strong>sandbox:source:some/file</strong> (link to the file located at /some/file in the repository of the project "sandbox")</li>
+ <li><strong>sandbox:export:some/file</strong> (force the download of the file)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Forums:
+ <ul>
+ <li><strong>forum#1</strong> (link to forum with id 1</li>
+ <li><strong>forum:Support</strong> (link to forum named Support)</li>
+ <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Forum messages:
+ <ul>
+ <li><strong>message#1218</strong> (link to message with id 1218)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Projects:
+ <ul>
+ <li><strong>project#3</strong> (link to project with id 3)</li>
+ <li><strong>project:some-project</strong> (link to project with name or slug of "some-project")</li>
+ <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>News:
+ <ul>
+ <li><strong>news#2</strong> (link to news item with id 2)</li>
+ <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
+ <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <ul>
+ <li>Users:
+ <ul>
+ <li><strong>user#2</strong> (link to user with id 2)</li>
+ <li><strong>user:jsmith</strong> (Link to user with login jsmith)</li>
+ <li><strong>@jsmith</strong> (Link to user with login jsmith)</li>
+ </ul>
+ </li>
+ </ul>
+
+ <p>Escaping:</p>
+
+ <ul>
+ <li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
+ </ul>
+
+
+ <h3><a name="4" class="wiki-page"></a>External links</h3>
+
+ <p>URLs (starting with: www, http, https, ftp, ftps, sftp and sftps) and email addresses are automatically turned into clickable links:</p>
+
+<pre>
+http://www.redmine.org, someone@foo.bar
+</pre>
+
+ <p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p>
+
+ <p>If you want to display a specific text instead of the URL, you can use the standard markdown syntax:</p>
+
+<pre>
+[Redmine web site](http://www.redmine.org)
+</pre>
+
+ <p>displays: <a href="http://www.redmine.org" class="external">Redmine web site</a></p>
+
+
+ <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
+
+<p>For things such as headlines, bold, tables, lists, Redmine supports Markdown syntax according to <a class="external" href="https://commonmark.org/">CommonMark</a> including some extensions commonly referred to as <em>GitHub flavored Markdown</em>. See the <a class="external" href="https://github.github.com/gfm">GitHub Flavored Markdown Spec</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p>
+
+ <h3><a name="6" class="wiki-page"></a>Font style</h3>
+
+<pre>
+* **bold**
+* *Italic*
+* ***bold italic***
+* ~~strike-through~~
+</pre>
+
+ <p>Display:</p>
+
+ <ul>
+ <li><strong>bold</strong></li>
+ <li><em>italic</em></li>
+ <li><em><strong>bold italic</strong></em></li>
+ <li><del>strike-through</del></li>
+ </ul>
+
+ <h3><a name="7" class="wiki-page"></a>Inline images</h3>
+
+ <ul>
+ <li><strong>![](image_url)</strong> displays an image located at image_url (markdown syntax)</li>
+ <li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong>![](attached_image)</strong></li>
+ <li>Images in your computer's clipboard can be pasted directly using Ctrl-v or Command-v.</li>
+ <li>Image files can be dragged onto the text area in order to be uploaded and embedded.</li>
+ </ul>
+
+ <h3><a name="8" class="wiki-page"></a>Headings</h3>
+
+<pre>
+# Heading
+## Subheading
+### Subsubheading
+</pre>
+
+ <p>Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
+
+
+ <h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
+
+ <p>Start the paragraph with <strong>&gt;</strong></p>
+
+<pre>
+&gt; Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
+To go live, all you need to add is a database and a web server.
+</pre>
+
+ <p>Display:</p>
+
+ <blockquote>
+ <p>Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.<br />To go live, all you need to add is a database and a web server.</p>
+ </blockquote>
+
+
+ <h3><a name="11" class="wiki-page"></a>Table of content</h3>
+
+<pre>
+{{toc}} =&gt; left aligned toc
+{{&gt;toc}} =&gt; right aligned toc
+</pre>
+
+ <h3><a name="14" class="wiki-page"></a>Horizontal Rule</h3>
+
+<pre>
+---
+</pre>
+
+ <h2><a name="12" class="wiki-page"></a>Macros</h2>
+
+ <p>Redmine has the following builtin macros:</p>
+
+ <p>
+ <dl>
+ <dt><code>hello_world</code></dt>
+ <dd><p>Sample macro.</p></dd>
+
+ <dt><code>macro_list</code></dt>
+ <dd><p>Displays a list of all available macros, including description if available.</p></dd>
+
+ <dt><code>child_pages</code></dt>
+ <dd><p>Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:</p>
+ <pre><code>{{child_pages}} -- can be used from a wiki page only
+{{child_pages(depth=2)}} -- display 2 levels nesting only</code></pre></dd>
+
+ <dt><code>include</code></dt>
+ <dd><p>Include a wiki page. Example:</p>
+ <pre><code>{{include(Foo)}}</code></pre>
+ <p>or to include a page of a specific project wiki:</p>
+ <pre><code>{{include(projectname:Foo)}}</code></pre></dd>
+
+ <dt><code>collapse</code></dt>
+ <dd><p>Inserts of collapsed block of text. Example:</p>
+ <pre><code>{{collapse(View details...)
+This is a block of text that is collapsed by default.
+It can be expanded by clicking a link.
+}}</code></pre></dd>
+
+ <dt><code>thumbnail</code></dt>
+ <dd><p>Displays a clickable thumbnail of an attached image. Examples:</p>
+ <pre>{{thumbnail(image.png)}}
+{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre></dd>
+
+ <dt><code>issue</code></dt>
+ <dd><p>Inserts a link to an issue with flexible text. Examples:</p>
+ <pre>{{issue(123)}} -- Issue #123: Enhance macro capabilities
+{{issue(123, project=true)}} -- Andromeda - Issue #123:Enhance macro capabilities
+{{issue(123, tracker=false)}} -- #123: Enhance macro capabilities
+{{issue(123, subject=false, project=true)}} -- Andromeda - Issue #123</pre></dd>
+ </dl>
+ </p>
+
+ <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
+
+ <p>Default code highlighting relies on <a href="http://rouge.jneen.net/" class="external">Rouge</a>, a syntax highlighting library written in pure Ruby. It supports many commonly used languages such as <strong>c</strong>, <strong>cpp</strong> (c++), <strong>csharp</strong> (c#, cs), <strong>css</strong>, <strong>diff</strong> (patch, udiff), <strong>go</strong> (golang), <strong>groovy</strong>, <strong>html</strong>, <strong>java</strong>, <strong>javascript</strong> (js), <strong>kotlin</strong>, <strong>objective_c</strong> (objc), <strong>perl</strong> (pl), <strong>php</strong>, <strong>python</strong> (py), <strong>r</strong>, <strong>ruby</strong> (rb), <strong>sass</strong>, <strong>scala</strong>, <strong>shell</strong> (bash, zsh, ksh, sh), <strong>sql</strong>, <strong>swift</strong>, <strong>xml</strong> and <strong>yaml</strong> (yml) languages, where the names inside parentheses are aliases. Please refer to <a href="https://www.redmine.org/projects/redmine/wiki/RedmineCodeHighlightingLanguages" class="external">https://www.redmine.org/projects/redmine/wiki/RedmineCodeHighlightingLanguages</a> for the full list of supported languages.</p>
+
+ <p>You can highlight code at any place that supports wiki formatting using this syntax (note that the language name or alias is case-insensitive):</p>
+
+<pre>
+```ruby
+ Place your code here.
+```
+</pre>
+
+ <p>Example:</p>
+
+<pre><code class="ruby syntaxhl"><span class="c1"># The Greeter class</span>
+<span class="k">class</span> <span class="nc">Greeter</span>
+ <span class="k">def</span> <span class="nf">initialize</span><span class="p">(</span><span class="nb">name</span><span class="p">)</span>
+ <span class="vi">@name</span> <span class="o">=</span> <span class="nb">name</span><span class="p">.</span><span class="nf">capitalize</span>
+ <span class="k">end</span>
+
+ <span class="k">def</span> <span class="nf">salute</span>
+ <span class="nb">puts</span> <span class="s2">"Hello </span><span class="si">#{</span><span class="vi">@name</span><span class="si">}</span><span class="s2">!"</span>
+ <span class="k">end</span>
+<span class="k">end</span>
+</code></pre>
+
+ <h2><a name="15" class="wiki-page"></a>Raw HTML</h2>
+
+ <p>You may use raw HTML for more complex formatting tasks, i.e. complex tables with cells spanning multiple rows or columns:</p>
+
+ <pre><code>
+ &lt;table width="50%"&gt;
+ &lt;tr&gt;&lt;td rowspan="2"&gt;Two rows&lt;/td&gt;&lt;td&gt;foo&lt;/td&gt;&lt;/tr&gt;
+ &lt;tr&gt;&lt;td&gt;bar&lt;/td&gt;&lt;/tr&gt;
+ &lt;tr&gt;&lt;td align="center" colspan="2"&gt;bar&lt;/td&gt;&lt;/tr&gt;
+ &lt;/table&gt;
+ </code></pre>
+
+ <p>yields</p>
+
+<table width="50%" class="sample">
+<tr><td rowspan="2">Two rows</td><td>foo</td></tr>
+<tr><td>bar</td></tr>
+<tr><td align="center" colspan="2">bar</td></tr>
+</table>
+
+</body>
+</html>
+
diff --git a/public/help/wiki_syntax_detailed.css b/public/help/wiki_syntax_detailed.css
index ab37aff7b..4e99410fe 100644
--- a/public/help/wiki_syntax_detailed.css
+++ b/public/help/wiki_syntax_detailed.css
@@ -15,6 +15,9 @@ a, a:link, a:visited{ color: #169; text-decoration: none; }
a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
a.new { color: #b73535; }
+table.sample { border-collapse: collapse; border-spacing: 0; margin: 4px; margin-left: 30px;}
+table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: 1em; }
+
.syntaxhl .c1 { color: #888888 }
.syntaxhl .k { color: #008800; font-weight: bold }
.syntaxhl .nc { color: #BB0066; font-weight: bold }