t/git-cgi.t: fix race condition

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

diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 9c2147264d75b35ddc4381179c369261d782214b..984f685402f28993eb7b1a11a761c3430eacd910 100644 (file)
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -59,6 +59,15 @@ Supported fields:
   Specifies a short description for the page. This will be put in
   the html header, and can also be displayed by eg, the [[map]] directive.
 
   Specifies a short description for the page. This will be put in
   the html header, and can also be displayed by eg, the [[map]] directive.
 

+* keywords
+
+  Specifies keywords summarizing the contents of the page. This
+  information will be put in the html header.  Only letters,
+  numbers, spaces and commas are allowed in this string; other
+  characters are stripped.  Note that the majority of search
+  engines, including Google, do not use information from the
+  keywords header.
+

 * permalink
 
   Specifies a permanent link to the page, if different than the page
 * permalink
 
   Specifies a permanent link to the page, if different than the page


@@ -109,7 +118,7 @@ Supported fields:
 
        \[[!meta openid="http://joeyh.myopenid.com/"
        server="http://www.myopenid.com/server"
 
        \[[!meta openid="http://joeyh.myopenid.com/"
        server="http://www.myopenid.com/server"

-       xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
+       xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com"]]

 
 * link
 
 
 * link
 


@@ -133,8 +142,8 @@ Supported fields:
 
        \[[!meta redir=otherpage]]
 
 
        \[[!meta redir=otherpage]]
 

-  Optionally, a delay (in seconds) can be specified. The default is to
-  redirect without delay.
+  The default is to redirect without delay.
+  Optionally, a delay (in seconds) can be specified: "delay=10"

 
   It can also be used to redirect to an external url. For example:
 
 
   It can also be used to redirect to an external url. For example:
 


@@ -162,14 +171,13 @@ Supported fields:
 
 * guid
 
 
 * guid
 

-  Specifies a globally unique ID for a page. This guid should be a URI
-  (in particular, it can be `urn:uuid:` followed by a UUID, as per
-  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS
+  Specifies a globally unique ID for a page. This guid should be a URI,
+  and it will be used to identify the page's entry in RSS

   and Atom feeds. If not given, the default is to use the page's URL as its
   guid.
 
   This is mostly useful when a page has moved, to keep the guids for
   and Atom feeds. If not given, the default is to use the page's URL as its
   guid.
 
   This is mostly useful when a page has moved, to keep the guids for

-  pages unchanged and avoid_flooding_aggregators
+  pages unchanged and avoid flooding aggregators

   (see [[!iki tips/howto_avoid_flooding_aggregators]]).
 
 * updated
   (see [[!iki tips/howto_avoid_flooding_aggregators]]).
 
 * updated


@@ -181,6 +189,15 @@ Supported fields:
   value. The date/time can be given in any format that
   [[!cpan TimeDate]] can understand, just like the `date` field.
 
   value. The date/time can be given in any format that
   [[!cpan TimeDate]] can understand, just like the `date` field.
 

+* foaf
+
+  Adds a Friend of a Friend ([FOAF](http://wiki.foaf-project.org/w/Autodiscovery))
+  reference to a page.
+
+  Example:
+
+       \[[!meta foaf=foaf.rdf]]
+

 If the field is not one of the above predefined fields, the metadata will be
 written to the generated html page as a <meta> header. However, this
 won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled,
 If the field is not one of the above predefined fields, the metadata will be
 written to the generated html page as a <meta> header. However, this
 won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled,