Merge branch 'master' into allinone

1 files changed, 165 insertions, 134 deletions

diff --git a/po/basewiki.pot b/po/basewiki.pot
index ff359ff..bc0fda6 100644
--- a/po/basewiki.pot
+++ b/po/basewiki.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki basewiki 2.56\n"
-"POT-Creation-Date: 2008-08-04 00:01+0300\n"
+"Project-Id-Version: ikiwiki basewiki 2.62.1\n"
+"POT-Creation-Date: 2008-08-30 05: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"
@@ -22,7 +22,7 @@ msgid "[[!meta redir=ikiwiki/blog delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: 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
+#: blog.mdwn:2 helponformatting.mdwn:2 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 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 ""
@@ -80,7 +80,7 @@ msgstr ""
 
 # type: Bullet: '* '
 #: ikiwiki.mdwn:17
-msgid "[[ikiwiki/PreprocessorDirective]]"
+msgid "[[ikiwiki/directive]]"
 msgstr ""
 
 # type: Bullet: '* '
@@ -125,7 +125,7 @@ msgid ""
 "     then=\"You can\"\n"
 "     else=\"If this wiki had the inline plugin enabled, you could\"]]\n"
 "turn any page on this wiki into a weblog by using the `inline`\n"
-"[[PreProcessorDirective]]. For example:\n"
+"[[directive]]. For example:\n"
 msgstr ""
 
 # type: Plain text
@@ -150,8 +150,8 @@ msgstr ""
 #: ikiwiki/blog.mdwn:23
 msgid ""
 "The optional `rootpage` parameter tells the wiki that new posts to this blog "
-"should default to being [[SubPage]]s of \"blog\", and enables a form at the "
-"top of the blog that can be used to add new items."
+"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
+"at the top of the blog that can be used to add new items."
 msgstr ""
 
 # type: Plain text
@@ -387,6 +387,86 @@ msgid ""
 msgstr ""
 
 # type: Plain text
+#: ikiwiki/directive.mdwn:4
+msgid ""
+"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/directive.mdwn:6
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: 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
+#: 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
+#: ikiwiki/directive.mdwn:14
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr ""
+
+# type: Plain text
+#: 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
+#: ikiwiki/directive.mdwn:20
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+
+# type: Plain text
+#: 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 "
+"triple-quotes:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:29
+#, no-wrap
+msgid ""
+"\t\\[[!directive text=\"\"\"\n"
+"\t1. \"foo\"\n"
+"\t2. \"bar\"\n"
+"\t3. \"baz\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:39
+msgid ""
+"ikiwiki also has an older syntax for 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:1
 #, no-wrap
 msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
@@ -587,65 +667,99 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/formatting.mdwn:73
 #, no-wrap
-msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:75
+#: ikiwiki/formatting.mdwn:76
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:80
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+"  actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or (enabled(inline) and blog)\" "
+"then=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:82
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:84
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr ""
+
+# type: Bullet: '  * '
+#: ikiwiki/formatting.mdwn:86
 msgid "Add a table of contents to a page:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:77
+#: ikiwiki/formatting.mdwn:88
 #, no-wrap
-msgid "\t\\[[!toc ]]\n"
+msgid "\t\\[[!toc]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:80 recentchanges.mdwn:1
+#: ikiwiki/formatting.mdwn:91 recentchanges.mdwn:1
 #, no-wrap
 msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:82
+# type: Bullet: '  * '
+#: ikiwiki/formatting.mdwn:93
 msgid "Change the title of a page:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:84
+#: ikiwiki/formatting.mdwn:95
 #, no-wrap
 msgid "\t\\[[!meta title=\"full page title\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:86
+#: ikiwiki/formatting.mdwn:97
 #, no-wrap
 msgid "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:88
+# type: Bullet: '  * '
+#: ikiwiki/formatting.mdwn:99
 msgid "Create a [[blog]] by inlining a set of pages:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:90
+#: ikiwiki/formatting.mdwn:101
 #, no-wrap
 msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:92
+#: ikiwiki/formatting.mdwn:103
 #, no-wrap
-msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 msgstr ""
 
-# type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:95
-msgid ""
-"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
-"text."
+# type: Plain text
+#: ikiwiki/formatting.mdwn:105
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:105
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
 msgstr ""
 
 # type: Plain text
@@ -668,9 +782,9 @@ 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."
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
 msgstr ""
 
 # type: Plain text
@@ -994,8 +1108,8 @@ msgstr ""
 #: ikiwiki/pagespec/attachment.mdwn:9
 msgid ""
 "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."
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
 msgstr ""
 
 # type: Plain text
@@ -1017,7 +1131,7 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:18
 msgid ""
-"The regular [[ikiwiki/PageSpec]] syntax is expanded with thw following "
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
 "additional tests:"
 msgstr ""
 
@@ -1122,83 +1236,17 @@ msgid "  Checks the attachment with an antiviral program.\n"
 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/preprocessordirective.mdwn:1 preprocessordirective.mdwn:1
 #, no-wrap
-msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:9
+#: ikiwiki/preprocessordirective.mdwn:7 preprocessordirective.mdwn:7
 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/preprocessordirective.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
-#: ikiwiki/preprocessordirective.mdwn:14
-#, 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:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:20
-#, no-wrap
-msgid ""
-"\t\\[[!directive foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragalisticexpealadocious\" baz=11]]\n"
-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:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:29
-#, no-wrap
-msgid ""
-"\t\\[[!directive text=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:39
-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."
+"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."
 msgstr ""
 
 # type: Plain text
@@ -1398,17 +1446,16 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:26
 #, no-wrap
-msgid "## Preprocessor directives and wikilinks\n"
+msgid "## Directives and WikiLinks\n"
 msgstr ""
 
 # type: Plain text
 #: 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 "
+"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."
@@ -1471,21 +1518,6 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: preprocessordirective.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/preprocessordirective delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: preprocessordirective.mdwn:7
-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."
-msgstr ""
-
-# type: Plain text
 #: recentchanges.mdwn:2
 #, no-wrap
 msgid "[[!meta title=\"RecentChanges\"]]\n"
@@ -1898,20 +1930,19 @@ msgstr ""
 # type: Plain text
 #: shortcuts.mdwn:68
 msgid ""
-"To add a new shortcut, use the `shortcut` "
-"[[ikiwiki/PreprocessorDirective]]. 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."
+"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."
 msgstr ""
 
 # type: Plain text
 #: shortcuts.mdwn:73
 msgid ""
 "Remember that the `name` you give the shortcut will become a new "
-"[[ikiwiki/PreprocessorDirective]].  Avoid using a `name` that conflicts with "
-"an existing directive.  These directives also accept a `desc` parameter that "
-"will override the one provided at definition time."
+"[[ikiwiki/directive]].  Avoid using a `name` that conflicts with an existing "
+"directive.  These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
 msgstr ""
 
 # type: Plain text
@@ -2094,7 +2125,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "        <span class=\"infobox\">\n"
-"        Name: [[<TMPL_VAR raw_name>]]<br />\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"