diff public/help/wiki_syntax.html @ 1116:bb32da3bea34 redmine-2.2-integration

Merge from live

--- a/public/help/wiki_syntax.html	Mon Jan 07 12:01:42 2013 +0000
+++ b/public/help/wiki_syntax.html	Mon Jan 07 14:41:20 2013 +0000
@@ -44,11 +44,15 @@
 <tr><th><img src="../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. 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>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
 
+<tr><th colspan="3">Table of contents</th></tr>
+<tr><th></th><td><pre>{{toc}}</pre></td><td>Left-aligned table of contents</td></tr>
+<tr><th></th><td><pre>{{>toc}}</pre></td><td>Right-aligned table of contents</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></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
 
-<tr><th colspan="3">Redmine links</th></tr>
+<tr><th colspan="3">Magic links</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>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>