##// END OF EJS Templates
Merged r15122 from trunk to 3.2-stable (#21747, #21899)...
Toshi MARUYAMA -
r14742:0b0a7a92d989
parent child
Show More
@@ -3,7 +3,7
3 <head>
3 <head>
4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 <meta http-equiv="Content-Style-Type" content="text/css" />
5 <meta http-equiv="Content-Style-Type" content="text/css" />
6 <title>Wiki formatting</title>
6 <title>Format de la Wiki</title>
7 <style type="text/css">
7 <style type="text/css">
8 h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
8 h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
9 body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
9 body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
@@ -20,46 +20,46 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
20 </head>
20 </head>
21 <body>
21 <body>
22
22
23 <h1>Wiki Syntax Quick Reference (Markdown)</h1>
23 <h1>Guia rapida de la Sintaxis de la Wiki (Markdown)</h1>
24
24
25 <table style="width:100%">
25 <table style="width:100%">
26 <tr><th colspan="3">Font Styles</th></tr>
26 <tr><th colspan="3">Font Styles</th></tr>
27 <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>
27 <tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Negreta" /></th><td style="width:50%;">**Negreta**</td><td style="width:50%;"><strong>Negreta</strong></td></tr>
28 <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>
28 <tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Cursiva" /></th><td>*Cursiva*</td><td><em>Cursiva</em></td></tr>
29 <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>
29 <tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Eliminat" /></th><td>~~Eliminat~~</td><td><del>Eliminat</del></td></tr>
30 <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>
30 <tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Codi en línia" /></th><td>`Codi en línia`</td><td><code>Codi en línia</code></td></tr>
31 <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>
31 <tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Linies de codi" /></th><td>~~~<br />&nbsp;linies<br />&nbsp;de codi<br />~~~</td><td>
32 <pre>
32 <pre>
33 lines
33 linies
34 of code
34 de codi
35 </pre>
35 </pre>
36 </td></tr>
36 </td></tr>
37
37
38 <tr><th colspan="3">Lists</th></tr>
38 <tr><th colspan="3">Llistes</th></tr>
39 <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>
39 <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br />&nbsp;&nbsp;* Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr>
40 <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>
40 <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista Ordenada" /></th><td>1. Article 1<br />&nbsp;&nbsp;&nbsp;1. Sub<br />2. Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr>
41
41
42 <tr><th colspan="3">Headings</th></tr>
42 <tr><th colspan="3">Capçaleres</th></tr>
43 <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>
43 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td># Títol 1</td><td><h1>Títol 1</h1></td></tr>
44 <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>
44 <tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Encapçament 2" /></th><td>## Títol 2</td><td><h2>Títol 2</h2></td></tr>
45 <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>
45 <tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Encapçament 3" /></th><td>### Títol 3</td><td><h3>Títol 3</h3></td></tr>
46
46
47 <tr><th colspan="3">Links</th></tr>
47 <tr><th colspan="3">Links</th></tr>
48 <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
48 <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
49 <tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr>
49 <tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr>
50
50
51 <tr><th colspan="3">Redmine links</th></tr>
51 <tr><th colspan="3">Redmine links</th></tr>
52 <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>
52 <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link a la pagina Wiki" /></th><td>[[Pagina Wiki]]</td><td><a href="#">Pagina Wiki</a></td></tr>
53 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
53 <tr><th></th><td>Assumpte #12</td><td>Assumpte <a href="#">#12</a></td></tr>
54 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
54 <tr><th></th><td>Revisió r43</td><td>Revisió <a href="#">r43</a></td></tr>
55 <tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
55 <tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
56 <tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
56 <tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
57
57
58 <tr><th colspan="3">Inline images</th></tr>
58 <tr><th colspan="3">Imatges</th></tr>
59 <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>
59 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td>![](<em>imatge_url</em>)</td><td></td></tr>
60 <tr><th></th><td>![](<em>attached_image</em>)</td><td></td></tr>
60 <tr><th></th><td>![](<em>imatge_adjunta</em>)</td><td></td></tr>
61
61
62 <tr><th colspan="3">Tables</th></tr>
62 <tr><th colspan="3">Taules</th></tr>
63 <tr>
63 <tr>
64 <th></th>
64 <th></th>
65 <td>| A | B | C |<br />|---|---|---|<br />| A | B | C |<br />| D | E | F |</td>
65 <td>| A | B | C |<br />|---|---|---|<br />| A | B | C |<br />| D | E | F |</td>
@@ -76,7 +76,7 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
76
76
77 </table>
77 </table>
78
78
79 <p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">More Information</a></p>
79 <p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">Més informació</a></p>
80
80
81 </body>
81 </body>
82 </html>
82 </html>
@@ -37,9 +37,9 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
37 </pre>
37 </pre>
38 </td></tr>
38 </td></tr>
39
39
40 <tr><th colspan="3">Lists</th></tr>
40 <tr><th colspan="3">Llistes</th></tr>
41 <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
41 <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br />** Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr>
42 <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
42 <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista ordenada" /></th><td># Article 1<br />## Sub<br /># Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr>
43
43
44 <tr><th colspan="3">Capçaleres</th></tr>
44 <tr><th colspan="3">Capçaleres</th></tr>
45 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td>h1. Títol 1</td><td><h1>Títol 1</h1></td></tr>
45 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td>h1. Títol 1</td><td><h1>Títol 1</h1></td></tr>
@@ -61,7 +61,7 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
61 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td>!<em>imatge_url</em>!</td><td></td></tr>
61 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td>!<em>imatge_url</em>!</td><td></td></tr>
62 <tr><th></th><td>!<em>imatge_adjunta</em>!</td><td></td></tr>
62 <tr><th></th><td>!<em>imatge_adjunta</em>!</td><td></td></tr>
63
63
64 <tr><th colspan="3">Tables</th></tr>
64 <tr><th colspan="3">Taules</th></tr>
65 <tr>
65 <tr>
66 <th></th>
66 <th></th>
67 <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
67 <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
General Comments 0
You need to be logged in to leave comments. Login now