* Allow dashes in preprocessor directive commands, and shortcuts.

[ikiwiki.git] / doc / plugins / meta.mdwn

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index 78a8c9339bdb225c65d1977d47b7d0e1063b7121..f97e267efe69cf36edeee6fd8e6e1a60f24f606b 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -19,7 +19,7 @@ You can use any field names you like, but here are some predefined ones:
 
   Specifies a link to another page. This can be used as a way to make the
   wiki treat one page as linking to another without displaying a user-visible
-  [[WikiLink]]:
+  [[ikiwiki/WikiLink]]:
 
        \[[meta link=otherpage]]
 
@@ -30,6 +30,22 @@ You can use any field names you like, but here are some predefined ones:
   However, this latter syntax won't be allowed if the [[htmlscrubber]] is
   enabled, since it can be used to insert unsafe content.
 
+* redir
+
+  Causes the page to redirect to another page in the wiki.
+
+       \[[meta redir=otherpage]]
+
+  Optionally, a delay (in seconds) can be specified. The default is to
+  redirect without delay.
+
+  It can also be used to redirect to an external url. For example:
+
+       \[[meta redir="http://example.com/"]]
+
+  However, this latter syntax won't be allowed if the [[htmlscrubber]] is
+  enabled, since it can be used to insert unsafe content.
+
 * title
 
   Overrides the title of the page, which is generally the same as the
@@ -41,7 +57,13 @@ You can use any field names you like, but here are some predefined ones:
 
 * license
 
-  Specifies a copyright license for the page, for example, "GPL".
+  Specifies a license for the page, for example, "GPL". Can contain
+  WikiLinks.
+
+* copyright
+
+  Specifies the copyright of the page, for example, "Copyright 2007 by
+  Joey Hess". Can contain WikiLinks.
 
 * author