Merge branch 'master' into clean

1 files changed, 964 insertions, 699 deletions

diff --git a/po/basewiki.pot b/po/basewiki.pot
index 769141b..ff359ff 100644
--- a/po/basewiki.pot
+++ b/po/basewiki.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki basewiki 2.47\n"
-"POT-Creation-Date: 2008-05-31 17:46+0200\n"
+"Project-Id-Version: ikiwiki basewiki 2.56\n"
+"POT-Creation-Date: 2008-08-04 00:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,175 +16,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit"
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:1
+#: blog.mdwn:1
 #, no-wrap
-msgid "[[!meta title=\"OpenID\"]]\n"
+msgid "[[!meta redir=ikiwiki/blog delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:2 ikiwiki/wikilink.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/pagespec.mdwn:1 ikiwiki/preprocessordirective.mdwn:1 ikiwiki/markdown.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/subpage.mdwn:1 templates.mdwn:1 openid.mdwn:2 wikilink.mdwn:2 ikiwiki.mdwn:1 blog.mdwn:2 pagespec.mdwn:2 preprocessordirective.mdwn:2 markdown.mdwn:2 helponformatting.mdwn:2 subpage.mdwn:2
+#: blog.mdwn:2 helponformatting.mdwn:2 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/preprocessordirective.mdwn:1 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 markdown.mdwn:2 openid.mdwn:2 pagespec.mdwn:2 preprocessordirective.mdwn:2 subpage.mdwn:2 templates.mdwn:1 wikilink.mdwn:2
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:7
-#, no-wrap
+#: blog.mdwn:6
 msgid ""
-"[[!if test=\"enabled(openid)\"\n"
-"     then=\"This wiki has OpenID **enabled**.\"\n"
-"     else=\"This wiki has OpenID **disabled**.\"]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/openid.mdwn:11
-msgid ""
-"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
-"allows you to have one login that you can use on a growing number of "
-"websites."
+"This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your "
+"links, as this redirection page will be removed in a future ikiwiki release."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:13
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[Videntity](http://videntity.org/)"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid ""
-"or any of the [many others out "
-"there](http://openiddirectory.com/openid-providers-c-1.html)."
+#: helponformatting.mdwn:1
+#, no-wrap
+msgid "[[!meta redir=ikiwiki/formatting delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:27
-#, no-wrap
+#: helponformatting.mdwn:6
 msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
-"the\n"
-"signin form. You do not need to give this wiki a password or go through "
-"any\n"
-"registration process when using OpenID.\n"
-"\"\"\"]]\n"
+"This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please "
+"update your links, as this redirection page will be removed in a future "
+"ikiwiki release."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/openid.mdwn:28
+#: ikiwiki.mdwn:6
 #, no-wrap
-msgid "---\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/openid.mdwn:32
 msgid ""
-"It's also possible to make a page in the wiki usable as an OpenID url, by "
-"delegating it to an openid server. Here's an example of how to do that:"
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/wikilink.mdwn:1
-#, no-wrap
-msgid ""
-"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
-"\t       server=\"http://www.myopenid.com/server\"]]\n"
+#: ikiwiki.mdwn:8
+msgid "Some documentation on using ikiwiki:"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:5
-msgid ""
-"WikiLinks provide easy linking between pages of the wiki. To create a "
-"[[WikiLink]], just put the name of the page to link to in double brackets.  "
-"For example `\\[[WikiLink]]`."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/formatting]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:8
-msgid ""
-"If you ever need to write something like `\\[[WikiLink]]` without creating a "
-"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/blog]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:11
-msgid ""
-"There are some special [[SubPage/LinkingRules]] that come into play when "
-"linking between [[SubPages|SubPage]]."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/pagespec]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:14
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/PreprocessorDirective]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:18
-msgid ""
-"WikiLinks are matched with page names in a case-insensitive manner, so you "
-"don't need to worry about getting the case the same, and can capitalise "
-"links at the start of a sentence, and so on."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/wikilink]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:22
-msgid ""
-"It's also possible to write a WikiLink that uses something other than the "
-"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
-"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/markdown]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:25
-msgid ""
-"To link to an anchor inside a page, you can use something like "
-"`\\[[WikiLink#foo]]`"
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/subpage]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/wikilink.mdwn:26
-#, no-wrap
-msgid "## Preprocessor directives and wikilinks\n"
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/openid]]"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:1
-msgid ""
-"ikiwiki has two syntaxes for "
-"[[preprocessor_directives|PreprocessorDirective]].  The older syntax used "
-"spaces to distinguish between preprocessor directives and wikilinks; as a "
-"result, with that syntax in use, you cannot use spaces in WikiLinks, and "
-"must replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+# type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/searching]]"
 msgstr ""
 
 # type: Plain text
@@ -294,17 +215,17 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/blog.mdwn:49
 msgid ""
-"Here are descriptions of all the supported parameters to the `inline` "
-"directive:"
+"There are many parameters you can use with the `inline` directive. These are "
+"the commonly used ones:"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid "`pages` - A [[PageSpec]] of the pages to inline."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
 "`show` - Specify the maximum number of matching pages to inline.  Default is "
 "10, unless archiving, when the default is to show all.  Set to 0 to show all "
@@ -312,70 +233,84 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
-"`skip` - Specify a number of pages to skip displaying. Can be useful to "
-"produce a feed that only shows archived pages."
+"`archive` - If set to \"yes\", only list page titles and some metadata, not "
+"full contents."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
-"`rss` - controls generation of an rss feed. If the wiki is configured to "
-"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowrss`, set to \"yes\" to enable."
+"`description` - Sets the description of the rss feed if one is generated.  "
+"Defaults to the name of the wiki."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
-"`atom` - controls generation of an atom feed. If the wiki is configured to "
-"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowatom`, set to \"yes\" to enable."
+"`skip` - Specify a number of pages to skip displaying. Can be useful to "
+"produce a feed that only shows archived pages."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
-"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
-"disable generating any feeds."
+"`postform` - Set to \"yes\" to enable a form to post new pages to a "
+"[[blog]]."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/blog.mdwn:66
+msgid "`postformtext` - Set to specify text that is displayed in a postform."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:66
 msgid ""
-"`postform` - Set to \"yes\" to enables a form to post new pages to a "
-"[[blog]]."
+"`rootpage` - Enable the postform, and allows controling where newly posted "
+"pages should go, by specifiying the page that they should be a [[SubPage]] "
+"of."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/blog.mdwn:68
+msgid "Here are some less often needed parameters:"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
-msgid "`postformtext` - Set to specify text that is displayed in a postform."
+#: ikiwiki/blog.mdwn:108
+msgid ""
+"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
+"for editing and discussion (if they would be shown at the top of the page "
+"itself)."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`rootpage` - Also enables a form to post new pages to a [[blog]], and allows "
-"specifying of a page that is used as the parent page for new pages."
+"`rss` - controls generation of an rss feed. If the wiki is configured to "
+"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowrss`, set to \"yes\" to enable."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`archive` - If set to \"yes\", only list page titles and some metadata, not "
-"full controls."
+"`atom` - controls generation of an atom feed. If the wiki is configured to "
+"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowatom`, set to \"yes\" to enable."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
+"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
+"disable generating any feeds."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
 "`template` - Specifies the template to fill out to display each inlined "
 "page. By default the `inlinepage` template is used, while the `archivepage` "
@@ -386,7 +321,7 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
 "`raw` - Rather than the default behavior of creating a [[blog]], if raw is "
 "set to \"yes\", the page will be included raw, without additional markup "
@@ -394,35 +329,48 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`description` - Sets the description of the rss feed if one is generated.  "
-"Defaults to the name of the wiki."
+"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
+"sort newest created pages first. Setting it to \"title\" will sort pages by "
+"title, and \"mtime\" sorts most recently modified pages first."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/blog.mdwn:108
+msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
-"for editing and discussion (if they would be shown at the top of the page "
-"itself)."
+"`feedshow` - Specify the maximum number of matching pages to include in the "
+"rss/atom feeds. The default is the same as the `show` value above."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first."
+"`feedonly` - Only generate the feed, do not display the pages inline on the "
+"page."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
-msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
+#: ikiwiki/blog.mdwn:108
+msgid ""
+"`quick` - Build archives in quick mode, without reading page contents for "
+"metadata. By default, this also turns off generation of any feeds."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
+msgid ""
+"`timeformat` - Use this to specify how to display the time or date for pages "
+"in the blog. The format string is passed to the strftime(3) function."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/blog.mdwn:108
 msgid ""
 "`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
 "feeds. The default is the same as the `pages` value above, and only pages "
@@ -431,24 +379,395 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/blog.mdwn:108
 msgid ""
-"`feedshow` - Specify the maximum number of matching pages to include in the "
-"rss/atom feeds. The default is the same as the `show` value above."
+"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
+"the Atom feed will have this as its `<id>`. The default is to use the URL of "
+"the page containing the `inline` directive."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:1
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:7
+msgid ""
+"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 "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:9
+msgid "Leave blank lines between paragraphs."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:12
+msgid ""
+"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+"placing it in single or double asterisks."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:14
+msgid "To create a list, start each line with an asterisk:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:17
+msgid "\"* this is my list\""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/formatting.mdwn:17
+msgid "\"* another item\""
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:20
 msgid ""
-"`feedonly` - Only generate the feed, do not display the pages inline on the "
-"page."
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+
+# type: Bullet: '1. '
+#: ikiwiki/formatting.mdwn:24
+msgid "\"1. first line\""
+msgstr ""
+
+# type: Bullet: '2. '
+#: ikiwiki/formatting.mdwn:24
+msgid "\"2. second line\""
+msgstr ""
+
+# type: Bullet: '2. '
+#: ikiwiki/formatting.mdwn:24
+msgid "\"2. third line\""
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:28
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:29
+#, no-wrap
+msgid "# # h1\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:30
+#, no-wrap
+msgid "## ## h2\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:31
+#, no-wrap
+msgid "### ### h3\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:32
+#, no-wrap
+msgid "#### #### h4\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:33
+#, no-wrap
+msgid "##### ##### h5\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:34
+#, no-wrap
+msgid "###### ###### h6\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:38
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:39 ikiwiki/formatting.mdwn:55 index.mdwn:5 sandbox.mdwn:3
+#, no-wrap
+msgid "----\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:42
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:45
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:47
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:50
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:54
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:59
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/formatting.mdwn:62
 msgid ""
-"`timeformat` - Use this to specify how to display the time or date for pages "
-"in the blog. The format string is passed to the strftime(3) function."
+"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]]."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:63
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:65
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:67
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:69
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:71
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:73
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:75
+msgid "Add a table of contents to a page:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:77
+#, no-wrap
+msgid "\t\\[[!toc ]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:80 recentchanges.mdwn:1
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:82
+msgid "Change the title of a page:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:84
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:86
+#, no-wrap
+msgid "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:88
+msgid "Create a [[blog]] by inlining a set of pages:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:90
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:92
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/formatting.mdwn:95
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/markdown.mdwn:5
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/markdown.mdwn:10
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A "
+"[markdown mode](http://jblevins.org/projects/markdown-mode/) for emacs can "
+"help in editing."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/markdown.mdwn:13
+msgid ""
+"Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the "
+"markdown syntax, and are the only bit of markup that this wiki handles "
+"internally."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:1
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:7
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"This wiki has OpenID **enabled**.\"\n"
+"     else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:11
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:13
+msgid "To sign up for an OpenID, visit one of the following identity providers:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid "[Videntity](http://videntity.org/)"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/openid.mdwn:20
+msgid ""
+"or any of the [many others out "
+"there](http://openiddirectory.com/openid-providers-c-1.html)."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:22
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:26
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:28
+#, no-wrap
+msgid "---\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:32
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/openid.mdwn:34
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
 msgstr ""
 
 # type: Plain text
@@ -655,7 +974,7 @@ msgid "!SandBox !*/Discussion"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:1
+#: ikiwiki/pagespec.mdwn:85
 msgid ""
 "Using this old syntax is still supported. However, the old syntax is "
 "deprecated and will be removed at some point, and using the new syntax is "
@@ -663,361 +982,304 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:4
-msgid ""
-"Preprocessor directives are similar to a [[WikiLink]] in form, except they "
-"begin with `!` and may contain parameters. The general form is:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:6
+#: ikiwiki/pagespec/attachment.mdwn:5
 #, no-wrap
-msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"This wiki has attachments **enabled**.\"\n"
+"     else=\"This wiki has attachments **disabled**.\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:9
+#: ikiwiki/pagespec/attachment.mdwn:9
 msgid ""
-"This gets expanded before the rest of the page is processed, and can be used "
-"to transform the page in various ways."
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, by entering a [[ikiwiki/PageSpec]] in the "
+"\"Allowed Attachments\" field of their preferences page."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:12
+#: ikiwiki/pagespec/attachment.mdwn:13
 msgid ""
-"The quotes around values can be omitted if the value is a simple word.  "
-"Also, some directives may use parameters without values, for example:"
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for virii, something like this could be used:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:14
+#: ikiwiki/pagespec/attachment.mdwn:15
 #, no-wrap
-msgid "\t\\[[!tag foo]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:17
 msgid ""
-"A preprocessor directive does not need to all be on one line, it can be "
-"wrapped to multiple lines if you like:"
+"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
+"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:20
-#, no-wrap
+#: ikiwiki/pagespec/attachment.mdwn:18
 msgid ""
-"\t\\[[!directive foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragalisticexpealadocious\" baz=11]]\n"
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with thw following "
+"additional tests:"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:24
-msgid ""
-"Also, multiple lines of *quoted* text can be used for a value.  To allow "
-"quote marks inside the quoted text, delimit the block of text with "
-"triple-quotes:"
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:20
+msgid "maxsize(size)"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:30
+#: ikiwiki/pagespec/attachment.mdwn:24
 #, no-wrap
 msgid ""
-"\t\\[[!directive text=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
-"\t\"\"\"]]\n"
+"  Tests whether the attachment is no larger than the specified size.\n"
+"  The size defaults to being in bytes, but \"kb\", \"mb\", \"gb\" etc can "
+"be\n"
+"  used to specify the units.\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/markdown.mdwn:1
-msgid ""
-"ikiwiki also has an older syntax for preprocessor directives, which requires "
-"a space in directives to distinguish them from [[wikilinks|wikilink]].  This "
-"syntax has several disadvantages: it requires a space after directives with "
-"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
-"[[wikilinks|wikilink]].  ikiwiki now provides the `!`-prefixed syntax shown "
-"above as the preferred alternative.  However, ikiwiki still supports wikis "
-"using the older syntax, if the `prefix_directives` option is not enabled.  "
-"For backward compatibility with existing wikis, this option currently "
-"defaults to off, so ikiwiki supports the old syntax."
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:26
+msgid "minsize(size)"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/markdown.mdwn:5
-msgid ""
-"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
-"markup language that resembles plain text as used in email messages. It is "
-"the markup language used by this wiki by default."
+#: ikiwiki/pagespec/attachment.mdwn:28
+#, no-wrap
+msgid "  Tests whether the attachment is no smaller than the specified size.\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/markdown.mdwn:10
-msgid ""
-"For documentation about the markdown syntax, see [[formatting]] and "
-"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A "
-"[markdown mode](http://jblevins.org/projects/markdown-mode/) for emacs can "
-"help in editing."
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:30
+msgid "ispage()"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:1
+#: ikiwiki/pagespec/attachment.mdwn:34
+#, no-wrap
 msgid ""
-"Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the "
-"markdown syntax, and are the only bit of markup that this wiki handles "
-"internally."
+"  Tests whether the attachment will be treated by ikiwiki as a wiki page.\n"
+"  (Ie, if it has an extension of \".mdwn\", or of any other enabled page\n"
+"  format).\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:1
+#: ikiwiki/pagespec/attachment.mdwn:38
 #, no-wrap
-msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/formatting.mdwn:7
 msgid ""
-"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 "
-"called [[MarkDown]], and it works like this:"
+"  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+"  use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+"  as attachments, use `ispage()`.\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:9
-msgid "Leave blank lines between paragraphs."
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:40
+msgid "user(username)"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:12
+#: ikiwiki/pagespec/attachment.mdwn:43
+#, no-wrap
 msgid ""
-"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-"placing it in single or double asterisks."
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/formatting.mdwn:14
-msgid "To create a list, start each line with an asterisk:"
+"  Tests whether the attachment is being uploaded by a user with the\n"
+"  specified username. If openid is enabled, an openid can also be put "
+"here.\n"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:17
-msgid "\"* this is my list\""
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:17
-msgid "\"* another item\""
+#: ikiwiki/pagespec/attachment.mdwn:45
+msgid "ip(address)"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:20
+#: ikiwiki/pagespec/attachment.mdwn:48
+#, no-wrap
 msgid ""
-"To make a numbered list, start each line with a number (any number will do) "
-"followed by a period:"
-msgstr ""
-
-# type: Bullet: '1. '
-#: ikiwiki/formatting.mdwn:24
-msgid "\"1. first line\""
-msgstr ""
-
-# type: Bullet: '2. '
-#: ikiwiki/formatting.mdwn:24
-msgid "\"2. second line\""
-msgstr ""
-
-# type: Bullet: '2. '
-#: ikiwiki/formatting.mdwn:24
-msgid "\"2. third line\""
+"  Tests whether the attacment is being uploaded from the specified IP\n"
+"  address.\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:28
-msgid ""
-"To create a header, start a line with one or more `#` characters followed by "
-"a space and the header text. The number of `#` characters controls the size "
-"of the header:"
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:50
+msgid "mimetype(foo/bar)"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:29
+#: ikiwiki/pagespec/attachment.mdwn:53
 #, no-wrap
-msgid "# # h1\n"
+msgid ""
+"  This checks the MIME type of the attachment. You can include a glob\n"
+"  in the type, for example `mimetype(image/*)`.\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:30
-#, no-wrap
-msgid "## ## h2\n"
+# type: Bullet: '* '
+#: ikiwiki/pagespec/attachment.mdwn:55
+msgid "virusfree()"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:31
+#: ikiwiki/pagespec/attachment.mdwn:56
 #, no-wrap
-msgid "### ### h3\n"
+msgid "  Checks the attachment with an antiviral program.\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:32
-#, no-wrap
-msgid "#### #### h4\n"
+#: ikiwiki/preprocessordirective.mdwn:4
+msgid ""
+"Preprocessor directives are similar to a [[WikiLink]] in form, except they "
+"begin with `!` and may contain parameters. The general form is:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:33
+#: ikiwiki/preprocessordirective.mdwn:6
 #, no-wrap
-msgid "##### ##### h5\n"
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:34
-#, no-wrap
-msgid "###### ###### h6\n"
+#: ikiwiki/preprocessordirective.mdwn:9
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:38
+#: ikiwiki/preprocessordirective.mdwn:12
 msgid ""
-"To create a horizontal rule, just write three or more dashes or stars on "
-"their own line:"
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:39 ikiwiki/formatting.mdwn:55 sandbox.mdwn:3 index.mdwn:5
+#: ikiwiki/preprocessordirective.mdwn:14
 #, no-wrap
-msgid "----\n"
+msgid "\t\\[[!tag foo]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:42
-msgid "To quote someone, prefix the quote with \">\":"
+#: ikiwiki/preprocessordirective.mdwn:17
+msgid ""
+"A preprocessor directive does not need to all be on one line, it can be "
+"wrapped to multiple lines if you like:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:45
+#: ikiwiki/preprocessordirective.mdwn:20
 #, no-wrap
 msgid ""
-"> To be or not to be,\n"
-"> that is the question.\n"
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragalisticexpealadocious\" baz=11]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:47
-msgid "To write a code block, indent each line with a tab or 4 spaces:"
+#: ikiwiki/preprocessordirective.mdwn:24
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value.  To allow "
+"quote marks inside the quoted text, delimit the block of text with "
+"triple-quotes:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:50
+#: ikiwiki/preprocessordirective.mdwn:29
 #, no-wrap
 msgid ""
-"\t10 PRINT \"Hello, world!\"\n"
-"\t20 GOTO 10\n"
+"\t\\[[!directive text=\"\"\"\n"
+"\t1. \"foo\"\n"
+"\t2. \"bar\"\n"
+"\t3. \"baz\"\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:54
-#, no-wrap
+#: ikiwiki/preprocessordirective.mdwn:39
 msgid ""
-"To link to an url or email address, you can just put the\n"
-"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
-"form \\[link text\\]\\(url\\)\n"
+"ikiwiki also has an older syntax for preprocessor directives, which requires "
+"a space in directives to distinguish them from [[wikilinks|wikilink]].  This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|wikilink]].  ikiwiki now provides the `!`-prefixed syntax shown "
+"above as the preferred alternative.  However, ikiwiki still supports wikis "
+"using the older syntax, if the `prefix_directives` option is not enabled.  "
+"For backward compatibility with existing wikis, this option currently "
+"defaults to off, so ikiwiki supports the old syntax."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:59
+#: ikiwiki/searching.mdwn:6
+#, no-wrap
 msgid ""
-"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
-"use the following additional features:"
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:62
+# type: Plain text
+#: ikiwiki/searching.mdwn:10
 msgid ""
-"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 searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to constuct more "
+"powerful searches."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:66
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
-"* Insert [[smileys]] and some other useful symbols. :-)\n"
-"\"\"\"]]\n"
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
+msgid "To match a phrase, enclose it in double quotes."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:69
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
-"* Use [[shortcuts]] to link to common resources.\n"
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
+msgid "`AND` can be used to search for documents containing two expressions."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:72
-#, no-wrap
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
 msgid ""
-"\t\\[[!wikipedia War\\_of\\_1812]]\n"
-"\"\"\"]]\n"
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:75
-#, no-wrap
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
 msgid ""
-"[[!if test=\"enabled(toc)\" then=\"\"\"\n"
-"* Add a table of contents to a page:\n"
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:78
-#, no-wrap
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
 msgid ""
-"\t\\[[!toc ]]\n"
-"\"\"\"]]\n"
+"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
+"For example, \"-discussion\" will omit \"discussion\"."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:82
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(meta)\" then=\"\"\"\n"
-"* Change the title of a page:\n"
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
+msgid "To search for a page with a given title, use \"title:foo\"."
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/formatting.mdwn:85
-#, no-wrap
-msgid ""
-"\t\\[[!meta title=\"full page title\"]]\n"
-"\"\"\"]]\n"
+# type: Bullet: '* '
+#: ikiwiki/searching.mdwn:20
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:88
-#, no-wrap
+#: ikiwiki/subpage.mdwn:6
 msgid ""
-"[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
-"* Create a [[blog]] by inlining a set of pages:\n"
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like "
+"[[SubPage/LinkingRules]]. This is a useful way to add some order to your "
+"wiki rather than just having a great big directory full of pages."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:91
-#, no-wrap
+#: ikiwiki/subpage.mdwn:11
 msgid ""
-"\t\\[[!inline pages=\"blog/*\"]]\n"
-"\"\"\"]]\n"
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/subpage/linkingrules.mdwn:1
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
-"* Create and fill out [[templates]] for repeated chunks of\n"
-"  parameterized wiki text.\n"
-"\"\"\"]]\n"
+#: ikiwiki/subpage.mdwn:12
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
 msgstr ""
 
 # type: Plain text
@@ -1073,7 +1335,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/subpage.mdwn:1
+#: ikiwiki/subpage/linkingrules.mdwn:33
 msgid ""
 "Also, if the wiki is configured with a userdir, you can link to pages within "
 "the userdir without specifying a path to them. This is to allow for easy "
@@ -1082,279 +1344,250 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/subpage.mdwn:6
+#: ikiwiki/wikilink.mdwn:5
 msgid ""
-"ikiwiki supports placing pages in a directory hierarchy. For example, this "
-"page, [[SubPage]] has some related pages placed under it, like "
-"[[SubPage/LinkingRules]]. This is a useful way to add some order to your "
-"wiki rather than just having a great big directory full of pages."
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets.  "
+"For example `\\[[WikiLink]]`."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/subpage.mdwn:11
+#: ikiwiki/wikilink.mdwn:8
 msgid ""
-"To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
-"nested as deeply as you'd like."
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
 msgstr ""
 
 # type: Plain text
-#: recentchanges.mdwn:1
-msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+#: ikiwiki/wikilink.mdwn:11
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
 msgstr ""
 
 # type: Plain text
-#: recentchanges.mdwn:1
-#, no-wrap
-msgid "[[!meta title=\"RecentChanges\"]]\n"
+#: ikiwiki/wikilink.mdwn:14
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
 msgstr ""
 
 # type: Plain text
-#: recentchanges.mdwn:3
-msgid "Recent changes to this wiki:"
+#: ikiwiki/wikilink.mdwn:18
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:1
+#: ikiwiki/wikilink.mdwn:22
 msgid ""
-"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" "
-"template=recentchanges show=0]]"
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:6
+#: ikiwiki/wikilink.mdwn:25
 msgid ""
-"[[!if test=\"enabled(template)\" then=\"This wiki has templates "
-"**enabled**.\" else=\"This wiki has templates **disabled**.\" ]]"
+"To link to an anchor inside a page, you can use something like "
+"`\\[[WikiLink#foo]]`"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:9
-msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+#: ikiwiki/wikilink.mdwn:26
+#, no-wrap
+msgid "## Preprocessor directives and wikilinks\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:11
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\""
+#: ikiwiki/wikilink.mdwn:36
+msgid ""
+"ikiwiki has two syntaxes for "
+"[[preprocessor_directives|PreprocessorDirective]].  The older syntax used "
+"spaces to distinguish between preprocessor directives and wikilinks; as a "
+"result, with that syntax in use, you cannot use spaces in WikiLinks, and "
+"must replace spaces with underscores.  The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces.  Future versions of "
+"ikiwiki will turn this option on by default."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:12
-#, no-wrap
-msgid "## Available templates\n"
+#: index.mdwn:2
+msgid "Welcome to your new wiki."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:16
-msgid "These templates are available for inclusion onto other pages in this wiki:"
+#: index.mdwn:4
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:20
-msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes "
-"sort=title template=titlepage]] \"\"\"]]"
+#: index.mdwn:7
+msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:21
+#: markdown.mdwn:1
 #, no-wrap
-msgid "## Using a template\n"
+msgid "[[!meta redir=ikiwiki/markdown delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:24
-msgid "Using a template works like this:"
+#: markdown.mdwn:6
+msgid ""
+"This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update "
+"your links, as this redirection page will be removed in a future ikiwiki "
+"release."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:26
+#: openid.mdwn:1
 #, no-wrap
-msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
+msgid "[[!meta redir=ikiwiki/openid delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:29
+#: openid.mdwn:6
 msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+"This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your "
+"links, as this redirection page will be removed in a future ikiwiki release."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:34
-msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+#: pagespec.mdwn:1
+#, no-wrap
+msgid "[[!meta redir=ikiwiki/pagespec delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:40
-#, no-wrap
+#: pagespec.mdwn:6
 msgid ""
-"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
-"notes=\"\"\"\n"
-"        * \\[[Charley]]'s sister.\n"
-"        * \"I want to be an astronaut when I grow up.\"\n"
-"        * Really 8 and a half.\n"
-"        \"\"\"]]\n"
+"This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update "
+"your links, as this redirection page will be removed in a future ikiwiki "
+"release."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:41
+#: preprocessordirective.mdwn:1
 #, no-wrap
-msgid "## Creating a template\n"
+msgid "[[!meta redir=ikiwiki/preprocessordirective delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:47
+#: preprocessordirective.mdwn:7
 msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+"This page has moved to "
+"[[ikiwiki/preprocessordirective|ikiwiki/preprocessordirective]]. Please "
+"update your links, as this redirection page will be removed in a future "
+"ikiwiki release."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:52
-msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+#: recentchanges.mdwn:2
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: templates.mdwn:61
-msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+# type: Plain text
+#: recentchanges.mdwn:5
+msgid "Recent changes to this wiki:"
 msgstr ""
 
-# type: Bullet: '* '
-#: templates.mdwn:61
+# type: Plain text
+#: recentchanges.mdwn:7
+#, no-wrap
 msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: templates.mdwn:61
-msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+# type: Plain text
+#: sandbox.mdwn:2
+msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
 msgstr ""
 
-# type: Bullet: '* '
-#: templates.mdwn:61
-msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+# type: Plain text
+#: sandbox.mdwn:6
+msgid "Here's a paragraph."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:63
-msgid "Here's a sample template:"
+#: sandbox.mdwn:8
+msgid "Here's another one with *emphasised* text."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:77
+#: sandbox.mdwn:9
 #, no-wrap
-msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: [[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+msgid "# Header\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:82
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
+#: sandbox.mdwn:11
+#, no-wrap
+msgid "## Subheader\n"
 msgstr ""
 
 # type: Plain text
-#: openid.mdwn:1
+#: sandbox.mdwn:20
+#, no-wrap
 msgid ""
-"Note the use of \"raw_name\" inside the [[WikiLink]] generator. This ensures "
-"that if the name contains something that might be mistaken for wiki markup, "
-"it's not converted to html before being processed as a [[WikiLink]]."
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
 msgstr ""
 
 # type: Plain text
-#: openid.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/openid delay=10]]\n"
+#: sandbox.mdwn:22
+msgid "Numbered list"
+msgstr ""
+
+# type: Bullet: '1. '
+#: sandbox.mdwn:26
+msgid "First item."
+msgstr ""
+
+# type: Bullet: '1. '
+#: sandbox.mdwn:26
+msgid "Another."
+msgstr ""
+
+# type: Bullet: '1. '
+#: sandbox.mdwn:26
+msgid "And another.."
 msgstr ""
 
 # type: Plain text
-#: wikilink.mdwn:1
-msgid ""
-"This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
+#: sandbox.mdwn:28
+msgid "Bulleted list"
+msgstr ""
+
+# type: Bullet: '* '
+#: sandbox.mdwn:31
+msgid "*item*"
+msgstr ""
+
+# type: Bullet: '* '
+#: sandbox.mdwn:31
+msgid "item"
 msgstr ""
 
 # type: Plain text
-#: wikilink.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/wikilink delay=10]]\n"
+#: sandbox.mdwn:32
+msgid "[[ikiwiki/WikiLink]]"
 msgstr ""
 
 # type: Plain text
 #: shortcuts.mdwn:4
 #, no-wrap
 msgid ""
-"This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please "
-"update\n"
-"your links, as this redirection page will be removed in a future ikiwiki\n"
-"release.\n"
-"<div class=\"notebox\">\n"
-"<TMPL_VAR text>\n"
-"</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
-"Use this template to insert a note into a page. The note will be styled to\n"
-"float to the right of other text on the page. This template has one\n"
-"parameter:\n"
-"<ul>\n"
-"<li>`text` - the text to display in the note\n"
-"</ul>\n"
-"</TMPL_UNLESS>\n"
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
-"Use this template to create a popup window that is displayed when the "
-"mouse\n"
-"is over part of the page. This template has two parameters:\n"
-"<ul>\n"
-"<li>`mouseover` - This is the text or other content that triggers the\n"
-"popup.\n"
-"<li>`popup` - This should be the content of the popup window. It can be\n"
-"anything, even images or a whole little wiki page, but should not be too\n"
-"large for good usability.\n"
-"</ul>\n"
-"Note that browsers that do not support the CSS will display the popup\n"
-"inline in the page, inside square brackets.\n"
-"</TMPL_UNLESS>\n"
-"<span class=\"popup\"><TMPL_VAR mouseover>\n"
-"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
-"popup></span><span class=\"paren\">]</span>\n"
-"</span>\n"
 "[[!if test=\"enabled(shortcut)\"\n"
 "     then=\"This wiki has shortcuts **enabled**.\"\n"
 "     else=\"This wiki has shortcuts **disabled**.\"]]\n"
@@ -1682,7 +1915,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki.mdwn:1
+#: shortcuts.mdwn:77
 msgid ""
 "If you come up with a shortcut that you think others might find useful, "
 "consider contributing it to the [shortcuts page on the ikiwiki "
@@ -1691,226 +1924,258 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki.mdwn:6
+#: subpage.mdwn:1
 #, no-wrap
-msgid ""
-"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
-"[[!if test=\"enabled(version)\"\n"
-"     then=\"(Currently running version [[!version ]].)\"\n"
-"]]\n"
+msgid "[[!meta redir=ikiwiki/subpage delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki.mdwn:8
-msgid "Some documentation on using ikiwiki:"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/formatting]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/blog]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/pagespec]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/PreprocessorDirective]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/wikilink]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/markdown]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/subpage]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: blog.mdwn:1
-msgid "[[ikiwiki/openid]]"
+#: subpage.mdwn:6
+msgid ""
+"This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update "
+"your links, as this redirection page will be removed in a future ikiwiki "
+"release."
 msgstr ""
 
 # type: Plain text
-#: blog.mdwn:1
+#: templates.mdwn:6
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/blog delay=10]]\n"
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
 msgstr ""
 
 # type: Plain text
-#: pagespec.mdwn:1
+#: templates.mdwn:9
 msgid ""
-"This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
 msgstr ""
 
 # type: Plain text
-#: pagespec.mdwn:1
+#: templates.mdwn:10
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/pagespec delay=10]]\n"
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgstr ""
 
 # type: Plain text
-#: preprocessordirective.mdwn:1
-msgid ""
-"This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
+#: templates.mdwn:12
+#, no-wrap
+msgid "## Available templates\n"
 msgstr ""
 
 # type: Plain text
-#: preprocessordirective.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/preprocessordirective delay=10]]\n"
+#: templates.mdwn:16
+msgid "These templates are available for inclusion onto other pages in this wiki:"
 msgstr ""
 
 # type: Plain text
-#: markdown.mdwn:1
+#: templates.mdwn:19
+#, no-wrap
 msgid ""
-"This page has moved to "
-"[[ikiwiki/preprocessordirective|ikiwiki/preprocessordirective]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 msgstr ""
 
 # type: Plain text
-#: markdown.mdwn:1
+#: templates.mdwn:21
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/markdown delay=10]]\n"
+msgid "## Using a template\n"
 msgstr ""
 
 # type: Plain text
-#: helponformatting.mdwn:1
-msgid ""
-"This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
+#: templates.mdwn:24
+msgid "Using a template works like this:"
 msgstr ""
 
 # type: Plain text
-#: helponformatting.mdwn:1
+#: templates.mdwn:26
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/formatting delay=10]]\n"
+msgid ""
+"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
+"note.\"\"\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:2
+#: templates.mdwn:29
 msgid ""
-"This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release.  This is the SandBox, a page anyone can edit to learn how "
-"to use the wiki."
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:6
-msgid "Here's a paragraph."
+#: templates.mdwn:34
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:8
-msgid "Here's another one with *emphasised* text."
+#: templates.mdwn:39
+#, no-wrap
+msgid ""
+"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
+"notes=\"\"\"\n"
+"        * \\[[Charley]]'s sister.\n"
+"        * \"I want to be an astronaut when I grow up.\"\n"
+"        * Really 8 and a half.\n"
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:9
+#: templates.mdwn:41
 #, no-wrap
-msgid "# Header\n"
+msgid "## Creating a template\n"
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:11
-#, no-wrap
-msgid "## Subheader\n"
+#: templates.mdwn:47
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:20
-#, no-wrap
+#: templates.mdwn:52
 msgid ""
-"> This is a blockquote.\n"
-">\n"
-"> This is the first level of quoting.\n"
-">\n"
-"> > This is nested blockquote.\n"
-">\n"
-"> Back to the first level.\n"
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
 msgstr ""
 
-# type: Plain text
-#: sandbox.mdwn:22
-msgid "Numbered list"
+# type: Bullet: '* '
+#: templates.mdwn:64
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
 msgstr ""
 
-# type: Bullet: '1. '
-#: sandbox.mdwn:26
-msgid "First item."
+# type: Bullet: '* '
+#: templates.mdwn:64
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
 msgstr ""
 
-# type: Bullet: '1. '
-#: sandbox.mdwn:26
-msgid "Another."
+# type: Bullet: '* '
+#: templates.mdwn:64
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
 msgstr ""
 
-# type: Bullet: '1. '
-#: sandbox.mdwn:26
-msgid "And another.."
+# type: Bullet: '* '
+#: templates.mdwn:64
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+
+# type: Bullet: '* '
+#: templates.mdwn:64
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
 
 # type: Plain text
-#: sandbox.mdwn:28
-msgid "Bulleted list"
+#: templates.mdwn:66
+msgid "Here's a sample template:"
 msgstr ""
 
-# type: Bullet: '* '
-#: sandbox.mdwn:31
-msgid "*item*"
+# type: Plain text
+#: templates.mdwn:80
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: [[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: sandbox.mdwn:31
-msgid "item"
+# type: Plain text
+#: templates.mdwn:85
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
 msgstr ""
 
 # type: Plain text
-#: index.mdwn:2
-msgid "[[ikiwiki/WikiLink]] Welcome to your new wiki."
+#: templates.mdwn:88
+msgid ""
+"Note the use of \"raw_name\" inside the [[WikiLink]] generator. This ensures "
+"that if the name contains something that might be mistaken for wiki markup, "
+"it's not converted to html before being processed as a [[WikiLink]]."
 msgstr ""
 
 # type: Plain text
-#: index.mdwn:4
-msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+#: templates/note.mdwn:11
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
 msgstr ""
 
 # type: Plain text
-#: subpage.mdwn:1
-msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
+#: templates/popup.mdwn:16
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the "
+"mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
+"popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
 msgstr ""
 
 # type: Plain text
-#: subpage.mdwn:1
+#: wikilink.mdwn:1
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/subpage delay=10]]\n"
+msgid "[[!meta redir=ikiwiki/wikilink delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: subpage.mdwn:6
+#: wikilink.mdwn:6
 msgid ""
-"This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update "
+"This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update "
 "your links, as this redirection page will be removed in a future ikiwiki "
 "release."
 msgstr ""