Include new standard macros in wiki syntax detailed help pages (#17847).

Contributed by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@13378 e93f8b46-1217-0410-a6f0-8f06a7374b81

48 files changed, 1536 insertions, 202 deletions

diff --git a/public/help/ar/wiki_syntax_detailed.html b/public/help/ar/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/ar/wiki_syntax_detailed.html
+++ b/public/help/ar/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/az/wiki_syntax_detailed.html b/public/help/az/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/az/wiki_syntax_detailed.html
+++ b/public/help/az/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/bg/wiki_syntax_detailed.html b/public/help/bg/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/bg/wiki_syntax_detailed.html
+++ b/public/help/bg/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/bs/wiki_syntax_detailed.html b/public/help/bs/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/bs/wiki_syntax_detailed.html
+++ b/public/help/bs/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/ca/wiki_syntax_detailed.html b/public/help/ca/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/ca/wiki_syntax_detailed.html
+++ b/public/help/ca/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/cs/wiki_syntax_detailed.html b/public/help/cs/wiki_syntax_detailed.html
index 7b6321b1a..011f5188c 100644
--- a/public/help/cs/wiki_syntax_detailed.html
+++ b/public/help/cs/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ Vše, co je potřeba, je databázový a webový server.
 
     <p>Redmine obsahuje následující vestavěná makra:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Jednoduché makro.</p></dd><dt><code>include</code></dt><dd><p>Vloží Wiki stránku. Např.:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Zobrazí seznam všech dostupných maker, včetně jejich popisu, existuje-li.</p></dd></dl></p>
-
+    <p>
+    <dl>
+      <dt><code>hello_world</code></dt>
+      <dd><p>Jednoduché makro.</p></dd>
+
+      <dt><code>macro_list</code></dt>
+      <dd><p>Zobrazí seznam všech dostupných maker, včetně jejich popisu, existuje-li.</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>Vloží Wiki stránku. Např.:</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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Zvýrazňování kódu</h2>
 
diff --git a/public/help/da/wiki_syntax_detailed.html b/public/help/da/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/da/wiki_syntax_detailed.html
+++ b/public/help/da/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/de/wiki_syntax_detailed.html b/public/help/de/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/de/wiki_syntax_detailed.html
+++ b/public/help/de/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/el/wiki_syntax_detailed.html b/public/help/el/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/el/wiki_syntax_detailed.html
+++ b/public/help/el/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/en-gb/wiki_syntax_detailed.html b/public/help/en-gb/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/en-gb/wiki_syntax_detailed.html
+++ b/public/help/en-gb/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/en/wiki_syntax_detailed.html b/public/help/en/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/en/wiki_syntax_detailed.html
+++ b/public/help/en/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/es/wiki_syntax_detailed.html b/public/help/es/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/es/wiki_syntax_detailed.html
+++ b/public/help/es/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/et/wiki_syntax_detailed.html b/public/help/et/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/et/wiki_syntax_detailed.html
+++ b/public/help/et/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/eu/wiki_syntax_detailed.html b/public/help/eu/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/eu/wiki_syntax_detailed.html
+++ b/public/help/eu/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/fa/wiki_syntax_detailed.html b/public/help/fa/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/fa/wiki_syntax_detailed.html
+++ b/public/help/fa/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/fi/wiki_syntax_detailed.html b/public/help/fi/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/fi/wiki_syntax_detailed.html
+++ b/public/help/fi/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/fr/wiki_syntax_detailed.html b/public/help/fr/wiki_syntax_detailed.html
index 2d6971ee0..a08876aea 100644
--- a/public/help/fr/wiki_syntax_detailed.html
+++ b/public/help/fr/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ Pour commencer à l'utiliser, il ne vous faut qu'un serveur web et une base de d
 
     <p>Redmine possède les macros suivantes:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Macro d'exemple.</p></dd><dt><code>include</code></dt><dd><p>Inclue une page Wiki. Exemple:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Affiche une liste de toute les macros disponilbes, les descriptions sont inclues si celles-ci sont disponibles.</p></dd></dl></p>
-
+    <p>
+    <dl>
+      <dt><code>hello_world</code></dt>
+      <dd><p>Macro d'exemple.</p></dd>
+
+      <dt><code>macro_list</code></dt>
+      <dd><p>Affiche une liste de toutes les macros disponibles, les descriptions sont incluses si celles-ci sont disponibles.</p></dd>
+
+      <dt><code>child_pages</code></dt>
+      <dd><p>Affiche une liste des sous-pages. Sans argument, cela affiche les sous-pages de la page courante. Exemples :</p>
+      <pre><code>!{{child_pages}} -- peut être utilisé depuis une page wiki uniquement
+!{{child_pages(depth=2)}} -- affiche deux niveaux d'arborescence seulement</code></pre></dd>
+
+      <dt><code>include</code></dt>
+      <dd><p>Inclut une page Wiki. Exemple :</p>
+      <pre><code>!{{include(Foo)}}</code></pre>
+      <p>ou pour inclure une page d'un wiki de projet spécifique :</p>
+      <pre><code>!{{include(projectname:Foo)}}</code></pre></dd>
+
+      <dt><code>collapse</code></dt>
+      <dd><p>Insère un bloc de texte enroulé. Exemple :</p>
+      <pre><code>{{collapse(Voir les détails...)
+Ceci est un bloc de texte qui est caché par défaut.
+Il peut être déroulé en cliquant sur le lien.
+}}</code></pre></dd>
+
+      <dt><code>thumbnail</code></dt>
+      <dd><p>Affiche une miniature cliquable d'une image jointe. Exemples :</p>
+      <pre>{{thumbnail(image.png)}}
+{{thumbnail(image.png, size=300, title=Miniature)}}</pre></dd>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Coloration syntaxique</h2>
 
diff --git a/public/help/gl/wiki_syntax_detailed.html b/public/help/gl/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/gl/wiki_syntax_detailed.html
+++ b/public/help/gl/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/he/wiki_syntax_detailed.html b/public/help/he/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/he/wiki_syntax_detailed.html
+++ b/public/help/he/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/hr/wiki_syntax_detailed.html b/public/help/hr/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/hr/wiki_syntax_detailed.html
+++ b/public/help/hr/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/hu/wiki_syntax_detailed.html b/public/help/hu/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/hu/wiki_syntax_detailed.html
+++ b/public/help/hu/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/id/wiki_syntax_detailed.html b/public/help/id/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/id/wiki_syntax_detailed.html
+++ b/public/help/id/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/it/wiki_syntax_detailed.html b/public/help/it/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/it/wiki_syntax_detailed.html
+++ b/public/help/it/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/ja/wiki_syntax_detailed.html b/public/help/ja/wiki_syntax_detailed.html
index 60261cd43..8d49296f5 100644
--- a/public/help/ja/wiki_syntax_detailed.html
+++ b/public/help/ja/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmineには以下の組み込みマクロが用意されています:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>サンプルのマクロです。</p></dd><dt><code>include</code></dt><dd><p>別のWikiページの内容を挿入します。 以下は使用例です:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>上記のマクロを含め、利用可能なマクロの一覧を表示します。</p></dd></dl></p>
-
+    <p>
+    <dl>
+      <dt><code>hello_world</code></dt>
+      <dd><p>サンプルのマクロです。</p></dd>
+
+      <dt><code>macro_list</code></dt>
+      <dd><p>上記のマクロを含め、利用可能なマクロの一覧を表示します。</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>別のWikiページの内容を挿入します。 以下は使用例です:</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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>コードハイライト</h2>
 
diff --git a/public/help/ko/wiki_syntax_detailed.html b/public/help/ko/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/ko/wiki_syntax_detailed.html
+++ b/public/help/ko/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/lt/wiki_syntax_detailed.html b/public/help/lt/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/lt/wiki_syntax_detailed.html
+++ b/public/help/lt/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/lv/wiki_syntax_detailed.html b/public/help/lv/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/lv/wiki_syntax_detailed.html
+++ b/public/help/lv/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/mk/wiki_syntax_detailed.html b/public/help/mk/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/mk/wiki_syntax_detailed.html
+++ b/public/help/mk/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/mn/wiki_syntax_detailed.html b/public/help/mn/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/mn/wiki_syntax_detailed.html
+++ b/public/help/mn/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/nl/wiki_syntax_detailed.html b/public/help/nl/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/nl/wiki_syntax_detailed.html
+++ b/public/help/nl/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/no/wiki_syntax_detailed.html b/public/help/no/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/no/wiki_syntax_detailed.html
+++ b/public/help/no/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/pl/wiki_syntax_detailed.html b/public/help/pl/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/pl/wiki_syntax_detailed.html
+++ b/public/help/pl/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/pt-br/wiki_syntax_detailed.html b/public/help/pt-br/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/pt-br/wiki_syntax_detailed.html
+++ b/public/help/pt-br/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/pt/wiki_syntax_detailed.html b/public/help/pt/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/pt/wiki_syntax_detailed.html
+++ b/public/help/pt/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/ro/wiki_syntax_detailed.html b/public/help/ro/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/ro/wiki_syntax_detailed.html
+++ b/public/help/ro/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/ru/wiki_syntax_detailed.html b/public/help/ru/wiki_syntax_detailed.html
index 628e509d1..c5a3216cb 100644
--- a/public/help/ru/wiki_syntax_detailed.html
+++ b/public/help/ru/wiki_syntax_detailed.html
@@ -285,20 +285,38 @@ bq. Rails - это полноценный, многоуровневый фрей
 
 <p>В Redmine существуют следующие встроенные макросы:</p>
 
-<p>
-<dl>
-    <dt><code>hello_world</code></dt>
-    <dd><p>Некоторый макрос.</p></dd>
-    <dt><code>include</code></dt>
-    <dd><p>Вставить wiki страницу. Пример:</p>
-
-        <pre><code>{{include(Foo)}}</code></pre>
-    </dd>
-    <dt><code>macro_list</code></dt>
-    <dd><p>Выводит список доступных макросов с описаниями, если они имеются.</p></dd>
-</dl>
-</p>
-
+    <p>
+    <dl>
+      <dt><code>hello_world</code></dt>
+      <dd><p>Некоторый макрос.</p></dd>
+
+      <dt><code>macro_list</code></dt>
+      <dd><p>Выводит список доступных макросов с описаниями, если они имеются.</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>Вставить wiki страницу. Пример:</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>
+    </dl>
+    </p>
 
 <h2><a name="13" class="wiki-page"></a>Подсветка кода</h2>
 
diff --git a/public/help/sk/wiki_syntax_detailed.html b/public/help/sk/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sk/wiki_syntax_detailed.html
+++ b/public/help/sk/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/sl/wiki_syntax_detailed.html b/public/help/sl/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sl/wiki_syntax_detailed.html
+++ b/public/help/sl/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/sq/wiki_syntax_detailed.html b/public/help/sq/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sq/wiki_syntax_detailed.html
+++ b/public/help/sq/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/sr-yu/wiki_syntax_detailed.html b/public/help/sr-yu/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sr-yu/wiki_syntax_detailed.html
+++ b/public/help/sr-yu/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/sr/wiki_syntax_detailed.html b/public/help/sr/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sr/wiki_syntax_detailed.html
+++ b/public/help/sr/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/sv/wiki_syntax_detailed.html b/public/help/sv/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/sv/wiki_syntax_detailed.html
+++ b/public/help/sv/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/th/wiki_syntax_detailed.html b/public/help/th/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/th/wiki_syntax_detailed.html
+++ b/public/help/th/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/tr/wiki_syntax_detailed.html b/public/help/tr/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/tr/wiki_syntax_detailed.html
+++ b/public/help/tr/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/uk/wiki_syntax_detailed.html b/public/help/uk/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/uk/wiki_syntax_detailed.html
+++ b/public/help/uk/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/vi/wiki_syntax_detailed.html b/public/help/vi/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/vi/wiki_syntax_detailed.html
+++ b/public/help/vi/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
diff --git a/public/help/zh-tw/wiki_syntax_detailed.html b/public/help/zh-tw/wiki_syntax_detailed.html
index 7d1ba9686..4bff71691 100644
--- a/public/help/zh-tw/wiki_syntax_detailed.html
+++ b/public/help/zh-tw/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine 內建下列巨集：</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>範例巨集。</p></dd><dt><code>include</code></dt><dd><p>引入一個 wiki 頁面。例子：</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>顯示所有可用巨集的清單，若巨集有提供說明也會一併顯示。</p></dd></dl></p>
-
+    <p>
+    <dl>
+      <dt><code>hello_world</code></dt>
+      <dd><p>範例巨集。</p></dd>
+
+      <dt><code>macro_list</code></dt>
+      <dd><p>顯示所有可用巨集的清單，若巨集有提供說明也會一併顯示。</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>引入一個 wiki 頁面。例子：</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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>程式碼醒目提示</h2>
 
diff --git a/public/help/zh/wiki_syntax_detailed.html b/public/help/zh/wiki_syntax_detailed.html
index 862aac9d7..0049db314 100644
--- a/public/help/zh/wiki_syntax_detailed.html
+++ b/public/help/zh/wiki_syntax_detailed.html
@@ -253,10 +253,38 @@ To go live, all you need to add is a database and a web server.
 
     <p>Redmine has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
-
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></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>
+    </dl>
+    </p>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>