Merge branch 'master'

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

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index b503e45112f029da47c2e185678e6660a8517cde..c3f971d06bd6a24144e16a27cfe1768d87b354a4 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -4,8 +4,8 @@
 This plugin allows inserting arbitrary metadata into the source of a page.
 Enter the metadata as follows:
 
-       \[[meta field="value"]]
-       \[[meta field="value" param="value" param="value"]]
+       \[[!meta field="value"]]
+       \[[!meta field="value" param="value" param="value"]]
 
 The first form sets a given field to a given value, while the second form
 also specifies some additional sub-parameters.
@@ -58,16 +58,21 @@ Supported fields:
   a `.css` file in the wiki, so it cannot be used to add links to external
   stylesheets. Example:
 
-       \[[meta stylesheet=somestyle rel="alternate stylesheet"
+       \[[!meta stylesheet=somestyle rel="alternate stylesheet"
        title="somestyle"]]
 
 * openid
 
   Adds html <link> tags to perform OpenID delegation to an external
-  OpenID server. This lets you use an ikiwiki page as your OpenID. Example:
+  OpenID server (for `openid` and `openid2`). An optional `xrds-location`
+  parameter lets you specify the location of any [eXtensible Resource
+  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).
 
-       \\[[meta openid="http://joeyh.myopenid.com/"
-       server="http://www.myopenid.com/server"]]
+  This lets you use an ikiwiki page as your OpenID. Example:
+
+       \\[[!meta openid="http://joeyh.myopenid.com/"
+       server="http://www.myopenid.com/server"
+       xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
 * link
 
@@ -75,11 +80,11 @@ Supported fields:
   wiki treat one page as linking to another without displaying a user-visible
   [[ikiwiki/WikiLink]]:
 
-       \[[meta link=otherpage]]
+       \[[!meta link=otherpage]]
 
   It can also be used to insert a html <link> tag. For example:
 
-       \[[meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]
+       \[[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]
 
   However, this latter syntax won't be allowed if the [[htmlscrubber]] is
   enabled, since it can be used to insert unsafe content.
@@ -88,14 +93,14 @@ Supported fields:
 
   Causes the page to redirect to another page in the wiki.
 
-       \[[meta redir=otherpage]]
+       \[[!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/"]]
+       \[[!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.
@@ -107,7 +112,7 @@ Supported fields:
 
   Causes the robots meta tag to be written:
 
-        \[[meta robots="index, nofollow"]]
+        \[[!meta robots="index, nofollow"]]
 
   Valid values for the attribute are: "index", "noindex", "follow", and
   "nofollow". Multiple comma-separated values are allowed, but obviously only