Merge branch 'master' into wian

10 files changed, 452 insertions, 359 deletions

diff --git a/Makefile b/Makefile
index 4f3fe1e..9cf8814 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 SOURCES = ikiwiki
 
+ikiwiki_VERSION = 2.62.1
 # Git origin (with capital MOULE replaced or stripped as needed)
 ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
 # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed)
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 16e0ee8..1055ef4 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -11,8 +11,8 @@ use IkiWiki::Setup::Standard {
 	adminemail => 'me@example.org',
 
 	# Be sure to customise these..
-	srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content",
-	destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki",
+	srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content",
+	destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org",
 
 	url => "http://wiki.example.org",
 	cgiurl => "http://wiki.example.org/ikiwiki.cgi",
diff --git a/make/git.mk b/make/git.mk
index 072617e..2c8c827 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -7,14 +7,24 @@ branches = $(master)
 # local name of origin
 origin = origin
 
-currentbranch = $(shell git branch | grep ^\* | awk '{ print $2 }')
-noncurrentbranches = $(filter-out $(currentbranch),$(branches))
+allbranches = $(sort $(master) $(branches))
+currentbranch := $(shell git branch | grep ^\* | awk '{ print $2 }')
+noncurrentbranches := $(filter-out $(currentbranch),$(branches))
+
+#originbranches := $(shell git branch -r | perl -ne 'm,^.\s+'"$$origin"'/([a-z_]\S+)$, && print "$$1\n"' )
+localbranches := $(shell git branch | perl -ne 'm,^.\s+([a-z_]\S+)$$, && print "$$1\n"' )
 
 update:
 	git fetch $(origin)
-	$(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)")
-	git pull "$(origin)"
-	$(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git pull "$(origin)" &&) git checkout "$(master)")
+	for branch in $(filter-out $(localbranches),$(allbranches)); do \
+		git branch $$branch $(origin)/$$branch; \
+	done
+	for branch in $(noncurrentbranches); do \
+		git checkout $$branch; \
+		git pull $(origin); \
+	done
+	git checkout $(master)
+	git pull $(origin)
 
 init:
 	git init
diff --git a/make/po4a.mk b/make/po4a.mk
index 9a09320..508935c 100644
--- a/make/po4a.mk
+++ b/make/po4a.mk
@@ -1,3 +1,8 @@
+package = PACKAGE
+module = MODULE
+version = VERSION
+locale = LOCALE
+
 # override with e.g. htmltemplate when handling non-Markdown files
 fileformat = text
 
@@ -10,6 +15,14 @@ threshold = 100
 # potfile: path to POT file
 mkpot:
 	po4a-gettextize -M UTF-8 -L UTF-8 -f "$(fileformat)" -o markdown $(patsubst %,-m %,$(l10nfiles)) -p "$(potfile)"
+	sed -i \
+	  -e 's/^# SOME DESCRIPTIVE TITLE/# $(locale) translation of $(module) pages for $(package)./' \
+	  -e '/^# This file/ s/PACKAGE/$(package)/' \
+	  -e '/^"Project-Id-Version:/ s/PACKAGE/$(package) $(module)/' \
+	  -e '/^"Project-Id-Version:/ s/VERSION/$(version)/' \
+	  -e '/^"Content-Type:/ s/CHARSET/UTF-8/' \
+	  -e '/^"Content-Transfer-Encoding:/ s/ENCODING/8bit/' \
+	  "$(potfile)"
 
 # Invoke from root dir of translated files
 # masterdir: path to dir containing untranslated files
diff --git a/make/rules.mk b/make/rules.mk
index 8da5f97..38fdbff 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -62,11 +62,11 @@ $(3)_L10NFILES = $$(patsubst $(1)/%,%,$$(shell find $(1) -type f -name '*.$$(fil
 MASTER_L10NFILES += $$(patsubst %,$(1)/%,$$($(3)_L10NFILES))
 
 $(podir)/$(3).pot: $(1)
-	$(MAKE) -f "$$(CURDIR)/make/po4a.mk" -C "$(1)" fileformat="$$(fileformat)" l10nfiles="$$($(3)_L10NFILES)" potfile="$(CURDIR)/$$@" mkpot; \
+	$(MAKE) -f "$$(CURDIR)/make/po4a.mk" -C "$(1)" package="$(4)" module="$(3)" version="$(5)" locale="LOCALE" fileformat="$$(fileformat)" l10nfiles="$$($(3)_L10NFILES)" potfile="$(CURDIR)/$$@" mkpot; \
 
 .PHONY: $(1)
 endef
-$(foreach source,$(SOURCES),$(foreach module,$($(source)_POMODULES),$(eval $(call POT_template,$(masterdir),,$(module),$(source)))))
+$(foreach source,$(SOURCES),$(foreach module,$($(source)_POMODULES),$(eval $(call POT_template,$(masterdir),,$(module),$(source),$($(source)_VERSION)))))
 
 
 
diff --git a/po/basewiki.da.po b/po/basewiki.da.po
index 8d3eb37..c5a0dd4 100644
--- a/po/basewiki.da.po
+++ b/po/basewiki.da.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki basewiki 2.47\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: 2008-08-04 00:21+0300\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: none\n"
@@ -22,13 +22,13 @@ msgstr "[[!meta redir=ikiwiki/blog delay=10]]\n"
 
 # 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
+#: 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 "[[!meta robots=\"noindex, follow\"]]\n"
@@ -96,8 +96,8 @@ msgstr "[[ikiwiki/pagespec]]"
 
 # type: Bullet: '* '
 #: ikiwiki.mdwn:17
-msgid "[[ikiwiki/PreprocessorDirective]]"
-msgstr "[[PreprocessorDirektiv|ikiwiki/PreprocessorDirective]]"
+msgid "[[ikiwiki/directive]]"
+msgstr "[[direktiv|ikiwiki/directive]]"
 
 # type: Bullet: '* '
 #: ikiwiki.mdwn:17
@@ -144,13 +144,13 @@ 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 ""
 "[[!if test=\"enabled(inline)\"\n"
 "     then=\"Du kan\"\n"
 "     else=\"Hvis denne wiki havde inline plugin aktiveret, kunne du\"]]\n"
 "omlægge enhver side på denne wiki til en weblog ved at bruge\n"
-"[[PreprocessorDirektivet|PreProcessorDirective]] `inline`. Som eksempel:\n"
+"[[direktivet|directive]] `inline`. Som eksempel:\n"
 
 # type: Plain text
 #: ikiwiki/blog.mdwn:13
@@ -177,8 +177,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 ""
 "Den valgfri `rootpage`-parameter fortæller wikien at nye indlæg til denne "
 "blog som standard skal være [[UnderSider|SubPage]] til \"blog\", og "
@@ -480,6 +480,111 @@ msgstr ""
 "URLen for siden som indeholder `inline`-direktivet."
 
 # 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 ""
+"Direktiver ligner et [[WikiLink]] i form, undtagen at de begynder med `!` og "
+"kan indeholde parametre. Generelt er formen:"
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:6
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!direktiv param=\"værdi\" param=\"værdi\"]]\n"
+
+# 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 ""
+"Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme "
+"siden på forskellige måder."
+
+# 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 ""
+"Citationen omkring værdier kan udelades hvis værdien er et simpelt ord. "
+"Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:"
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:14
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+# 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 ""
+"Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud "
+"over flere linjer hvis du har lyst:"
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:20
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!direktiv foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+# 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 ""
+"Flere linjer *citeret* tekst kan også bruges som værdi. For at tillade "
+"citation i den citerede tekst skal du adskille blokken med trippel-citat:"
+
+# type: Plain text
+#: ikiwiki/directive.mdwn:29
+#, no-wrap
+msgid ""
+"\t\\[[!directive text=\"\"\"\n"
+"\t1. \"foo\"\n"
+"\t2. \"bar\"\n"
+"\t3. \"baz\"\n"
+msgstr ""
+"\t\\[[!direktiv tekst=\"\"\"\n"
+"\t1. \"foo\"\n"
+"\t2. \"bar\"\n"
+"\t3. \"baz\"\n"
+
+# 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 ""
+"Ikiwiki har også en ældre syntaks til direktiver, som kræver et mellemrum i "
+"direktiver for at skelne dem fra [[wikilinks|wikilink]]. Denne syntaks har "
+"flere ulemper: den kræver et mellemrum efter direktiver uden parametre "
+"(såsom `\\[[pagecount ]]`), og den forbyder mellemrum i "
+"[[wikilinks|wikilink]]. Ikiwiki har nu den `!`-foranstillede syntaks vist "
+"ovenfor som det foretrukne alternativ. Ikiwiki understøtter dog fortsat den "
+"ældre syntaks, hvis ikke `prefix_directives`-valget er aktiveret. For "
+"bagudkompatibilitet med eksisterende wikier er dette valg som standard "
+"deaktiveret i øjeblikket, så ikiwiki understøtter den ældre syntaks."
+
+# type: Plain text
 #: ikiwiki/formatting.mdwn:1
 #, no-wrap
 msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
@@ -707,68 +812,104 @@ msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
 # type: Plain text
 #: ikiwiki/formatting.mdwn:73
 #, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:76
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af "
+"parameteriseret wikitekst."
+
+# 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 ""
+"* Insæt diverse [[directiver|directive]] på en side til at udføre nyttige\n"
+"  handlinger.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or (enabled(inline) and blog)\" then=\"\"\"\n"
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:82
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr "  Eksempelvis kan du:\n"
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:84
+#, no-wrap
 msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:75
+#: ikiwiki/formatting.mdwn:86
 msgid "Add a table of contents to a page:"
 msgstr "Tilføje en indholdsfortegnelse til en side:"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:77
+#: ikiwiki/formatting.mdwn:88
 #, no-wrap
-msgid "\t\\[[!toc ]]\n"
-msgstr "\t\\[[!toc ]]\n"
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
 
 # 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 "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
 
 # type: Bullet: '* '
-#: ikiwiki/formatting.mdwn:82
+#: ikiwiki/formatting.mdwn:93
 msgid "Change the title of a page:"
 msgstr "Ændre titlen på en side:"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:84
+#: ikiwiki/formatting.mdwn:95
 #, no-wrap
 msgid "\t\\[[!meta title=\"full page title\"]]\n"
 msgstr "\t\\[[!meta title=\"fuldstændige sidetitel\"]]\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:86
+#: ikiwiki/formatting.mdwn:97
 #, no-wrap
 msgid "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:88
+#: ikiwiki/formatting.mdwn:99
 msgid "Create a [[blog]] by inlining a set of pages:"
 msgstr "Oprette en [[blog]] ved at indlejre et udvalg af sider:"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:90
+#: ikiwiki/formatting.mdwn:101
 #, no-wrap
 msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
 msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:92
+#: ikiwiki/formatting.mdwn:103
 #, no-wrap
-msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:95
-msgid ""
-"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
-"text."
-msgstr ""
-"Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af "
-"parameteriseret wikitekst."
+#: ikiwiki/formatting.mdwn:105
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr "  Komplet oversigt over [[directiver|directive]] aktiveret for denne wiki:\n"
+
+# type: Plain text
+#: ikiwiki/formatting.mdwn:105
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
+msgstr "  [[!listdirectives ]]\n"
 
 # type: Plain text
 #: ikiwiki/markdown.mdwn:5
@@ -797,13 +938,13 @@ 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 ""
-"Bemærk at [[WikiLink]]s og [[PreProcessorDirektiv|PreProcessorDirective]]er "
-"ikke er en del af markdown-syntaksen, og er de eneste stumper opmærkning som "
-"denne wiki håndterer internt."
+"Bemærk at [[WikiLinks|WikiLink]] og [[direktiver|directive]] ikke er en "
+"del af markdown-syntaksen, og er de eneste stumper opmærkning som denne "
+"wiki håndterer internt."
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:1
@@ -1206,12 +1347,12 @@ 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 ""
 "Hvis vedhæftninger er aktiveret, kan wiki-administratoren styre hvilke typer "
-"vedhæftninger der vil blive accepteret, ved at angive et [[ikiwiki/"
-"PageSpec]] i \"Tilladte vedhæftninger\"-feltet på deres opsætningsside."
+"vedhæftninger der vil blive accepteret gennem opsætningsindstillingen "
+"`allowed_attachments`."
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:13
@@ -1233,10 +1374,10 @@ msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg
 # 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 ""
-"Den normale [[ikiwiki/PageSpec]] syntaks er udvidet med følgende yderligere "
+"Den normale [[ikiwiki/PageSpec]]-syntaks er udvidet med følgende yderligere "
 "tests:"
 
 # type: Bullet: '* '
@@ -1350,110 +1491,22 @@ msgstr "virusfree()"
 msgid "  Checks the attachment with an antiviral program.\n"
 msgstr "  Checker vedhæftningen med et antivirusprogram.\n"
 
-# 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 ""
-"Preprocessor-direktiver ligner et [[WikiLink]] i form, på nær at de begynder "
-"med `!` og kan indeholde parametre. Generelt er formen:"
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:6
-#, no-wrap
-msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
-msgstr "\t\\[[!direktiv param=\"værdi\" param=\"værdi\"]]\n"
-
-# type: Plain text
-#: 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 ""
-"Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme "
-"siden på forskellige måder."
-
-# 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 ""
-"Citationen omkring værdier kan udelades hvis værdien er et simpelt ord. "
-"Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:"
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:14
-#, no-wrap
-msgid "\t\\[[!tag foo]]\n"
-msgstr "\t\\[[!tag foo]]\n"
-
-# 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 ""
-"Et preprocessor-direktiv behøver ikke at blive holdt på een linje, det kan "
-"godt brede sig over flere linjer hvis du har lyst:"
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:20
-#, no-wrap
-msgid ""
-"\t\\[[!directive foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragalisticexpealadocious\" baz=11]]\n"
-msgstr ""
-"\t\\[[!direktiv foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragalisticexpealadocious\" baz=11]]\n"
-
-# 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 ""
-"Flere linjer *citeret* tekst kan også bruges som værdi. For at tillade "
-"citation i den citerede tekst skal du adskille blokken med trippel-citat:"
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:29
+# type: Bullet: '* '
+#: ikiwiki/preprocessordirective.mdwn:1 preprocessordirective.mdwn:1
 #, no-wrap
-msgid ""
-"\t\\[[!directive text=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
-msgstr ""
-"\t\\[[!direktiv tekst=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
+msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
+msgstr "[[!meta redir=ikiwiki/directive delay=10]]\n"
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:39
+#: ikiwiki/preprocessordirective.mdwn:7 preprocessordirective.mdwn:7
 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 ""
-"Ikiwiki har også en ældre syntaks til preprocessordirektiver, som kræver et "
-"mellemrum i direktiver for at skelne dem fra [[wikilinks|wikilink]]. Denne "
-"syntaks har flere ulemper: den kræver et mellemrum efter direktiver uden "
-"parametre (såsom `\\[[pagecount ]]`), og den forbyder mellemrum i "
-"[[wikilinks|wikilink]]. Ikiwiki har nu den `!`-foranstillede syntaks vist "
-"ovenfor som det foretrukne alternativ. Ikiwiki understøtter dog fortsat den "
-"ældre syntaks, hvis ikke `prefix_directives`-valget er aktiveret. For "
-"bagudkompatibilitet med eksisterende er dette valg som standard deaktiveret "
-"i øjeblikket, så ikiwiki understøtter den ældre syntaks."
+"Denne side er flyttet til [[ikiwiki/directive|ikiwiki/directive]]. Opdatér "
+"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
+"udgave af ikiwiki."
 
 # type: Plain text
 #: ikiwiki/searching.mdwn:6
@@ -1724,29 +1777,27 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:26
 #, no-wrap
-msgid "## Preprocessor directives and wikilinks\n"
-msgstr "## Preprocessordirektiver og wikilinks\n"
+msgid "## Directives and WikiLinks\n"
+msgstr "## Direktiver og wikilinks\n"
 
 # 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 `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 ""
-"ikiwiki har to syntakser til [[preprocessor_direktiver|"
-"PreprocessorDirective]]. Den ældre syntaks brugte mellemrum til at skelne "
-"mellem preprocessordirektiver og wikilinks; med det result, at når den "
-"syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må erstatte "
-"mellemrum med understregning. Den nyere syntaks, aktiveret med valget "
-"`prefix_directives` i en ikiwiki opsætningsfil, sætter `!` foran direktiver, "
-"og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige versioner "
-"af ikiwiki vil aktivere dette valg som standard."
+"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."
+msgstr ""
+"ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
+"brugte mellemrum til at skelne mellem direktiver og wikilinks; det medfører, "
+"at når den syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må "
+"erstatte mellemrum med understregning. Den nyere syntaks, aktiveret med "
+"valget `prefix_directives` i en ikiwiki-opsætningsfil, sætter `!` foran "
+"direktiver, og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige "
+"versioner af ikiwiki vil aktivere dette valg som standard."
 
 # type: Plain text
 #: index.mdwn:2
@@ -1815,24 +1866,6 @@ msgstr ""
 "dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
 "udgave af ikiwiki."
 
-# type: Bullet: '* '
-#: preprocessordirective.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/preprocessordirective delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/preprocessordirective delay=10]]\n"
-
-# 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 ""
-"Denne side er flyttet til\n"
-"[[ikiwiki/preprocessordirective|ikiwiki/preprocessordirective]]. Opdatér\n"
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig\n"
-"udgave af ikiwiki.\n"
-
 # type: Plain text
 #: recentchanges.mdwn:2
 #, no-wrap
@@ -2302,29 +2335,28 @@ msgstr "[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
 # 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 ""
-"Tilføj en ny genvej med [[PreprocessorDirektivet|ikiwiki/"
-"PreprocessorDirective]] `shortcut`. I URLen erstattes \"%s\" med teksten "
-"overdraget til den navngivne genvej, efter URL-omkodning, og '%S' erstattes "
-"med den rå ukodede tekst. Den valgfri `desc`-parameter styrer beskrivelsen "
-"af henvisningen."
+"Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I URLen "
+"erstattes \"%s\" med teksten overdraget til den navngivne genvej, efter URL-"
+"omkodning af den, og '%S' erstattes med den rå, ukodede tekst. Den valgfri "
+"`desc`-parameter styrer beskrivelsen af henvisningen."
 
 # 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."
+"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 ""
-"Husk at navnet (parameteren `name`) du giver genvejen bliver et nyt "
-"[[PreprocessorDirektiv|ikiwiki/PreprocessorDirective]]. Undgå et navn som er "
-"i strid med et eksisterende direktiv. Disse direktiver accepterer også en "
-"`desc` parameter som vil overskygge hvad der blev angivet ved definitionen."
+"Husk at `name`-parameteren som du tildeler genvejen bliver et nyt "
+"[[direktiv|ikiwiki/directive]]. Undgå et navn som er i strid med et "
+"eksisterende direktiv. Disse direktiver accepterer også en `desc`-parameter "
+"som vil overskygge den der blev angivet ved definitionen."
 
 # type: Plain text
 #: shortcuts.mdwn:77
@@ -2547,7 +2579,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"
@@ -2561,7 +2593,7 @@ msgid ""
 "        </span>\n"
 msgstr ""
 "        <span class=\"infobox\">\n"
-"        Navn: [[<TMPL_VAR raw_name>]]<br />\n"
+"        Navn: \\[[<TMPL_VAR raw_name>]]<br />\n"
 "        Alder: <TMPL_VAR age><br />\n"
 "        <TMPL_IF NAME=\"color\">\n"
 "        Favoritfarve: <TMPL_VAR color><br />\n"
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"
diff --git a/po/smiley.pot b/po/smiley.pot
index 2c31cbc..af1d775 100644
--- a/po/smiley.pot
+++ b/po/smiley.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki smiley 2.56\n"
-"POT-Creation-Date: 2008-08-04 00:01+0300\n"
+"Project-Id-Version: ikiwiki smiley 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"
diff --git a/po/templates.da.po b/po/templates.da.po
index 971051f..f6c0e8b 100644
--- a/po/templates.da.po
+++ b/po/templates.da.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki templates 2.56\n"
-"POT-Creation-Date: 2008-08-04 02:05+0300\n"
+"Project-Id-Version: ikiwiki templates 2.62.1\n"
+"POT-Creation-Date: 2008-08-30 05:13+0300\n"
 "PO-Revision-Date: 2008-08-04 02:14+0300\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -1301,7 +1301,7 @@ msgstr ""
 "</TMPL_IF>\n"
 
 # type: Plain text
-#: renamesummary.tmpl:19
+#: renamesummary.tmpl:21
 #, no-wrap
 msgid ""
 "<p>\n"
@@ -1314,6 +1314,7 @@ msgid ""
 "<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
 "</TMPL_IF>\n"
+"<TMPL_IF BROKENLINKS_CHECKED>\n"
 "<TMPL_IF BROKENLINKS>\n"
 "The following pages still link to <TMPL_VAR SRC>:\n"
 "<ul>\n"
@@ -1322,6 +1323,7 @@ msgid ""
 "<TMPL_ELSE>\n"
 "No pages have broken links to <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
+"</TMPL_IF>\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1334,6 +1336,7 @@ msgstr ""
 "<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
 "</TMPL_IF>\n"
+"<TMPL_IF BROKENLINKS_CHECKED>\n"
 "<TMPL_IF BROKENLINKS>\n"
 "De følgende sider henviser fortsat til <TMPL_VAR SRC>:\n"
 "<ul>\n"
@@ -1342,6 +1345,7 @@ msgstr ""
 "<TMPL_ELSE>\n"
 "Ingen sider har brudte henvisninger til <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
+"</TMPL_IF>\n"
 "</p>\n"
 
 # type: Plain text
@@ -1371,7 +1375,7 @@ msgid ""
 "\t<TMPL_IF NAME=\"ENCLOSURE\">\n"
 "\t<enclosure url=\"<TMPL_VAR ENCLOSURE>\" type=\"<TMPL_VAR TYPE>\" length=\"<TMPL_VAR LENGTH>\" />\n"
 "\t<TMPL_ELSE>\n"
-"\t<description><![CDATA[<TMPL_VAR CONTENT>]]></description>\n"
+"\t<description><TMPL_VAR CONTENT ESCAPE=HTML></description>\n"
 "\t</TMPL_IF>\n"
 "</item>\n"
 msgstr ""
@@ -1398,7 +1402,7 @@ msgstr ""
 "\t<TMPL_IF NAME=\"ENCLOSURE\">\n"
 "\t<enclosure url=\"<TMPL_VAR ENCLOSURE>\" type=\"<TMPL_VAR TYPE>\" length=\"<TMPL_VAR LENGTH>\" />\n"
 "\t<TMPL_ELSE>\n"
-"\t<description><![CDATA[<TMPL_VAR CONTENT>]]></description>\n"
+"\t<description><TMPL_VAR CONTENT ESCAPE=HTML></description>\n"
 "\t</TMPL_IF>\n"
 "</item>\n"
 
@@ -1436,13 +1440,13 @@ msgstr ""
 msgid ""
 "<form method=\"get\" action=\"<TMPL_VAR SEARCHACTION>\" id=\"searchform\">\n"
 "<div>\n"
-"<input type=\"text\" name=\"P\" value=\"\" size=\"16\" />\n"
+"<input type=\"text\" id=\"searchbox\" name=\"P\" value=\"\" size=\"16\" />\n"
 "</div>\n"
 "</form>\n"
 msgstr ""
 "<form method=\"get\" action=\"<TMPL_VAR SEARCHACTION>\" id=\"searchform\">\n"
 "<div>\n"
-"<input type=\"text\" name=\"P\" value=\"\" size=\"16\" />\n"
+"<input type=\"text\" id=\"searchbox\" name=\"P\" value=\"\" size=\"16\" />\n"
 "</div>\n"
 "</form>\n"
 
diff --git a/po/templates.pot b/po/templates.pot
index 99e9d1e..ce1ad64 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -1,4 +1,4 @@
-# LOCALE translation of template pages for ikiwiki.
+# LOCALE translation of templates pages for ikiwiki.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the ikiwiki package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki templates 2.56\n"
-"POT-Creation-Date: 2008-08-04 02:05+0300\n"
+"Project-Id-Version: ikiwiki templates 2.62.1\n"
+"POT-Creation-Date: 2008-08-30 05:11+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"
@@ -878,7 +878,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: renamesummary.tmpl:19
+#: renamesummary.tmpl:21
 #, no-wrap
 msgid ""
 "<p>\n"
@@ -892,6 +892,7 @@ msgid ""
 "<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
 "</TMPL_IF>\n"
+"<TMPL_IF BROKENLINKS_CHECKED>\n"
 "<TMPL_IF BROKENLINKS>\n"
 "The following pages still link to <TMPL_VAR SRC>:\n"
 "<ul>\n"
@@ -900,6 +901,7 @@ msgid ""
 "<TMPL_ELSE>\n"
 "No pages have broken links to <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
+"</TMPL_IF>\n"
 "</p>\n"
 msgstr ""
 
@@ -931,7 +933,7 @@ msgid ""
 "\t<enclosure url=\"<TMPL_VAR ENCLOSURE>\" type=\"<TMPL_VAR TYPE>\" "
 "length=\"<TMPL_VAR LENGTH>\" />\n"
 "\t<TMPL_ELSE>\n"
-"\t<description><![CDATA[<TMPL_VAR CONTENT>]]></description>\n"
+"\t<description><TMPL_VAR CONTENT ESCAPE=HTML></description>\n"
 "\t</TMPL_IF>\n"
 "</item>\n"
 msgstr ""
@@ -959,7 +961,7 @@ msgstr ""
 msgid ""
 "<form method=\"get\" action=\"<TMPL_VAR SEARCHACTION>\" id=\"searchform\">\n"
 "<div>\n"
-"<input type=\"text\" name=\"P\" value=\"\" size=\"16\" />\n"
+"<input type=\"text\" id=\"searchbox\" name=\"P\" value=\"\" size=\"16\" />\n"
 "</div>\n"
 "</form>\n"
 msgstr ""