From d64e1c48ae0b91b2fd47e9d939f434bc14de1c22 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Date: Thu, 11 Sep 2014 21:25:37 +0000
Subject: Include new standard macros in wiki syntax detailed help pages
 (#17847).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@13378 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/da/wiki_syntax_detailed.html | 36 ++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'public/help/da')

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>
 
-- 
cgit v1.2.3