diff options
| -rw-r--r-- | shortcuts.mdwn | 7 | ||||
| -rw-r--r-- | style.css | 6 | ||||
| -rw-r--r-- | templates.mdwn | 9 |
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="https://rt.debian.org/Ticket/Display.html?id=%s"]] * [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]] * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See <http://snapshot.debian.org/> for details. -* [[!shortcut name=debwiki url="https://wiki.debian.org/%s"]] +* [[!shortcut name=debwiki url="https://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="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] @@ -55,7 +55,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] * [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] * [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]] -* [[!shortcut name=man url="http://linux.die.net/man/%s"]] +* [[!shortcut name=man url="http://manpages.debian.org/%s"]] * [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]] * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]] * [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]] @@ -63,6 +63,9 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]] * [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]] * [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]] +* [[!shortcut name=pkgsrc url="http://pkgsrc.se/%S"]] +* [[!shortcut name=doi url="http://dx.doi.org/%s" desc="doi:%s"]] +* [[!shortcut name=arxiv url="http://arxiv.org/abs/%s" desc="arXiv:%s"]] To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the @@ -5,10 +5,8 @@ */ /* html5 compat */ -article, -header, -footer, -nav { +article,aside,details,figcaption,figure, +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 -pages. +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 |