Merge branch 'master' into _scs

1 files changed, 421 insertions, 513 deletions

diff --git a/po/basewiki.pot b/po/basewiki.pot
index e26daca..b60d7b8 100644
--- a/po/basewiki.pot
+++ b/po/basewiki.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki basewiki 2.62.1\n"
-"POT-Creation-Date: 2009-05-25 23:07+0300\n"
+"Project-Id-Version: ikiwiki basewiki 3.20100704\n"
+"POT-Creation-Date: 2010-07-16 13:42+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,53 +16,113 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit"
 
 #. type: Plain text
-#: directive.mdwn:1 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/directive.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:2 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 templates.mdwn:1
+#: ikiwiki.mdwn:1 ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/pagespec/po.mdwn:20 ikiwiki/pagespec/sorting.mdwn:26 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 templates.mdwn:80
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:4 ikiwiki/directive.mdwn:4
+#: ikiwiki.mdwn:6
+#, 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"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki.mdwn:8
+msgid "Some documentation on using ikiwiki:"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/formatting]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/wikilink]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/subpage]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/pagespec]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/directive]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/markdown]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/openid]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/searching]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[templates]]"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive.mdwn:4
 msgid ""
 "Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
 "with `!` and may contain parameters. The general form is:"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:6 ikiwiki/directive.mdwn:6
+#: ikiwiki/directive.mdwn:6
 #, no-wrap
 msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:9 ikiwiki/directive.mdwn:9
+#: ikiwiki/directive.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
-#: directive.mdwn:12 ikiwiki/directive.mdwn:12
+#: ikiwiki/directive.mdwn:12
 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:"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:14 ikiwiki/directive.mdwn:14
+#: ikiwiki/directive.mdwn:14
 #, no-wrap
 msgid "\t\\[[!tag foo]]\n"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:17 ikiwiki/directive.mdwn:17
+#: ikiwiki/directive.mdwn:17
 msgid ""
 "A directive does not need to all be on one line, it can be wrapped to "
 "multiple lines if you like:"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:20 ikiwiki/directive.mdwn:20
+#: ikiwiki/directive.mdwn:20
 #, no-wrap
 msgid ""
 "\t\\[[!directive foo=\"baldersnatch\"\n"
@@ -70,7 +130,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:24 ikiwiki/directive.mdwn:24
+#: ikiwiki/directive.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 "
@@ -78,128 +138,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:25 ikiwiki/directive.mdwn:25
+#: ikiwiki/directive.mdwn:25
 #, no-wrap
 msgid "\t\\[[!directive text=\"\"\"\n"
 msgstr ""
 
 #. type: Bullet: '	1. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
 msgid "\"foo\""
 msgstr ""
 
 #. type: Bullet: '	2. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
 msgid "\"bar\""
 msgstr ""
 
 #. type: Bullet: '	3. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
 msgid "\"baz\""
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:40 ikiwiki/directive.mdwn:40
+#: ikiwiki/directive.mdwn:38
 msgid ""
 "ikiwiki also has an older syntax for directives, which requires a space in "
-"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]].  This "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
 "syntax has several disadvantages: it requires a space after directives with "
 "no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
 "[[wikilinks|ikiwiki/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."
+"syntax shown above as default.  However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:41 ikiwiki/directive.mdwn:41 ikiwiki/formatting.mdwn:103
+#: ikiwiki/directive.mdwn:39 ikiwiki/formatting.mdwn:103
 #, no-wrap
 msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:43 ikiwiki/directive.mdwn:43
+#: ikiwiki/directive.mdwn:41
 msgid "Here is a list of currently available directives in this wiki:"
 msgstr ""
 
 #. type: Plain text
-#: directive.mdwn:44 ikiwiki/directive.mdwn:44
+#: ikiwiki/directive.mdwn:42
 #, no-wrap
 msgid "[[!listdirectives ]]\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki.mdwn:6
-#, 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"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki.mdwn:8
-msgid "Some documentation on using ikiwiki:"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/formatting]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/wikilink]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/subpage]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/pagespec]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/directive]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/markdown]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/openid]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/searching]]"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/blog.mdwn:6
-msgid ""
-"This page has been removed from ikiwiki's basewiki. For documentation about "
-"creating a blog with ikiwiki, see the documentation of the [[!iki "
-"ikiwiki/directive/inline desc=inline]] directive."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/blog.mdwn:8
-msgid ""
-"Please update your links, as this redirection page will be removed in a "
-"future ikiwiki release."
-msgstr ""
-
-#. type: Plain text
 #: ikiwiki/formatting.mdwn:1
 #, no-wrap
 msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
@@ -221,7 +209,7 @@ msgstr ""
 #. type: Plain text
 #: ikiwiki/formatting.mdwn:12
 msgid ""
-"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
 msgstr ""
 
@@ -270,40 +258,40 @@ msgid ""
 "of the header:"
 msgstr ""
 
-#. type: Plain text
+#. type: Title #
 #: ikiwiki/formatting.mdwn:29
 #, no-wrap
-msgid "# # h1\n"
+msgid "# h1"
 msgstr ""
 
-#. type: Plain text
+#. type: Title ##
 #: ikiwiki/formatting.mdwn:30
 #, no-wrap
-msgid "## ## h2\n"
+msgid "## h2"
 msgstr ""
 
-#. type: Plain text
+#. type: Title ###
 #: ikiwiki/formatting.mdwn:31
 #, no-wrap
-msgid "### ### h3\n"
+msgid "### h3"
 msgstr ""
 
-#. type: Plain text
+#. type: Title ####
 #: ikiwiki/formatting.mdwn:32
 #, no-wrap
-msgid "#### #### h4\n"
+msgid "#### h4"
 msgstr ""
 
-#. type: Plain text
+#. type: Title #####
 #: ikiwiki/formatting.mdwn:33
 #, no-wrap
-msgid "##### ##### h5\n"
+msgid "##### h5"
 msgstr ""
 
-#. type: Plain text
+#. type: Title ######
 #: ikiwiki/formatting.mdwn:34
 #, no-wrap
-msgid "###### ###### h6\n"
+msgid "###### h6"
 msgstr ""
 
 #. type: Plain text
@@ -314,12 +302,6 @@ msgid ""
 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"
@@ -444,7 +426,7 @@ msgid "\t\\[[!toc]]\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/formatting.mdwn:91 recentchanges.mdwn:1
+#: ikiwiki/formatting.mdwn:91 ikiwiki/pagespec/sorting.mdwn:15 recentchanges.mdwn:1
 #, no-wrap
 msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
 msgstr ""
@@ -498,16 +480,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/markdown.mdwn:10
+#: ikiwiki/markdown.mdwn:8
 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."
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/markdown.mdwn:13
+#: ikiwiki/markdown.mdwn:11
 msgid ""
 "Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
 "of the markdown syntax, and are the only bit of markup that this wiki "
@@ -538,52 +518,21 @@ msgid ""
 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
+#: ikiwiki/openid.mdwn:15
 msgid ""
-"or any of the [many others out "
-"there](http://openiddirectory.com/openid-providers-c-1.html)."
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID "
+"providers](http://openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/openid.mdwn:22
+#: ikiwiki/openid.mdwn:16
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/openid.mdwn:26
+#: ikiwiki/openid.mdwn:20
 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 "
@@ -591,20 +540,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/openid.mdwn:28
-#, no-wrap
-msgid "---\n"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/openid.mdwn:32
+#: ikiwiki/openid.mdwn:26
 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
+#: ikiwiki/openid.mdwn:28
 #, no-wrap
 msgid ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
@@ -667,104 +610,67 @@ msgid ""
 "functions:"
 msgstr ""
 
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`link(page)`\" - match only pages that link to a given page (or glob)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`backlink(page)`\" - match only pages that a given page links to"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_month(month)`\" - match only pages created on the given month"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_year(year)`\" - or year"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`created_after(page)`\" - match only pages created after the given page "
-"was created"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`created_before(page)`\" - match only pages created before the given page "
-"was created"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`glob(someglob)`\" - match pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
-"metadata, matching the specified glob."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
+#. type: Plain text
+#: ikiwiki/pagespec.mdwn:58
+#, no-wrap
+msgid ""
+"* \"`glob(someglob)`\" - matches pages and other files that match the given "
+"glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this "
+"function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other "
+"files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or "
+"glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given "
+"month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given "
+"page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given "
+"page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can "
+"also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:53
+#: ikiwiki/pagespec.mdwn:61
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:55
+#: ikiwiki/pagespec.mdwn:63
 #, no-wrap
 msgid "\tblog/* and link(music) and creation_year(2005)\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:61
+#: ikiwiki/pagespec.mdwn:69
 msgid ""
 "Note the use of \"and\" in the above example, that means that only pages "
 "that match each of the three expressions match the whole. Use \"and\" when "
@@ -774,7 +680,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:65
+#: ikiwiki/pagespec.mdwn:73
 msgid ""
 "More complex expressions can also be created, by using parentheses for "
 "grouping. For example, to match pages in a blog that are tagged with either "
@@ -782,13 +688,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:67
+#: ikiwiki/pagespec.mdwn:75
 #, no-wrap
-msgid "\tblog/* and (link(tag/foo) or link(tag/bar))\n"
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:73
+#: ikiwiki/pagespec.mdwn:80
 msgid ""
 "Note that page names in PageSpecs are matched against the absolute filenames "
 "of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
@@ -798,53 +704,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec.mdwn:74
-#, no-wrap
-msgid "## Old syntax\n"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:78
-msgid ""
-"The old PageSpec syntax was called a \"GlobList\", and worked differently in "
-"two ways:"
-msgstr ""
-
-#. type: Bullet: '1. '
-#: ikiwiki/pagespec.mdwn:83
-msgid ""
-"\"and\" and \"or\" were not used; any page matching any item from the list "
-"matched."
-msgstr ""
-
-#. type: Bullet: '2. '
-#: ikiwiki/pagespec.mdwn:83
-msgid ""
-"If an item was prefixed with \"`!`\", then no page matching that item "
-"matched, even if it matched an earlier list item."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:86
-msgid ""
-"For example, here is the old way to match all pages except for the SandBox "
-"and Discussion pages:"
-msgstr ""
-
-#. type: Bullet: '	* '
-#: ikiwiki/pagespec.mdwn:88
-msgid "!SandBox !*/Discussion"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:91
-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 "
-"recommended."
-msgstr ""
-
-#. type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:5
 #, no-wrap
 msgid ""
@@ -862,53 +721,54 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:13
+#: ikiwiki/pagespec/attachment.mdwn:14
 msgid ""
-"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:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:15
+#: ikiwiki/pagespec/attachment.mdwn:16
 #, no-wrap
 msgid ""
 "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+"and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:18
+#: ikiwiki/pagespec/attachment.mdwn:19
 msgid ""
 "The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
 "additional tests:"
 msgstr ""
 
 #. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:22
+#: ikiwiki/pagespec/attachment.mdwn:23
 msgid ""
-"\"`maxsize(size)`\" - Tests whether the attachment is no larger than the "
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
 "specified size. The size defaults to being in bytes, but \"kb\", \"mb\", "
 "\"gb\" etc can be used to specify the units."
 msgstr ""
 
 #. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:25
+#: ikiwiki/pagespec/attachment.mdwn:26
 msgid ""
-"\"`minsize(size)`\" - Tests whether the attachment is no smaller than the "
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
 "specified size."
 msgstr ""
 
 #. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:29
+#: ikiwiki/pagespec/attachment.mdwn:30
 msgid ""
-"\"`ispage()`\" - Tests whether the attachment will be treated by ikiwiki as "
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
 "a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
 "enabled page format)."
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:33
+#: ikiwiki/pagespec/attachment.mdwn:34
 #, no-wrap
 msgid ""
 "  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
@@ -917,29 +777,110 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:36
+#: ikiwiki/pagespec/attachment.mdwn:37
 msgid ""
-"\"`mimetype(foo/bar)`\" - This checks the MIME type of the attachment. You "
-"can include a glob in the type, for example `mimetype(image/*)`."
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
 msgstr ""
 
 #. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:37
-msgid "\"`virusfree()`\" - Checks the attachment with an antiviral program."
+#: ikiwiki/pagespec/attachment.mdwn:38
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:1
+#: ikiwiki/pagespec/po.mdwn:4
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"This wiki has po support **enabled**.\"\n"
+"     else=\"This wiki has po support **disabled**.\"]]\n"
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:7
+#: ikiwiki/pagespec/po.mdwn:9
 msgid ""
-"This page has moved to [[ikiwiki/directive|ikiwiki/directive]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular "
+"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests "
+"that can be used to improve user navigation in a multi-lingual wiki:"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/po.mdwn:19
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:5
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:7
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:9
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:11
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:14
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:20
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc.  also work."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:25
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
 msgstr ""
 
 #. type: Plain text
@@ -955,7 +896,7 @@ msgstr ""
 #: ikiwiki/searching.mdwn:10
 msgid ""
 "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 "
+"you'd expect. There are a few special things you can do to construct more "
 "powerful searches."
 msgstr ""
 
@@ -1013,8 +954,8 @@ msgstr ""
 #: ikiwiki/subpage.mdwn:11
 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 "
+"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 ""
 
@@ -1107,14 +1048,7 @@ msgid ""
 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."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/wikilink.mdwn:18
+#: ikiwiki/wikilink.mdwn:15
 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 "
@@ -1122,7 +1056,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/wikilink.mdwn:22
+#: ikiwiki/wikilink.mdwn:19
 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 "
@@ -1130,28 +1064,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/wikilink.mdwn:25
+#: ikiwiki/wikilink.mdwn:22
 msgid ""
 "To link to an anchor inside a page, you can use something like "
-"`\\[[WikiLink#foo]]`"
+"`\\[[WikiLink#foo]]` ."
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/wikilink.mdwn:26
-#, no-wrap
-msgid "## Directives and WikiLinks\n"
+#: ikiwiki/wikilink.mdwn:25
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
 msgstr ""
 
 #. type: Plain text
-#: ikiwiki/wikilink.mdwn:36
+#: ikiwiki/wikilink.mdwn:29
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between 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."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
 
 #. type: Plain text
@@ -1166,7 +1096,7 @@ msgstr ""
 
 #. type: Plain text
 #: index.mdwn:7
-msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
+msgid "This wiki is powered by [[ikiwiki]]."
 msgstr ""
 
 #. type: Plain text
@@ -1203,16 +1133,16 @@ msgstr ""
 msgid "Here's another one with *emphasised* text."
 msgstr ""
 
-#. type: Plain text
+#. type: Title #
 #: sandbox.mdwn:9
 #, no-wrap
-msgid "# Header\n"
+msgid "Header"
 msgstr ""
 
-#. type: Plain text
+#. type: Title ##
 #: sandbox.mdwn:11
 #, no-wrap
-msgid "## Subheader\n"
+msgid "Subheader"
 msgstr ""
 
 #. type: Plain text
@@ -1298,81 +1228,83 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#: shortcuts.mdwn:64
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug "
+"#%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid ""
 "[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
 "desc=\"debian-%s@lists.debian.org\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 msgid ""
 "[[!shortcut name=debrt "
 "url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
 msgstr ""
 
 #. type: Plain text
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
 #, no-wrap
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
@@ -1433,19 +1365,25 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt "
+"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN "
+"RT#%s\"]]\n"
+"* [[!shortcut name=novellbug "
+"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 
 #. type: Plain text
-#: shortcuts.mdwn:68
+#: shortcuts.mdwn:70
 msgid ""
 "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
 "\"%s\" is replaced with the text passed to the named shortcut, after "
-"url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-"optional `desc` parameter controls the description of the link."
+"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, "
+"non-encoded text. The optional `desc` parameter controls the description of "
+"the link."
 msgstr ""
 
 #. type: Plain text
-#: shortcuts.mdwn:73
+#: shortcuts.mdwn:75
 msgid ""
 "Remember that the `name` you give the shortcut will become a new "
 "[[ikiwiki/directive]].  Avoid using a `name` that conflicts with an existing "
@@ -1454,207 +1392,177 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: shortcuts.mdwn:77
+#: shortcuts.mdwn:79
 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 "
-"ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
+"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
 "will include your shortcut in the standard underlay."
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:6
-#, no-wrap
+#: templates.mdwn:3
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:9
+#: templates.mdwn:8
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:10
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#: templates.mdwn:12
+msgid ""
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to "
+"learn. All you really need to know to modify templates is this:"
 msgstr ""
 
-#. type: Plain text
-#: templates.mdwn:14
-msgid "These templates are available for inclusion onto other pages in this wiki:"
+#. type: Bullet: '* '
+#: templates.mdwn:18
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
 msgstr ""
 
-#. type: Plain text
-#: templates.mdwn:17
-#, no-wrap
+#. type: Bullet: '* '
+#: templates.mdwn:18
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+#: templates.mdwn:18
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
 
 #. type: Plain text
 #: templates.mdwn:19
 #, no-wrap
-msgid "## Using a template\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr ""
 
-#. type: Plain text
-#: templates.mdwn:22
-msgid "Using a template works like this:"
+#. type: Title ##
+#: templates.mdwn:20
+#, no-wrap
+msgid "template pages"
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:24
-#, no-wrap
+#: templates.mdwn:25
 msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
 
 #. type: Plain text
 #: templates.mdwn:27
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+#, no-wrap
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
 msgstr ""
 
-#. type: Plain text
-#: templates.mdwn:32
-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:"
+#. type: Title ##
+#: templates.mdwn:28
+#, no-wrap
+msgid "default content for new pages"
 msgstr ""
 
 #. type: Plain text
 #: templates.mdwn:33
-#, no-wrap
 msgid ""
-"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
-"notes=\"\"\"\n"
-msgstr ""
-
-#. type: Bullet: '        * '
-#: templates.mdwn:37
-msgid "\\[[Charley]]'s sister."
-msgstr ""
-
-#. type: Bullet: '        * '
-#: templates.mdwn:37
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr ""
-
-#. type: Bullet: '        * '
-#: templates.mdwn:37
-msgid "Really 8 and a half."
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled as out the page is edited."
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:39
+#: templates.mdwn:36
 #, no-wrap
-msgid "## Creating a template\n"
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:45
 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."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:50
-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:"
-msgstr ""
-
-#. type: Bullet: '* '
-#: templates.mdwn:62
-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: '* '
-#: templates.mdwn:62
+#: templates.mdwn:40
+#, no-wrap
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and "
+"!*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
 
-#. type: Bullet: '* '
-#: templates.mdwn:62
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#: templates.mdwn:42
+#, no-wrap
+msgid "wiki templates"
 msgstr ""
 
-#. type: Bullet: '* '
-#: templates.mdwn:62
+#. type: Plain text
+#: templates.mdwn:46
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
 
 #. type: Bullet: '* '
-#: templates.mdwn:62
+#: templates.mdwn:48
 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>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
-#: templates.mdwn:64
-msgid "Here's a sample template:"
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:78
+#: templates.mdwn:79
 #, 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: Plain text
-#: templates.mdwn:83
-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
-#: templates.mdwn:87
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/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 "
-"[[ikiwiki/WikiLink]]."
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate "
+"directive\"]]\n"
+"  can be used to make a page use a different template than "
+"`page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive "
+"page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom "
+"links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not "
+"used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the "
+"wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges "
+"page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index "
+"pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
 
 #. type: Plain text
@@ -1664,7 +1572,7 @@ msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS 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"
@@ -1678,7 +1586,7 @@ msgstr ""
 #: templates/popup.mdwn:16
 #, no-wrap
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS 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"