From b20d08a4029882a5a11152b52a8cc6aa38b2f0fa Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 30 Aug 2008 15:57:16 +0200
Subject: Fix add missing colon in .notebook in style.css (bug#497176).

---
 style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style.css b/style.css
index 2e6cdee..44a6e0f 100644
--- a/style.css
+++ b/style.css
@@ -295,7 +295,7 @@ input#searchbox {
 	margin-bottom: 1ex;
 	padding: 1ex 1ex;
 	border: 1px solid #aaa;
-	width: 25%
+	width: 25%;
 	background: white;
 	color: black !important;
 }
-- 
cgit v1.2.3


From b1fadc6eacaacb4d892b495e15ff82e9ba36c638 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 22 Oct 2008 20:31:53 +0200
Subject: Sync with ikiwiki 2.67.

---
 blog.mdwn                        |   6 ---
 directive.mdwn                   |  45 ++++++++++++++++
 helponformatting.mdwn            |   6 ---
 ikiwiki.mdwn                     |   5 +-
 ikiwiki/blog.mdwn                | 110 ++-------------------------------------
 ikiwiki/directive.mdwn           |  20 ++++---
 ikiwiki/formatting.mdwn          |   6 +--
 ikiwiki/pagespec.mdwn            |  10 +++-
 ikiwiki/pagespec/attachment.mdwn |  41 ++++-----------
 markdown.mdwn                    |   6 ---
 openid.mdwn                      |   6 ---
 pagespec.mdwn                    |   6 ---
 preprocessordirective.mdwn       |   7 ---
 shortcuts.mdwn                   |   2 +-
 style.css                        |  20 +++++++
 subpage.mdwn                     |   6 ---
 templates.mdwn                   |   9 ++--
 wikilink.mdwn                    |   6 ---
 18 files changed, 112 insertions(+), 205 deletions(-)
 delete mode 100644 blog.mdwn
 create mode 100644 directive.mdwn
 delete mode 100644 helponformatting.mdwn
 delete mode 100644 markdown.mdwn
 delete mode 100644 openid.mdwn
 delete mode 100644 pagespec.mdwn
 delete mode 100644 preprocessordirective.mdwn
 delete mode 100644 subpage.mdwn
 delete mode 100644 wikilink.mdwn

diff --git a/blog.mdwn b/blog.mdwn
deleted file mode 100644
index d9faeb8..0000000
--- a/blog.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/blog delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your
-links, as this redirection page will be removed in a future ikiwiki
-release.
diff --git a/directive.mdwn b/directive.mdwn
new file mode 100644
index 0000000..c4342de
--- /dev/null
+++ b/directive.mdwn
@@ -0,0 +1,45 @@
+[[!meta robots="noindex, follow"]]
+Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
+begin with `!` and may contain parameters. The general form is:
+
+	\[[!directive param="value" param="value"]]
+
+This gets expanded before the rest of the page is processed, and can be used
+to transform the page in various ways.
+
+The quotes around values can be omitted if the value is a simple word.
+Also, some directives may use parameters without values, for example:
+
+	\[[!tag foo]]
+
+A directive does not need to all be on one line, it can be
+wrapped to multiple lines if you like:
+	
+	\[[!directive foo="baldersnatch"
+	bar="supercalifragilisticexpialidocious" baz=11]]
+
+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:
+
+	\[[!directive text="""
+	1. "foo"
+	2. "bar"
+	3. "baz"
+	"""]]
+
+ikiwiki also has an older syntax for directives, which requires a
+space in 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.
+
+[[!if test="enabled(listdirectives)" then="""
+Here is a list of currently available directives in this wiki:
+
+[[!listdirectives ]]
+"""]]
diff --git a/helponformatting.mdwn b/helponformatting.mdwn
deleted file mode 100644
index 9e79876..0000000
--- a/helponformatting.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/formatting delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please
-update your links, as this redirection page will be removed in a future
-ikiwiki release.
diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn
index 89337d0..e0a971d 100644
--- a/ikiwiki.mdwn
+++ b/ikiwiki.mdwn
@@ -7,11 +7,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
-* [[ikiwiki/blog]]
+* [[ikiwiki/wikilink]]
+* [[ikiwiki/subpage]]
 * [[ikiwiki/pagespec]]
 * [[ikiwiki/directive]]
-* [[ikiwiki/wikilink]]
 * [[ikiwiki/markdown]]
-* [[ikiwiki/subpage]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
diff --git a/ikiwiki/blog.mdwn b/ikiwiki/blog.mdwn
index 53d4c7a..0a5a524 100644
--- a/ikiwiki/blog.mdwn
+++ b/ikiwiki/blog.mdwn
@@ -1,108 +1,8 @@
 [[!meta robots="noindex, follow"]]
-[[!if test="enabled(inline)"
-     then="This wiki has the inline plugin **enabled**."
-     else="This wiki has the inline plugin **disabled**."]]
 
-[[!if test="enabled(inline)"
-     then="You can"
-     else="If this wiki had the inline plugin enabled, you could"]]
-turn any page on this wiki into a weblog by using the `inline`
-[[directive]]. For example:
+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.
 
-	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
-
-Any pages that match the specified [[PageSpec]] (in the example, any
-[[SubPage]] of "blog") will be part of the blog, and the newest 10
-of them will appear in the page. Note that if files that are not pages
-match the [[PageSpec]], they will be included in the feed using RSS
-enclosures, which is useful for podcasting.
-
-The optional `rootpage` parameter tells the wiki that new posts to this
-blog 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.
-
-If you want your blog to have an archive page listing every post ever made
-to it, you can accomplish that like this:
-
-	\[[!inline pages="blog/* and !*/Discussion" archive="yes"]]
-
-You can even create an automatically generated list of all the pages on the
-wiki, with the most recently added at the top, like this:
-
-	\[[!inline pages="* and !*/Discussion" archive="yes"]]
-
-If you want to be able to add pages to a given blog feed by tagging them,
-you can do that too. To tag a page, just make it link to a page or pages 
-that represent its tags. Then use the special `link()` [[PageSpec]] to match
-all pages that have a given tag:
-
-	\[[!inline pages="link(life)"]]
-
-Or include some tags and exclude others:
-
-	\[[!inline pages="link(debian) and !link(social)"]]
-
-## usage
-
-There are many parameters you can use with the `inline`
-directive. These are the commonly used ones:
-
-* `pages` - A [[PageSpec]] of the pages to inline.
-* `show` - Specify the maximum number of matching pages to inline.
-  Default is 10, unless archiving, when the default is to show all.
-  Set to 0 to show all matching pages.
-* `archive` - If set to "yes", only list page titles and some metadata, not
-  full contents.
-* `description` - Sets the description of the rss feed if one is generated.
-  Defaults to the name of the wiki.
-* `skip` - Specify a number of pages to skip displaying. Can be useful
-  to produce a feed that only shows archived pages.
-* `postform` - Set to "yes" to enable a form to post new pages to a
-  [[blog]].
-* `postformtext` - Set to specify text that is displayed in a postform.
-* `rootpage` - Enable the postform, and allows controling where
-  newly posted pages should go, by specifiying the page that
-  they should be a [[SubPage]] of.
-
-Here are some less often needed parameters:
-
-* `actions` - If set to "yes" add links to the bottom of the inlined pages 
-  for editing and discussion (if they would be shown at the top of the page
-  itself).
-* `rss` - controls generation of an rss feed. If the wiki is configured to
-  generate rss feeds by default, set to "no" to disable. If the wiki is
-  configured to `allowrss`, set to "yes" to enable.
-* `atom` - controls generation of an atom feed. If the wiki is configured to
-  generate atom feeds by default, set to "no" to disable. If the wiki is
-  configured to `allowatom`, set to "yes" to enable.
-* `feeds` - controls generation of all types of feeds. Set to "no" to
-  disable generating any feeds.
-* `template` - Specifies the template to fill out to display each inlined
-  page. By default the `inlinepage` template is used, while
-  the `archivepage` template is used for archives. Set this parameter to
-  use some other, custom template, such as the `titlepage` template that
-  only shows post titles. Note that you should still set `archive=yes` if
-  your custom template does not include the page content.
-* `raw` - Rather than the default behavior of creating a [[blog]],
-  if raw is set to "yes", the page will be included raw, without additional
-  markup around it, as if it were a literal part of the source of the 
-  inlining page.
-* `sort` - Controls how inlined pages are sorted. The default, "age" is to
-  sort newest created pages first. Setting it to "title" will sort pages by
-  title, and "mtime" sorts most recently modified pages first.
-* `reverse` - If set to "yes", causes the sort order to be reversed.
-* `feedshow` - Specify the maximum number of matching pages to include in
-  the rss/atom feeds. The default is the same as the `show` value above.
-* `feedonly` - Only generate the feed, do not display the pages inline on
-  the page.
-* `quick` - Build archives in quick mode, without reading page contents for
-  metadata. By default, this also turns off generation of any feeds.
-* `timeformat` - Use this to specify how to display the time or date for pages
-  in the blog. The format string is passed to the strftime(3) function.
-* `feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom
-  feeds. The default is the same as the `pages` value above, and only pages
-  matches by that value are included, but some of those can be excluded by
-  specifying a tighter [[PageSpec]] here.
-* `guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`),
-  the Atom feed will have this as its `<id>`. The default is to use the URL
-  of the page containing the `inline` directive.
+Please update your links, as this redirection page will be removed in a
+future ikiwiki release.
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn
index a0a4e1f..c4342de 100644
--- a/ikiwiki/directive.mdwn
+++ b/ikiwiki/directive.mdwn
@@ -1,5 +1,5 @@
 [[!meta robots="noindex, follow"]]
-Directives are similar to a [[WikiLink]] in form, except they
+Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
 begin with `!` and may contain parameters. The general form is:
 
 	\[[!directive param="value" param="value"]]
@@ -29,11 +29,17 @@ of text with triple-quotes:
 	"""]]
 
 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.
+space in 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.
+
+[[!if test="enabled(listdirectives)" then="""
+Here is a list of currently available directives in this wiki:
+
+[[!listdirectives ]]
+"""]]
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index 0145f9d..2ed5cc2 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -77,7 +77,7 @@ you use the following additional features:
 
 * Insert various [[directives|directive]] onto a page to perform useful
   actions.
-[[!if test="enabled(toc) or enabled(meta) or (enabled(inline) and blog)" then="""
+[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
   For example, you can:
 """]]
 
@@ -94,8 +94,8 @@ you use the following additional features:
 	\[[!meta title="full page title"]]
 """]]
 
-[[!if test="enabled(inline) and blog" then="""
-  * Create a [[blog]] by inlining a set of pages:
+[[!if test="enabled(inline)" then="""
+  * Create a blog by inlining a set of pages:
 
 	\[[!inline pages="blog/*"]]
 """]]
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index 156e3f6..c78666c 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -22,8 +22,7 @@ match all pages except for Discussion pages and the SandBox:
 
 	* and !SandBox and !*/Discussion
 
-Some more elaborate limits can be added to what matches using any of these
-functions:
+Some more elaborate limits can be added to what matches using these functions:
 
 * "`link(page)`" - match only pages that link to a given page (or glob)
 * "`backlink(page)`" - match only pages that a given page links to
@@ -41,6 +40,13 @@ functions:
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
   "`license(glob)`", "`copyright(glob)`" - match pages that have the given
   metadata, matching the specified glob.
+* "`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.
+* "`admin()`" - tests whether a modification is being made by one of the
+  wiki admins.
+* "`ip(address)`" - tests whether a modification is being made from the
+  specified IP address.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index 6b86c51..2d33db7 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/ikiwiki/pagespec/attachment.mdwn
@@ -16,41 +16,22 @@ check all attachments for virii, something like this could be used:
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 
-* 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.
+* "`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.
   
-* minsize(size)
-
-  Tests whether the attachment is no smaller than the specified size.
-
-* ispage()
+* "`minsize(size)`" - Tests whether the attachment is no smaller than the
+  specified size.
 
-  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).
+* "`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).
 
   So, if you don't want to allow wiki pages to be uploaded as attachments,
   use `!ispage()` ; if you only want to allow wiki pages to be uploaded
   as attachments, use `ispage()`.
 
-* user(username)
-
-  Tests whether the attachment is being uploaded by a user with the
-  specified username. If openid is enabled, an openid can also be put here.
-
-* ip(address)
-
-  Tests whether the attacment is being uploaded from the specified IP
-  address.
-
-* mimetype(foo/bar)
-
-  This checks the MIME type of the attachment. You can include a glob
-  in the type, for example `mimetype(image/*)`.
-
-* virusfree()
+* "`mimetype(foo/bar)`" - This checks the MIME type of the attachment. You can
+  include a glob in the type, for example `mimetype(image/*)`.
 
-  Checks the attachment with an antiviral program.
+* "`virusfree()`" - Checks the attachment with an antiviral program.
diff --git a/markdown.mdwn b/markdown.mdwn
deleted file mode 100644
index cefd2f5..0000000
--- a/markdown.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/markdown delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update
-your links, as this redirection page will be removed in a future ikiwiki
-release.
diff --git a/openid.mdwn b/openid.mdwn
deleted file mode 100644
index 5a462c9..0000000
--- a/openid.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/openid delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your
-links, as this redirection page will be removed in a future ikiwiki
-release.
diff --git a/pagespec.mdwn b/pagespec.mdwn
deleted file mode 100644
index c3caf59..0000000
--- a/pagespec.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/pagespec delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update
-your links, as this redirection page will be removed in a future ikiwiki
-release.
diff --git a/preprocessordirective.mdwn b/preprocessordirective.mdwn
deleted file mode 100644
index bd12895..0000000
--- a/preprocessordirective.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!meta redir=ikiwiki/directive delay=10]]
-[[!meta robots="noindex, follow"]]
-
-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.
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 4bb6774..14cd5ff 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -27,7 +27,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
   * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
-  [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
+* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
 * [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
diff --git a/style.css b/style.css
index 44a6e0f..5787ef6 100644
--- a/style.css
+++ b/style.css
@@ -30,6 +30,10 @@
 	border-bottom: 0;
 }
 
+div.inlinecontent {
+	margin-top: .4em;
+}
+
 .actions li {
 	display: inline;
 	padding: .2em .4em;
@@ -249,6 +253,22 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+div.progress {
+	margin-top: 1ex;
+	margin-bottom: 1ex;
+	border: 1px solid #888;
+	width: 400px;
+	background: #eee;
+	color: black !important;
+	padding: 1px;
+}
+div.progress-done {
+	background: #ea6 !important;
+	color: black !important;
+	text-align: center;
+	padding: 1px;
+}
+
 input#openid_url {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
diff --git a/subpage.mdwn b/subpage.mdwn
deleted file mode 100644
index 64598b5..0000000
--- a/subpage.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/subpage delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update your
-links, as this redirection page will be removed in a future ikiwiki
-release.
diff --git a/templates.mdwn b/templates.mdwn
index 1c234e3..eff0e15 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -9,8 +9,6 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-## Available templates
-
 These templates are available for inclusion onto other pages in this
 wiki:
 
@@ -83,6 +81,7 @@ 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.
 
-Note the use of "raw_name" inside the [[WikiLink]] generator. This ensures
-that if the name contains something that might be mistaken for wiki markup,
-it's not converted to html before being processed as a [[WikiLink]].
+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]].
diff --git a/wikilink.mdwn b/wikilink.mdwn
deleted file mode 100644
index b5a1a8e..0000000
--- a/wikilink.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta redir=ikiwiki/wikilink delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update
-your links, as this redirection page will be removed in a future ikiwiki
-release.
-- 
cgit v1.2.3


From ef6324a81724619a7811a964200208f5c808ac10 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 23 Oct 2008 03:57:20 +0200
Subject: Apply translation from po-file.

---
 directive.mdwn                     |  47 ++++++------
 ikiwiki.mdwn                       |  14 ++--
 ikiwiki/blog.mdwn                  |  10 +--
 ikiwiki/directive.mdwn             |  47 ++++++------
 ikiwiki/formatting.mdwn            |  88 ++++++++++++-----------
 ikiwiki/markdown.mdwn              |  21 +++---
 ikiwiki/openid.mdwn                |  29 ++++----
 ikiwiki/pagespec.mdwn              | 142 ++++++++++++++++++-------------------
 ikiwiki/pagespec/attachment.mdwn   |  48 ++++++-------
 ikiwiki/preprocessordirective.mdwn |   7 +-
 ikiwiki/searching.mdwn             |  31 ++++----
 ikiwiki/subpage.mdwn               |  20 +++---
 ikiwiki/subpage/linkingrules.mdwn  |  55 +++++++-------
 ikiwiki/wikilink.mdwn              |  52 +++++++-------
 index.mdwn                         |   7 +-
 recentchanges.mdwn                 |   4 +-
 sandbox.mdwn                       |  33 ++++-----
 shortcuts.mdwn                     |  42 +++++------
 templates.mdwn                     | 102 +++++++++++++-------------
 templates/note.mdwn                |   8 +--
 templates/popup.mdwn               |  17 +++--
 21 files changed, 415 insertions(+), 409 deletions(-)

diff --git a/directive.mdwn b/directive.mdwn
index c4342de..ea67469 100644
--- a/directive.mdwn
+++ b/directive.mdwn
@@ -1,45 +1,44 @@
 [[!meta robots="noindex, follow"]]
-Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
-begin with `!` and may contain parameters. The general form is:
+Direktiver ligner et [[ikiwiki/WikiLink]] i form, undtagen at de begynder
+med `!` og kan indeholde parametre. Generelt er formen:
 
-	\[[!directive param="value" param="value"]]
+	\[[!direktiv param="værdi" param="værdi"]]
 
-This gets expanded before the rest of the page is processed, and can be used
-to transform the page in various ways.
+Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme
+siden på forskellige måder.
 
-The quotes around values can be omitted if the value is a simple word.
-Also, some directives may use parameters without values, for example:
+Citationen omkring værdier kan udelades hvis værdien er et simpelt
+ord. Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:
 
 	\[[!tag foo]]
 
-A directive does not need to all be on one line, it can be
-wrapped to multiple lines if you like:
+Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud over
+flere linjer hvis du har lyst:
 	
-	\[[!directive foo="baldersnatch"
+	\[[!direktiv foo="baldersnatch"
 	bar="supercalifragilisticexpialidocious" baz=11]]
 
-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:
+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:
 
-	\[[!directive text="""
+	\[[!direktiv tekst="""
 	1. "foo"
 	2. "bar"
 	3. "baz"
 	"""]]
 
-ikiwiki also has an older syntax for directives, which requires a
-space in 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.
+Ikiwiki har også en ældre syntaks til direktiver, som kræver et mellemrum i
+direktiver for at skelne dem fra [[wikilinks|ikiwiki/wikilink]].  Denne
+syntaks har flere ulemper: den kræver et mellemrum efter direktiver uden
+parametre (såsom `\[[pagecount ]]`), og den forbyder mellemrum i
+[[wikilinks|ikiwiki/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.
 
 [[!if test="enabled(listdirectives)" then="""
-Here is a list of currently available directives in this wiki:
+Her er en oversigt over konkret tilgængelige direktiver i for denne wiki:
 
 [[!listdirectives ]]
 """]]
diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn
index e0a971d..a19794e 100644
--- a/ikiwiki.mdwn
+++ b/ikiwiki.mdwn
@@ -1,16 +1,16 @@
 [[!meta robots="noindex, follow"]]
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
-     then="(Currently running version [[!version ]].)"
+     then="(kører i øjeblikket version [[!version ]].)"
 ]]
 
-Some documentation on using ikiwiki:
+Noget dokumentation om brug af ikiwiki:
 
-* [[ikiwiki/formatting]]
+* [[formatering|ikiwiki/formatting]]
 * [[ikiwiki/wikilink]]
-* [[ikiwiki/subpage]]
+* [[underside|ikiwiki/subpage]]
 * [[ikiwiki/pagespec]]
-* [[ikiwiki/directive]]
+* [[direktiv|ikiwiki/directive]]
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
-* [[ikiwiki/searching]]
+* [[søgning|ikiwiki/searching]]
diff --git a/ikiwiki/blog.mdwn b/ikiwiki/blog.mdwn
index 0a5a524..dbdf83f 100644
--- a/ikiwiki/blog.mdwn
+++ b/ikiwiki/blog.mdwn
@@ -1,8 +1,8 @@
 [[!meta robots="noindex, follow"]]
 
-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.
+Denne side er blevet fjernet fra ikiwiki's basewiki. For dokumentation om
+oprettelse af en blog med ikiwiki se dokumentationen til [[!iki
+ikiwiki/directive/inline desc=inline]]-direktivet.
 
-Please update your links, as this redirection page will be removed in a
-future ikiwiki release.
+Opdatér dine henvisninger, da denne omdirigeringsside bliver fjernet i en
+fremtidig udgave af ikiwiki.
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn
index c4342de..ea67469 100644
--- a/ikiwiki/directive.mdwn
+++ b/ikiwiki/directive.mdwn
@@ -1,45 +1,44 @@
 [[!meta robots="noindex, follow"]]
-Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
-begin with `!` and may contain parameters. The general form is:
+Direktiver ligner et [[ikiwiki/WikiLink]] i form, undtagen at de begynder
+med `!` og kan indeholde parametre. Generelt er formen:
 
-	\[[!directive param="value" param="value"]]
+	\[[!direktiv param="værdi" param="værdi"]]
 
-This gets expanded before the rest of the page is processed, and can be used
-to transform the page in various ways.
+Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme
+siden på forskellige måder.
 
-The quotes around values can be omitted if the value is a simple word.
-Also, some directives may use parameters without values, for example:
+Citationen omkring værdier kan udelades hvis værdien er et simpelt
+ord. Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:
 
 	\[[!tag foo]]
 
-A directive does not need to all be on one line, it can be
-wrapped to multiple lines if you like:
+Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud over
+flere linjer hvis du har lyst:
 	
-	\[[!directive foo="baldersnatch"
+	\[[!direktiv foo="baldersnatch"
 	bar="supercalifragilisticexpialidocious" baz=11]]
 
-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:
+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:
 
-	\[[!directive text="""
+	\[[!direktiv tekst="""
 	1. "foo"
 	2. "bar"
 	3. "baz"
 	"""]]
 
-ikiwiki also has an older syntax for directives, which requires a
-space in 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.
+Ikiwiki har også en ældre syntaks til direktiver, som kræver et mellemrum i
+direktiver for at skelne dem fra [[wikilinks|ikiwiki/wikilink]].  Denne
+syntaks har flere ulemper: den kræver et mellemrum efter direktiver uden
+parametre (såsom `\[[pagecount ]]`), og den forbyder mellemrum i
+[[wikilinks|ikiwiki/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.
 
 [[!if test="enabled(listdirectives)" then="""
-Here is a list of currently available directives in this wiki:
+Her er en oversigt over konkret tilgængelige direktiver i for denne wiki:
 
 [[!listdirectives ]]
 """]]
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index 2ed5cc2..cead343 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -1,30 +1,30 @@
-[[!meta title="Formatting wiki pages"]]
+[[!meta title="Formatering af wikisider"]]
 [[!meta robots="noindex, follow"]]
 
-Text on this wiki is, by default, written in a form very close to how you
-might write text for an email message. This style of text formatting is
-called [[MarkDown]], and it works like this:
+Teksten på denne wiki er, som udgangspunkt, skrevet på en måde som ligger
+tæt op ad hvordan du muligvis formulerer dig i email-beskeder. Denne form
+for tekstformatering kaldes [[MarkDown]], og det fungerer sådan her:
 
-Leave blank lines between paragraphs.
+hold afstand med blanke linjer mellem afsnit.
 
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
-in single or double asterisks.
+du kan \**fremhæve*\* eller \*\***kraftigt fremhæve**\*\* tekst ved at
+placere det med enkelte eller dobbelte asterisker (stjerner) omkring.
 
-To create a list, start each line with an asterisk:
+En liste oprettes ved at begynde hver linje med en asterisk:
 
-* "* this is my list"
-* "* another item"
+* "* dette er min liste"
+* "* et andet emne"
 
-To make a numbered list, start each line with a number (any number will
-do) followed by a period:
+En nummereret liste laves ved at starte hver linje med et nummer (ethvert
+nummer kan bruges) efterfulgt af punktum:
 
-1. "1. first line"
-2. "2. second line"
-2. "2. third line"
+1. "1. første linje"
+2. "2. anden linje"
+2. "2. tredje linje"
 
-To create a header, start a line with one or more `#` characters followed
-by a space and the header text. The number of `#` characters controls the
-size of the header:
+En overskrift eller en sektion er en linje med et eller flere `#`-tegn
+efterfulgt af et mellemrum og overskriftsteksten. Antallet af `#`-tegn
+styrer overskriftens størrelse:
 
 # # h1
 ## ## h2
@@ -33,74 +33,76 @@ size of the header:
 ##### ##### h5
 ###### ###### h6
 
-To create a horizontal rule, just write three or more dashes or stars on
-their own line:
+En vandret skillelinje oprettes ved at skrive tre eller flere bindestreger
+eller stjerner på en linje for sig selv.
 
 ----
 
-To quote someone, prefix the quote with ">":
+Citater angives ved at sætte ">" foran hver linje:
 
-> To be or not to be,
-> that is the question.
+> At være eller ikke være,
+> det er spørgsmålet.
 
-To write a code block, indent each line with a tab or 4 spaces:
+En kodeblok skrives ved at indrykke hver linje med eet tabulator-tegn eller
+4 mellemrum:
 
 	10 PRINT "Hello, world!"
 	20 GOTO 10
 
-To link to an url or email address, you can just put the
-url in angle brackets: <<http://ikiwiki.info>>, or you can use the
-form \[link text\]\(url\)
+Du kan henvise til en URL eller en email-adresse ved at putte addressen i
+vinkelklammer: <<http://ikiwiki.info>>, eller du kan bruge formen
+\[henvisningstekst\]\(adresse\)
 
 ----
 
-In addition to basic html formatting using [[MarkDown]], this wiki lets
-you use the following additional features:
+Udover normal html-formatering med [[MarkDown]], kan du med denne wiki bruge
+følgende ekstra finesser:
 
-* To link to another page on the wiki, place the page's name inside double
-  square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
+* Henvise til en anden side på wikien ved at skrive sidenavnet med dobbelte
+  lodrette klammer omkring. Udtrykket `\[[WikiLink]]` henviser til
+  [[WikiLink]].
 
 [[!if test="enabled(smiley) and smileys" then="""
-* Insert [[smileys]] and some other useful symbols. :-)
+* Indsætte [[smileys]] og andre anvendelige symboler. :-)
 """]]
 
 [[!if test="enabled(shortcut) and shortcuts" then="""
-* Use [[shortcuts]] to link to common resources.
+* Bruge [[genveje|shortcuts]] til at henvise til gængse ressourcer.
 
 	\[[!wikipedia War\_of\_1812]]
 """]]
 
 [[!if test="enabled(template) and templates" then="""
-* Create and fill out [[templates]] for repeated chunks of
-  parameterized wiki text.
+* Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af
+  parameteriseret wikitekst.
 """]]
 
-* Insert various [[directives|directive]] onto a page to perform useful
-  actions.
+* Indsæt diverse [[directiver|directive]] på en side for at udføre nyttige
+  handlinger.
 [[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
-  For example, you can:
+  Eksempelvis kan du:
 """]]
 
 [[!if test="enabled(toc)" then="""
-  * Add a table of contents to a page:
+  * Tilføje en indholdsfortegnelse til en side:
 
 	\[[!toc]]
 """]]
 
 
 [[!if test="enabled(meta)" then="""
-  * Change the title of a page:
+  * Ændre titlen på en side:
 
-	\[[!meta title="full page title"]]
+	\[[!meta title="fuldstændige sidetitel"]]
 """]]
 
 [[!if test="enabled(inline)" then="""
-  * Create a blog by inlining a set of pages:
+  * Oprette en [[blog]] ved at indlejre et udvalg af sider:
 
 	\[[!inline pages="blog/*"]]
 """]]
 
 [[!if test="enabled(listdirectives)" then="""
-  Full list of [[directives|directive]] enabled for this wiki:
+  Komplet oversigt over [[directiver|directive]] aktiveret for denne wiki:
   [[!listdirectives ]]
 """]]
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn
index a419094..087b274 100644
--- a/ikiwiki/markdown.mdwn
+++ b/ikiwiki/markdown.mdwn
@@ -1,13 +1,14 @@
 [[!meta robots="noindex, follow"]]
-[Markdown](http://daringfireball.net/projects/markdown/)
-is a minimal markup language that resembles plain text as used in
-email messages. It is the markup language used by this wiki by default.
+[Markdown](http://daringfireball.net/projects/markdown/) er et minimalt
+opmærkningssprog som afspejler simpel tekst som det bruges i
+email-beskeder. Det er standard opmærkningssprog for denne wiki.
 
-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.
+Du kan læse dokumentation til markdown-syntaksen under
+[[formatering|formatting]] og [Markdown:
+syntax](http://daringfireball.net/projects/markdown/syntax). En [markdown
+modus](http://jblevins.org/projects/markdown-mode/) til emacs kan være en
+hjælp ved redigering.
 
-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.
+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.
diff --git a/ikiwiki/openid.mdwn b/ikiwiki/openid.mdwn
index dd851e5..ee84bea 100644
--- a/ikiwiki/openid.mdwn
+++ b/ikiwiki/openid.mdwn
@@ -2,33 +2,36 @@
 [[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(openid)"
-     then="This wiki has OpenID **enabled**."
-     else="This wiki has OpenID **disabled**."]]
+     then="Denne wiki har OpenID **aktiveret**."
+     else="Denne wiki har OpenID **deaktiveret**."]]
 
-[OpenID](http://openid.net) is a decentralized authentication mechanism
-that allows you to have one login that you can use on a growing number of
-websites.
+[OpenID](http://openid.net) er en decentral ægthedsmekanisme som giver dig
+mulighed for at have eet login som du kan bruge på et voksende antal
+websteder.
 
-To sign up for an OpenID, visit one of the following identity providers:
+Du kan registrere en OpenID ved at besøge en af de følgende
+identitetsudbydere:
 
 * [MyOpenID](https://www.myopenid.com/)
 * [GetOpenID](https://getopenid.com/)
 * [Videntity](http://videntity.org/)
 * [LiveJournal](http://www.livejournal.com/openid/)
 * [TrustBearer](https://openid.trustbearer.com/)
-* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html).
+* eller en af de [mange andre
+  derude](http://openiddirectory.com/openid-providers-c-1.html).
 
-Your OpenID is the URL that you are given when you sign up.
+Din OpenID er den URL som du får når du registrerer dig.
 [[!if test="enabled(openid)" then="""
-To sign in to this wiki using OpenID, just enter it in the OpenID field in the
-signin form. You do not need to give this wiki a password or go through any
-registration process when using OpenID.
+Du kan logge på denne wiki med OpenID, ved blot at angive den i
+OpenID-feltet på login-siden. Du behøves ikke at oplyse din adgangskode til
+denne wiki eller at gennemgå en registreringsproces når du bruger OpenID.
 """]]
 
 ---
 
-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:
+Det er også muligt at lave en side i wikien brugbar som en OpenID URL, ved
+at delegere den til en openid server. Her er et eksempel på hvordan det kan
+gøres:
 
 	\[[!meta openid="http://yourid.myopenid.com/"
 	       server="http://www.myopenid.com/server"]]
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index c78666c..59a5c84 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -1,91 +1,91 @@
 [[!meta robots="noindex, follow"]]
-To select a set of pages, such as pages that are locked, pages
-whose commit emails you want subscribe to, or pages to combine into a
-blog, the wiki uses a PageSpec. This is an expression that matches
-a set of pages.
+Til at angive et udvalg af sider, eksempelvis låste sider, sider du vil
+abonnere på ændringer til, eller sider som skal udgøre en blog, anvender
+wikien et PageSpec. dette er et udtryk som modsvarer et bestemt udvalg af
+sider.
 
-The simplest PageSpec is a simple list of pages. For example, this matches
-any of the three listed pages:
+Det simpleste PageSpec er simpelthen en opremsning af sider med "or" imellem
+("or" betyder "eller" på engelsk). Dette modsvarer eksempelvis enhver af de
+tre nævnte sider:
 
 	foo or bar or baz
 
-More often you will want to match any pages that have a particular thing in
-their name. You can do this using a glob pattern. "`*`" stands for any part
-of a page name, and "`?`" for any single letter of a page name. So this
-matches all pages about music, and any [[SubPage]]s of the SandBox, but does
-not match the SandBox itself:
+Mere hyppigt har du dog brug for at at at modsvare sider med noget tilfælles
+i deres navne. Dette kan du udtrykke med et "glob-mønster". "`*`" står for
+enhver del af sidenavnet, og "`?`" for ethvert enkeltbogstav i
+sidenavnet. Så dette modsvarer alle sider om musik, og alle
+[[UnderSider||SubPage]] til sandkassen, men ikke selve sandkasse-siden:
 
-	*music* or SandBox/*
+	*musik* or SandBox/*
 
-You can also prefix an item with "`!`" to skip pages that match it. So to
-match all pages except for Discussion pages and the SandBox:
+Du kan også angive "`!`" foran et emne for at undgå sider som modsvarer
+det. Så for at modsvare alle sider undtagen diskussionssider og sandkassen:
 
 	* and !SandBox and !*/Discussion
 
-Some more elaborate limits can be added to what matches using these functions:
-
-* "`link(page)`" - match only pages that link to a given page (or glob)
-* "`backlink(page)`" - match only pages that a given page links to
-* "`creation_month(month)`" - match only pages created on the given month
-* "`creation_day(mday)`" - or day of the month
-* "`creation_year(year)`" - or year
-* "`created_after(page)`" - match only pages created after the given page
-  was created
-* "`created_before(page)`" - match only pages created before the given page
-  was created
-* "`glob(someglob)`" - match pages that match the given glob. Just writing
-  the glob by itself is actually a shorthand for this function.
-* "`internal(glob)`" - like `glob()`, but matches even internal-use 
-  pages that globs do not usually match.
-* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
-  "`license(glob)`", "`copyright(glob)`" - match pages that have the given
-  metadata, matching the specified glob.
-* "`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.
-* "`admin()`" - tests whether a modification is being made by one of the
-  wiki admins.
-* "`ip(address)`" - tests whether a modification is being made from the
-  specified IP address.
-
-For example, to match all pages in a blog that link to the page about music
-and were written in 2005:
-
-	blog/* and link(music) and creation_year(2005)
-
-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 you
-want to combine expression like that; "or" when it's enough for a page to
-match one expression. Note that it doesn't make sense to say "index and
-SandBox", since no page can match both expressions.
-
-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
-of two tags, use:
+Resultaterne kan begrænses mere nuanceret med disse funktioner:
+
+* "`link(side)`" - modsvarer kun sider som henviser til en given side (eller
+  glob)
+* "`backlink(side)`" - modsvarer kun sider som en given side henviser til
+* "`creation_month(måned)`" - modsvarer kun sider oprettet den givne måned
+* "`creation_day(månedsdag)`" - eller dag på måneden
+* "`creation_year(år)`" - eller år
+* "`created_after(side)`" - modsvarer kun sider oprettet efter den givne
+  side blev oprettet
+* "`created_before(side)`" - modsvarer kun sider oprettet før den givne side
+  blev oprettet
+* "`glob(nogetglob)`" - modsvarer sider som modsvarer det givne glob. Blot
+  at skrive glob'et alene er faktisk en genvej til denne funktion.
+* "`internal(glob)`" - lissom `glob()`, men modsvarer også internt anvendte
+  sider som glob normalt ikke modsvarer.
+* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", "`license(glob)`",
+  "`copyright(glob)`" - modsvarer sider med de givne metadata, som modsvarer
+  det angivne glob.
+* "`user(brugernavn)`" - tester hvorvidt en ændring foretages af en bruger
+  med det angivne  brugernavn. Hvis openid er aktiveret, kan en openid også
+  bruges her.
+* "`admin()`" - tester hvorvidt en ændring foretages af en af
+  wiki-administratorerne.
+* "`ip(adresse)`" - tester hvorvidt en ændring foretages fra den angivne
+  IP-adresse.
+
+For eksempelvis at modsvare alle sider i en blog som henviser til en side om
+musik og som blev skrevet i 2005:
+
+	blog/* and link(musik) and creation_year(2005)
+
+Bemærk brugen af "and" i eksemplet ovenfor ("and" betyder "og" på engelsk),
+som betyder at kun sider der modsvarer hver af de tre udtryk modsvarer det
+hele. Brug "and" når du vil kombinere udtryk på den måde; "or" når det er
+nok at én side modsvarer et udtryk. Bemærk at det ikke giver mening at sige
+"index and SandBox", da ingen sider kan modsvare begge udtryk.
+
+Mere komplekse udtryk kan dannes ved at gruppere med paranteser. Eksempelvis
+modsvarer dette sider i en blog som er mærket af med en af to mærkater:
 
 	blog/* and (link(tag/foo) or link(tag/bar))
 
-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 not match a page named "a/foo" or "a/b/foo". To match
-relative to the directory of the page containing the pagespec, you can
-use "./". For example, "./foo" on page "a/b" matches page "a/foo".
+Bemærk at PageSpecs for sidenavne modsvares som de absolutte filnavne for
+siderne i wikien, så et pagespec "foo" brugt på siden "a/b" vil ikke
+modsvare siderne navngivet "a/foo" eller "a/b/foo". For at modsvare relativt
+til samme mappe som siden der indeholder pagespec'et kan du bruge
+"./". Eksempelvis modsvarer "./foo" på siden "a/b" siden "a/foo".
 
-## Old syntax
+## Gammel syntaks
 
-The old PageSpec syntax was called a "GlobList", and worked differently in
-two ways:
+Den gamle PageSpec-syntaks blev kaldt en "GlobList", og fungerede anderledes
+på to måder:
 
-1. "and" and "or" were not used; any page matching any item from the list
-   matched.
-2. If an item was prefixed with "`!`", then no page matching that item
-   matched, even if it matched an earlier list item.
+1. "and" og "or" blev ikke brugt; enhver side modsvarede ethvert emne fra
+   listen.
+2. Hvis et emne havde "`!`" foran, modsvarede ingen side dette emne, heller
+   ikke hvis det modsvarede et tidligere emne.
 
-For example, here is the old way to match all pages except for the SandBox
-and Discussion pages:
+Her er et eksempel på den gamle måde at modsvare alle sider undtagen
+sandkassen og diskussionssider:
 
 	* !SandBox !*/Discussion
 
-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.
+Brug af denne gamle syntaks er stadigt understøttet. Den er dog på vej ud,
+så det anbefales at bruge den nye syntaks.
diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index 2d33db7..e7e25b0 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/ikiwiki/pagespec/attachment.mdwn
@@ -1,37 +1,37 @@
 [[!meta robots="noindex, follow"]]
 [[!if test="enabled(attachment)"
-     then="This wiki has attachments **enabled**."
-     else="This wiki has attachments **disabled**."]]
+     then="Denne wiki har vedhæftninger **aktiveret**."
+     else="Denne wiki har vedhæftninger **deaktiveret**."]]
 
-If attachments are enabled, the wiki admin can control what types of
-attachments will be accepted, via the `allowed_attachments`
-configuration setting.
+Hvis vedhæftninger er aktiveret, kan wiki-administratoren styre hvilke typer
+vedhæftninger der vil blive accepteret gennem opsætningsindstillingen
+`allowed_attachments`.
 
-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:
+Som eksempel, for at begrænse vilkårlige filer til 50 kilobytes, men tillade
+større mp3-filer at blive lagt op af joey til en bestemt mappe, og checke
+alle vedhæftninger for vira, kunne noget i stil med dette bruges:
   
 	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))
 
-The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
-additional tests:
+Den normale [[ikiwiki/PageSpec]]-syntaks er udvidet med følgende yderligere
+tests:
 
-* "`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.
+* "`maxsize(størrelse)`" - Tester hvorvidt vedhæftningen højst fylder den
+  angivne størrelse. Størrelsen angives som standard i bytes, men "kb",
+  "mb", "gb" osv. kan bruges til at angive enheder.
   
-* "`minsize(size)`" - Tests whether the attachment is no smaller than the
-  specified size.
+* "`minsize(størrelse)`" - Tester hvorvidt størrelsen mindst fylder den
+  angivne størrelse.
 
-* "`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).
+* "`ispage()`" - Tester hvorvidt vedhæftningen bliver håndteret af ikiwiki
+  som en wikiside. (altså om den har endelsen ".mdwn", eller et hvilket som
+  helst andet aktiveret sideformat).
 
-  So, if you don't want to allow wiki pages to be uploaded as attachments,
-  use `!ispage()` ; if you only want to allow wiki pages to be uploaded
-  as attachments, use `ispage()`.
+  Derfor, hvis du ikke vil tillade wikisider at blive lagt op som vedhæftninger,
+  så brug `!ispage()` ; hvis du kun vil tillade wikisider at blive lagt op som
+  vedhæftninger, så brug `ispage()`.
 
-* "`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)`" - Dette checker MIME-typen for vedhæftningen. Du kan
+  angive et glob som type, eksampelvis `mimetype(image/*)`.
 
-* "`virusfree()`" - Checks the attachment with an antiviral program.
+* "`virusfree()`" - Checker vedhæftningen med et antivirusprogram.
diff --git a/ikiwiki/preprocessordirective.mdwn b/ikiwiki/preprocessordirective.mdwn
index bd12895..57f46c8 100644
--- a/ikiwiki/preprocessordirective.mdwn
+++ b/ikiwiki/preprocessordirective.mdwn
@@ -1,7 +1,6 @@
 [[!meta redir=ikiwiki/directive delay=10]]
 [[!meta robots="noindex, follow"]]
 
-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.
+Denne side er flyttet til [[ikiwiki/directive|ikiwiki/directive]]. Opdatér
+dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig
+udgave af ikiwiki.
diff --git a/ikiwiki/searching.mdwn b/ikiwiki/searching.mdwn
index 539e719..24ee343 100644
--- a/ikiwiki/searching.mdwn
+++ b/ikiwiki/searching.mdwn
@@ -1,20 +1,21 @@
 [[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(search)"
-then="This wiki has searching **enabled**."
-else="This wiki has searching **disabled**."]]
+then="Denne wiki har søgning **aktiveret**."
+else="Denne wiki har søgning **deaktiveret**."]]
 
-If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to constuct
-more powerful searches.
+Hvis søgning er aktiveret, kan du angive søgeudtryk i søgefeltet, som du
+ville forvente. Der er et par specielle ting du kan gøre for at konstruere
+mere effektive søgninger.
 
-* To match a phrase, enclose it in double quotes.
-* `AND` can be used to search for documents containing two expressions.
-* `OR` can be used to search for documents containing either one of
-  two expressions.
-* Parentheses can be used to build up complicated search expressions. For
-  example, "(foo AND bar) OR (me AND you)"
-* Prefix a search term with "-" to avoid it from appearing in the results.
-  For example, "-discussion" will omit "discussion".
-* To search for a page with a given title, use "title:foo".
-* To search for pages that contain a "bar" link, use "link:bar".
+* Put gåseøjne omkring nogle ord for at søge efter dem som én formulering.
+* `AND` kan bruges til at søge efter dokumenter som indeholder to udtryk.
+* `OR` kan bruges ti at søge efter dokumenter som indeholder ethvert af to
+  udtryk.
+* Parenteser kan bruges til at opbygge komplicerede
+  søgeformuleringer. Eksempelvis "(foo AND bar) OR (mig AND dig)"
+* Put "-" foran et søgeudtryk for at undgå det blandt
+  resultaterne. Eksempelvis vil "-discussion" udelade "discussion".
+* Brug "title:foo" til at søge efter en side med en given titel.
+* Brug "link:bar" til at søge efter sider som indeholder henvisning til
+  "bar".
diff --git a/ikiwiki/subpage.mdwn b/ikiwiki/subpage.mdwn
index e047b86..186f734 100644
--- a/ikiwiki/subpage.mdwn
+++ b/ikiwiki/subpage.mdwn
@@ -1,12 +1,14 @@
 [[!meta robots="noindex, follow"]]
-ikiwiki supports placing pages in a directory hierarchy. For example,
-this page, [[SubPage]] has some related pages placed under it, like
-[[SubPage/LinkingRules]]. This is a useful way to add some order to your
-wiki rather than just having a great big directory full of pages.
+ikiwiki understøtter placering af sider i et mappehierarki. Eksempelvis har
+denne side, [[UnderSide|SubPage]], nogle relaterede sider placeret under
+sig, bl.a. [[HenvisningsRegler|SubPage/LinkingRules]]. dette er en praktisk
+måde at bringe orden i din wiki fremfor blot at have een stor mappe fuld af
+sider.
 
-To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is SubPage.mdwn in this wiki's source, and there is also
-a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages
-can be nested as deeply as you'd like.
+En [[UnderSide|SubPage]] oprettes ved blot at oprette undermappen og tilføje
+sider til den. Denne side er eksempelvis SubPage.mdwn i kildekoden til denne
+wiki, og der er også en SubPage undermappe, som indeholder
+SubPage/LinkingRules.mdwn. Undersider kan nedarves så dybt du har lyst.
 
-Linking to and from a SubPage is explained in [[LinkingRules]].
+Henvisninger til og fra en [[UnderSide||SubPage]] er forklaret under
+[[HenvisningsRegler||LinkingRules]].
diff --git a/ikiwiki/subpage/linkingrules.mdwn b/ikiwiki/subpage/linkingrules.mdwn
index e547f30..80c29ac 100644
--- a/ikiwiki/subpage/linkingrules.mdwn
+++ b/ikiwiki/subpage/linkingrules.mdwn
@@ -1,33 +1,36 @@
 [[!meta robots="noindex, follow"]]
-To link to or from a [[SubPage]], you can normally use a regular
-[[WikiLink]] that does not contain the name of the parent directory of
-the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a
-page that matches your link.
+For at henvise til eller fra en [[underside|SubPage]] kan du normalt bruge
+en almindelig normal [[WikiLink]] som ikke indeholder navnet på den
+overliggende mappe til [[undersiden|SubPage]]. Ikiwiki gennemgår
+mappehierarkiet og kigger efter en side som modsvarer din henvisning.
 
-For example, if FooBar/SubPage links to "OtherPage", ikiwiki will first 
-prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next
-to FooBar/OtherPage and finally to OtherPage in the root of the wiki.
+Hvis eksempelvis FooBar/UnderSide henviser til "EnAndenSide", vil ikiwiki
+først foretrække at knytte henvisningen til FooBar/UnderSide/EnAndenSide
+hvis den eksisterer, så til FooBar/EnAndenSide og til sidst til EnAndenSide
+i roden af wikien.
 
-Note that this means that if a link on FooBar/SomePage to "OtherPage"
-currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage
-is created, the link will _change_ to point to FooBar/OtherPage. On the
-other hand, a link from BazBar to "OtherPage" would be unchanged by this
-creation of a [[SubPage]] of FooBar.
+Bemærk at dette betyder, at hvis en henvisning fra FooBar/EnSide til
+"EnAndenSide" i øjeblikket henviser til EnAndenSide i roden af wikien, og
+FooBar/EnAndenSide oprettes, så vil henvisningen blive _ændret_ til at pege
+på FooBar/EnAndenSide. Omvendt vil en henvisning fra BazBar til
+"EnAndenSide" ikke blive berørt af oprettelsen af en [[underside|SubPage]]
+til FooBar.
 
-You can also specify a link that contains a directory name, like
-"FooBar/OtherPage" to more exactly specify what page to link to. This is
-the only way to link to an unrelated [[SubPage]].
+Du kan også angive en henvisning som indeholder et mappenavn, lissom
+"FooBar/EnAndenSide", for mere nøjagtigt at angive hvilken side der henvises
+til. Kun på den måde kan du henvise til en anden sides
+[[underside|SubPage]].
 
-You can use this to, for example, to link from BazBar to "FooBar/SubPage",
-or from BazBar/SubPage to "FooBar/SubPage".
+Du kan bruge dette til eksempelvis at henvise fra BazBar til
+"FooBar/UnderSide", eller fra BazBar/UnderSide til "FooBar/UnderSide".
 
-You can also use "/" at the start of a link, to specify exactly which page
-to link to, when there are multiple pages with similar names and the link
-goes to the wrong page by default. For example, linking from
-"FooBar/SubPage" to  "/OtherPage" will link to the "OtherPage" in the root
-of the wiki, even if there is a "FooBar/OtherPage".
+Du kan også bruge "/" i begyndelsen af en henvisning, til at angive
+nøjagtigt hvilken side der henvises til, når der er flere mulige sider med
+lignende navne og henvisningen ender forkert som standard. Eksempelvis vil
+en henvisning fra "FooBar/UnderSide" til "/EnAndenSide" henvise til
+"EnAndenSide" i roden af wikien, selvom der er en "FooBar/EnAndenSide".
 
-Also, if the wiki is configured with a userdir, you can link to pages
-within the userdir without specifying a path to them. This is to allow for
-easy linking to a user's page in the userdir, to sign a comment. These
-links are checked for last of all.
+Desuden kan du, hvis wikien er opsat med "userdir", henvise til sider under
+hjemmemapper uden at angive en sti til dem. Dette er for at tillade enkel
+henvisning til en brugers side i hjemmemappen, som signatur ved en
+kommentar. Sådanne henvisninger prøves allersidst.
diff --git a/ikiwiki/wikilink.mdwn b/ikiwiki/wikilink.mdwn
index 371c252..ea93116 100644
--- a/ikiwiki/wikilink.mdwn
+++ b/ikiwiki/wikilink.mdwn
@@ -1,36 +1,34 @@
 [[!meta robots="noindex, follow"]]
-WikiLinks provide easy linking between pages of the wiki. To create a
-[[WikiLink]], just put the name of the page to link to in double brackets.
-For example `\[[WikiLink]]`.
+WikiLinks gør det muligt enkelt at lave henvisninger (linke) mellem sider i
+wikien. Opret en [[WikiLink]] ved at skrive siden du vil henvise til med
+dobbelte klammer omkring. Ekempelvis `\[[WikiLink]]`.
 
-If you ever need to write something like `\[[WikiLink]]` without creating a
-wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
+Hvis du vil skrive noget i stil med `\[[WikiLink]]` uden at det skal blive
+til en wikilink, så put en `\` (backslash) foran, som i `\\[[WikiLink]]`.
 
-There are some special [[SubPage/LinkingRules]] that come into play when
-linking between [[SubPages|SubPage]].
+Specielle [[henvisningsregler|SubPage/LinkingRules]] træder i kraft når der
+henvises på tværs af [[undersider|SubPage]].
 
-Also, if the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
+Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil
+det blive vist indlejret i siden.
 
-WikiLinks are matched with page names in a case-insensitive manner, so you
-don't need to worry about getting the case the same, and can capitalise
-links at the start of a sentence, and so on.
+WikiLinks knyttes til sidenavne uden skelen til store og små bogstaver, så
+du behøver ikke at bekymre dig om dette, og kan anvende stort
+begyndelsesbogstav i begyndelsen af en sætning o.l.
 
-It's also possible to write a WikiLink that uses something other than the page
-name as the link text. For example `\[[foo_bar|SandBox]]` links to the SandBox
-page, but the link will appear like this: [[foo_bar|SandBox]].
+Det er også muligt at skrive en WikiLink som bruger noget andet end
+sidenavnet som henvisningstekst. Eksempelvis henviser `\[[foo_bar|SandBox]]`
+til sandkassen, men henvisningen fremstår som her: [[foo_bar|SandBox]].
 
-To link to an anchor inside a page, you can use something like
+For at henvise til et anker inde på en side, kan du bruge noget i stil med
 `\[[WikiLink#foo]]`
 
-## Directives and WikiLinks
-
-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.
+## Direktiver og wikilinks
+
+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.
diff --git a/index.mdwn b/index.mdwn
index 05834e0..23f6806 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,8 @@
-Welcome to your new wiki.
+Velkommen til din nye wiki.
 
-All wikis are supposed to have a [[SandBox]], so this one does too.
+Alle wikier forventes at have en [[SandKasse|SandBox]], så det har denne
+også.
 
 ----
 
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/).
diff --git a/recentchanges.mdwn b/recentchanges.mdwn
index 3383fc7..a8a4bf2 100644
--- a/recentchanges.mdwn
+++ b/recentchanges.mdwn
@@ -1,7 +1,7 @@
 [[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
+[[!meta title="SenesteÆndringer"]]
 """]]
-Recent changes to this wiki:
+Seneste ændringer til denne wiki:
 
 [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
 template=recentchanges show=0]]
diff --git a/sandbox.mdwn b/sandbox.mdwn
index c66534f..f511b43 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,32 +1,33 @@
-This is the SandBox, a page anyone can edit to learn how to use the wiki.
+Dette er [[SandKassen|SandBox]], en side som hvem som helst kan redigere for
+at lære hvordan en wiki bruges.
 
 ----
 
-Here's a paragraph.
+Her er et afsnit.
 
-Here's another one with *emphasised* text.
+her er et andet afsnit med *fremhævet* tekst.
 
-# Header
+# Overskrift
 
-## Subheader
+## Underoverskrift
 
-> This is a blockquote.
+> Dette er et citat-område
 >
-> This is the first level of quoting.
+> Dette er første niveau citering.
 >
-> > This is nested blockquote.
+> > Dette er et indlejret citat-område.
 >
-> Back to the first level.
+> Tilbage til det første niveau.
 
-Numbered list 
+Nummereret liste
 
-1. First item.
-1. Another.
-1. And another..
+1. Første emne.
+1. Et andet.
+1. Og et andet..
 
-Bulleted list
+Unummereret liste
 
-* *item*
-* item
+* *emne*
+* emne
 
 [[ikiwiki/WikiLink]]
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 14cd5ff..6175091 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -1,15 +1,14 @@
 [[!if test="enabled(shortcut)"
-     then="This wiki has shortcuts **enabled**."
-     else="This wiki has shortcuts **disabled**."]]
+     then="Denne wiki har genveje **aktiveret**."
+     else="Denne wiki har genveje **deaktiveret**."]]
 
-Some examples of using shortcuts include:
+Nogle eksempler på brug af genveje:
 
 	\[[!google foo]]
 	\[[!wikipedia War_of_1812]]
 	\[[!debbug 12345]]
-	Check the \[[!cia ikiwiki desc="CIA page for %s"]].
 
-This page controls what shortcut links the wiki supports.
+Denne side styrer hvilke genveje wikien understøtter.
 
 * [[!shortcut name=google url="http://www.google.com/search?q=%s"]]
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
@@ -19,14 +18,16 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
-* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
+* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s"
+  desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
-* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
+* [[!shortcut name=debrt
+  url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
-  * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
+  * Brug: `\[[!debss package]]`, `\[[!debss package#version]]`, eller `\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.
 * [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
@@ -60,18 +61,17 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 
-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.
+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.
 
-Remember that the `name` you give the shortcut will become a new
-[[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.
+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.
 
-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 will include your shortcut in the standard underlay.
+Hvis du finder på en genvej som du mener andre kunne få glæde af også, kan
+du overveje at bidrage med den til [shortcuts-siden på ikiwiki
+ikiwikien](http://ikiwiki.info/shortcuts/), så fremtidige versioner af
+ikiwiki inkluderer din genvej i standardunderlaget.
diff --git a/templates.mdwn b/templates.mdwn
index eff0e15..3109931 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -1,74 +1,72 @@
 [[!meta robots="noindex, follow"]]
 [[!if test="enabled(template)"
-then="This wiki has templates **enabled**."
-else="This wiki has templates **disabled**."
-]]
+then="Denne wiki har skabeloner **aktiveret**."
+else="Denne wiki har skabeloner **deaktiveret**." ]]
 
-Templates are files that can be filled out and inserted into pages in the
-wiki.
+Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-These templates are available for inclusion onto other pages in this
+Disse skabeloner er tilgængelige til indsættelse på andre sider i denne
 wiki:
 
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
 sort=title template=titlepage]]
 """]]
 
-## Using a template
+## Brug af skabelon
 
-Using a template works like this:
+En skabelon bruges som her:
 
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
+	\[[!template id=note text="""Her er teksten til at sætte ind i min note."""]]
 
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
+Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den
+angivne værdi og indsætte resultatet på siden.
 
-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:
+Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt på
+wikisiden udenfor skabelonen. Trippel-citering af værdien tillader endda at
+bruge citering som del af værdien. Kombineret med flerlinje-citerede værdier
+tillader dette indlejring af store klumper af opmærket tekst i skabelonen:
 
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
+        \[[!template id=foo name="Sally" color="grøn" age=8 notes="""
+        * \[[Charley]]'s søster.
+        * "Jeg vil være en astronaut når jeg bliver stor."
+        * Egentligt 8 og et halvt.
         """]]
 
-## Creating a template
+## Oprettelse af skabelon
 
-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.
+Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en side,
+så vil siden vise en henvisning som kan bruges til at oprette
+skabelonen. Skabelonen er en normal wikiside, placeret i `templates/`
+undermappen indeni wikiens kildemappe.
 
-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:
+Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] som
+giver mulighed for at lave ret komplekse ting. Læs dokumentationen for den
+fulde syntaks, men alt hvad du reelt behøver at vide er nogle få ting:
 
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* 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>`
+* Ethvert parameter du angiver til skabelondirektivet vil danne en
+  skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og
+  BASENAME.
+* Brug `<TMPL_VAR variabel>` til at indsætte værdien af en
+  variabel. Wiki-opmærkning i værdien bliver først konverteret til html.
+* Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en
+  variabel, med wiki-opmærkning endnu ikke konverteret til html.
+* Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF
+  NAME="variabel">tekst</TMPL_IF>`.
+* Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med
+  `<TMPL_IF NAME="variabel">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`
 
-Here's a sample template:
+Her er et eksempel på en skabelon (det anbefales at bruge engelske
+variabelnavne for at undgå problemer med æøå og andre specialtegn):
 
         <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
+        Navn: \[[<TMPL_VAR raw_name>]]<br />
+        Alder: <TMPL_VAR age><br />
         <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
+        Favoritfarve: <TMPL_VAR color><br />
         <TMPL_ELSE>
-        No favorite color.<br />
+        Ingen favoritfarve.<br />
         </TMPL_IF>
         <TMPL_IF NAME="notes">
         <hr />
@@ -76,12 +74,12 @@ Here's a sample template:
         </TMPL_IF>
         </span>
 
-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.
+Den udfyldte skabelon vil blive formateret som resten af siden den er
+inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki-
+opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke op
+som krydshenvisninger (backlinks) til den side som anvender skabelonen.
 
-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]].
+Bemærk brugen af "raw_name" indeni [[ikiwiki/WikiLink]]-generatoren. Dette
+sikrer at hvor navnet indeholder noget som måske kan fejltolkes som
+wiki-opmærkning, bliver det ikke konverteret til html før det er blevet
+behandlet som en [[ikiwiki/WikiLink]].
diff --git a/templates/note.mdwn b/templates/note.mdwn
index 4cc323c..3a5b87a 100644
--- a/templates/note.mdwn
+++ b/templates/note.mdwn
@@ -2,10 +2,10 @@
 <TMPL_VAR text>
 </div>
 <TMPL_UNLESS NAME="text">
-Use this template to insert a note into a page. The note will be styled to
-float to the right of other text on the page. This template has one
-parameter:
+Brug denne skabelon til at indsætte en note på en side. Noten vil blive
+udsmykket til at flyde til højre for den øvrige tekst på siden. Denne
+skabelon har et parameter:
 <ul>
-<li>`text` - the text to display in the note
+<li>`text` - teksten som vises i noten
 </ul>
 </TMPL_UNLESS>
diff --git a/templates/popup.mdwn b/templates/popup.mdwn
index b355daa..f3358ac 100644
--- a/templates/popup.mdwn
+++ b/templates/popup.mdwn
@@ -1,15 +1,14 @@
 <TMPL_UNLESS NAME="mouseover">
-Use this template to create a popup window that is displayed when the mouse
-is over part of the page. This template has two parameters:
+Brug denne skabelon til at lave et popup-vindue som vises når musemarkøren er
+henover en del af siden. Denne skabelon har to parametre:
 <ul>
-<li>`mouseover` - This is the text or other content that triggers the
-popup.
-<li>`popup` - This should be the content of the popup window. It can be
-anything, even images or a whole little wiki page, but should not be too
-large for good usability.
+<li>`mouseover` - Dette er teksten eller andet indhold som udløser popup'en.
+<li>`popup` - Her angives indeholdet af popup-vinduet. Det kan være hvad som
+helst, endda billeder eller hele små wikisider, men bør ikke være for stort af
+hensyn til brugervenligheden.
 </ul>
-Note that browsers that do not support the CSS will display the popup
-inline in the page, inside square brackets.
+Bemærk at browsere som ikke understøtter CSS-koden vil vise popup'en indlejret
+på siden, indenfor lodrette klammer.
 </TMPL_UNLESS>
 <span class="popup"><TMPL_VAR mouseover>
 <span class="paren">[</span><span class="balloon"><TMPL_VAR popup></span><span class="paren">]</span>
-- 
cgit v1.2.3