merge updated translations from l10n

[git.ikiwiki.info.git] / doc / ikiwiki / formatting.mdwn

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index 69e28913f3a96d4c035ca9ad4d0b5ae93269a778..befbce9aa421b3255bf8bb4012c898e38030e1b9 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -1,4 +1,5 @@
-[[meta title="Formatting wiki pages"]]
+[[!meta title="Formatting wiki pages"]]
+[[!meta robots="noindex, follow"]]
 
 Text on this wiki is, by default, written in a form very close to how you
 might write text for an email message. This style of text formatting is
@@ -6,7 +7,7 @@ called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
+You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 
 To create a list, start each line with an asterisk:
@@ -59,36 +60,47 @@ you use the following additional features:
 * To link to another page on the wiki, place the page's name inside double
   square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
 
-[[if test="enabled(smiley) and smileys" then="""
+[[!if test="enabled(smiley) and smileys" then="""
 * Insert [[smileys]] and some other useful symbols. :-)
 """]]
 
-[[if test="enabled(shortcut) and shortcuts" then="""
+[[!if test="enabled(shortcut) and shortcuts" then="""
 * Use [[shortcuts]] to link to common resources.
 
-       \[[wikipedia War\_of\_1812]]
+       \[[!wikipedia War\_of\_1812]]
 """]]
 
-[[if test="enabled(toc)" then="""
-* Add a table of contents to a page:
+[[!if test="enabled(template) and templates" then="""
+* Create and fill out [[templates]] for repeated chunks of
+  parameterized wiki text.
+"""]]
+
+* Insert various [[directives|directive]] onto a page to perform useful
+  actions.
+[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
+  For example, you can:
+"""]]
+
+[[!if test="enabled(toc)" then="""
+  * Add a table of contents to a page:
 
-       \[[toc ]]
+       \[[!toc]]
 """]]
 
 
-[[if test="enabled(meta)" then="""
-* Change the title of a page:
+[[!if test="enabled(meta)" then="""
+  * Change the title of a page:
 
-       \[[meta title="full page title"]]
+       \[[!meta title="full page title"]]
 """]]
 
-[[if test="enabled(inline) and blog" then="""
-* Create a [[blog]] by inlining a set of pages:
+[[!if test="enabled(inline)" then="""
+  * Create a blog by inlining a set of pages:
 
-       \[[inline pages="blog/*"]]
+       \[[!inline pages="blog/*"]]
 """]]
 
-[[if test="enabled(template) and templates" then="""
-* Create and fill out [[templates]] for repeated chunks of
-  parameterized wiki text.
+[[!if test="enabled(listdirectives)" then="""
+  Full list of [[directives|directive]] enabled for this wiki:
+  [[!listdirectives ]]
 """]]