diff options
authorJonas Smedegaard <>2015-01-22 15:40:35 +0100
committerJonas Smedegaard <>2015-01-22 15:40:35 +0100
commitd2900fb6570a284cd6de6d4c0110cd89384de4af (patch)
parentc74257f775e2a57fc97fe2d7facb9b68fa667c5b (diff)
parentb09e27989b8786806ec12c9023ccdabc660f8901 (diff)
Merge branch 'ikiwiki'
3 files changed, 14 insertions, 8 deletions
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index b4f6d8e..1748a02 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -27,7 +27,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=debrt url=""]]
* [[!shortcut name=debss url=""]]
* Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See <> for details.
-* [[!shortcut name=debwiki url=""]]
+* [[!shortcut name=debwiki url=""]]
* [[!shortcut name=fdobug url="" desc=" bug #%s"]]
* [[!shortcut name=fdolist url="" desc=""]]
* [[!shortcut name=gnomebug url="" desc="GNOME bug #%s"]]
@@ -55,7 +55,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=whois url=""]]
* [[!shortcut name=cve url=""]]
* [[!shortcut name=flickr url=""]]
-* [[!shortcut name=man url=""]]
+* [[!shortcut name=man url=""]]
* [[!shortcut name=ohloh url=""]]
* [[!shortcut name=cpanrt url="" desc="CPAN RT#%s"]]
* [[!shortcut name=novellbug url="" desc="bug %s"]]
@@ -63,6 +63,9 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=mozillazinekb url=""]]
* [[!shortcut name=freebsdwiki url=""]]
* [[!shortcut name=hackage url=""]]
+* [[!shortcut name=pkgsrc url=""]]
+* [[!shortcut name=doi url="" desc="doi:%s"]]
+* [[!shortcut name=arxiv url="" desc="arXiv:%s"]]
To add a new shortcut, use the `shortcut`
[[ikiwiki/directive]]. In the url, "%s" is replaced with the
diff --git a/style.css b/style.css
index 067a3bf..4c48e5c 100644
--- a/style.css
+++ b/style.css
@@ -5,10 +5,8 @@
/* html5 compat */
-nav {
+footer,header,hgroup,menu,nav,section {
display: block;
diff --git a/templates.mdwn b/templates.mdwn
index d0f891c..80372fc 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -14,8 +14,10 @@ easy to learn. All you really need to know to modify templates is this:
[[!if test="enabled(template) or enabled(edittemplate)" then="""
## template pages
-Template pages are regular wiki pages that are used as templates for other
+Template pages are regular wiki pages containing a
+[[!iki ikiwiki/directive/templatebody desc="templatebody directive"]],
+used as templates for other pages. The parts of the template
+page outside the directive can be used to document it.
[[!if test="enabled(template)" then="""
@@ -38,6 +40,9 @@ feeds=no archive=yes sort=title template=titlepage
rootpage=templates postformtext="Add a new template page named:"]]
+If the template does not contain a `templatebody` directive, the entire
+source of the page is used for the template. This is deprecated.
## template files
Template files are unlike template pages in that they have the extension