From d80e48ae7830ccfb15809a93a12bc2a2ec01a399 Mon Sep 17 00:00:00 2001
From: "http://www.larted.org.uk/~dom/" <http://www.larted.org.uk/~dom/@web>
Date: Thu, 8 Oct 2009 11:38:34 -0400
Subject: add cpanrt (cherry picked from commit
 79f3e32ea7adf3e5adbef0a8c9c68cd32a67cac4)

---
 shortcuts.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 1347e853..1f37ca5c 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -59,6 +59,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
+* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From 4def48d68cc32cbc9c130111df380ea2ee9ede70 Mon Sep 17 00:00:00 2001
From: lnussel <lnussel@web>
Date: Tue, 13 Oct 2009 05:09:37 -0400
Subject: add shortcut for novell bugzilla (cherry picked from commit
 68433d82b88e93962561d6ddad8689984398def1)

---
 shortcuts.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 1f37ca5c..acac0eac 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -60,6 +60,7 @@ 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"]]
 * [[!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"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From 63c335fc1df0552a43a8712792ee6bf3951906ac Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Thu, 2 Sep 2010 14:09:55 +0000
Subject: Use HTTPS version for [Wikimedia](https://secure.wikimedia.org/) and
 Google (noted by using DuckDuckGo.com which is directing there) (cherry
 picked from commit 704038db298c0f3a8039dcfe8d3a801c26fadf15)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index acac0eac..3f6e9547 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -11,13 +11,13 @@ Some examples of using shortcuts include:
 
 This page controls what shortcut links the wiki supports.
 
-* [[!shortcut name=google url="http://www.google.com/search?q=%s"]]
+* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]]
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
 * [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]]
 * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%S"]]
-* [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
-* [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
+* [[!shortcut name=wikipedia url="https://secure.wikimedia.org/wikipedia/en/wiki/%S"]]
+* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
+* [[!shortcut name=wiktionary url="https://secure.wikimedia.org/wiktionary/en/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
 * [[!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"]]
-- 
cgit v1.2.3


From 4dc98973e7eb3a323506ef71416ee7f167edc885 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~kralph" <kralph@web>
Date: Mon, 27 Jun 2011 08:09:17 +0000
Subject: add ubuntu packages search (cherry picked from commit
 c2278f83a93f039c1dfc364904452bb0afd735bb)

---
 shortcuts.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 3f6e9547..a5d169b6 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -61,6 +61,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%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"]]
+* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From 30c9cfd9a222a2690529b4eb1ff89105353d16d6 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~kralph" <kralph@web>
Date: Mon, 27 Jun 2011 08:22:23 +0000
Subject: add mozillazine KB, FreeBSD wiki, and Haskell hackage (cherry picked
 from commit 30a66bf5bcc26ca779ac60cfcd2b380524774001)

---
 shortcuts.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index a5d169b6..b870256d 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -62,6 +62,9 @@ This page controls what shortcut links the wiki supports.
 * [[!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"]]
 * [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
+* [[!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/cgi-bin/hackage-scripts/package/%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From dedc632bf49fae8358c4ab55a5dd21caead5a91b Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~kralph" <kralph@web>
Date: Mon, 27 Jun 2011 08:35:43 +0000
Subject: newer hackage url (cherry picked from commit
 6350accb8bfa0c7867a9d90e51b05cdf0af29e6b)

---
 shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index b870256d..94a7a901 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -64,7 +64,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
 * [[!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/cgi-bin/hackage-scripts/package/%s"]]
+* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From 1599c52e4b56a20f42441d45728442117d29f310 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <smcv@web>
Date: Fri, 5 Aug 2011 06:02:31 -0400
Subject: point [[!debss]] shortcut to snapshot.debian.*org* now that it exists
 (cherry picked from commit a8788935853e6e1e92de9272d807d6b57d3376d5)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 94a7a901..15e29ef6 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -26,7 +26,7 @@ This page controls what shortcut links the wiki supports.
 * [[!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=debss url="http://snapshot.debian.org/package/%s/"]]
-  * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`.  See http://snapshot.debian.org for details.
+  * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`.  See <http://snapshot.debian.org/> for details.
 * [[!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"]]
-- 
cgit v1.2.3


From 5c97b2f9e7e5812401de3dfd4b73bca3bc4b9ae1 Mon Sep 17 00:00:00 2001
From: "https://id.koumbit.net/anarcat" <https://id.koumbit.net/anarcat@web>
Date: Tue, 11 Oct 2011 10:40:09 -0400
Subject: wikipedia now supports ssl properly and the URLs changed accordingly
 (cherry picked from commit 2c8ca894d6b773db2c7c278cfc4dd62ff54cdc43)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 15e29ef6..fc48ae46 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -15,9 +15,9 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
 * [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]]
 * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://secure.wikimedia.org/wikipedia/en/wiki/%S"]]
+* [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%S"]]
 * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
-* [[!shortcut name=wiktionary url="https://secure.wikimedia.org/wiktionary/en/wiki/%s"]]
+* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
 * [[!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"]]
-- 
cgit v1.2.3


From 6946c0a5026a64ab7218080d2f2880760445d928 Mon Sep 17 00:00:00 2001
From: JoshTriplett <JoshTriplett@web>
Date: Wed, 23 Nov 2011 20:46:54 -0400
Subject: Change all shortcuts to use https where possible. (cherry picked from
 commit ae7fbb50e53c68862485101be4efa25ea143b968)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index fc48ae46..93b8b845 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -13,27 +13,27 @@ This page controls what shortcut links the wiki supports.
 
 * [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]]
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
-* [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]]
-* [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
+* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
+* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
 * [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%S"]]
 * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
-* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
+* [[!shortcut name=deblist url="https://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=debmsg url="https://lists.debian.org/msgid-search/%s"]]
 * [[!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="http://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="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
+* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
+* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
 * [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
-* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
+* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
 * [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
 * [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
 * [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]]
@@ -43,7 +43,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]]
 * [[!shortcut name=iki url="http://ikiwiki.info/%S/"]]
 * [[!shortcut name=ljuser url="http://%s.livejournal.com/"]]
-* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
+* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
 * [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]]
 * [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
@@ -53,12 +53,12 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-* [[!shortcut name=cve url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
+* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
 * [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
 * [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
-* [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
+* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
-* [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%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"]]
 * [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
-- 
cgit v1.2.3


From c3e9e7e06d2ee8968d7145b4121fe19e62022a3a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <smcv@web>
Date: Wed, 25 Jan 2012 04:55:25 -0400
Subject: Fix wikipedia URL: wikipedia.org, not wikimedia.org (cherry picked
 from commit a8ded6bf1d8ac389100ac3f3c55a075065290cb1)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 93b8b845..b8e157d0 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
 * [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
 * [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%S"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%S"]]
 * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
-- 
cgit v1.2.3


From 4479d6d533caf33477ed267bd535730a5f4528eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 3 Mar 2012 11:27:59 -0400
Subject: shortcut: Support Wikipedia's form of url-encoding for unicode
 characters

I think it's the wrong encoding, seems like mojibake to me, but it works
now. Closes: #661198
(cherry picked from commit 78737cbfbf91c7b31ed5d216a23de8d360a76392)

Conflicts:
	shortcuts.mdwn
---
 shortcuts.mdwn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index b8e157d0..cf7ebc17 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
 * [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
 * [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%S"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
 * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
@@ -69,8 +69,10 @@ This page controls what shortcut links the wiki supports.
 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 [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
-`desc` parameter controls the description of the link.
+it, and '%S' is replaced with the raw, non-encoded text. 
+Additionally, `%W` is replaced with the text encoded just right for
+Wikipedia. The optional `desc` parameter controls the description of
+the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
-- 
cgit v1.2.3


From e2c3cc45a4bd1cfd7950b75b4e5ec1bb089e66dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 27 Sep 2012 20:25:07 -0400
Subject: remove obsolte cia shortcuts (cherry picked from commit
 268c4e9c857e222a22b836a3a895500012ccb296)

Conflicts:
	git.mdwn
---
 shortcuts.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index cf7ebc17..978cca6c 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -7,7 +7,7 @@ Some examples of using shortcuts include:
 	\[[!google foo]]
 	\[[!wikipedia War_of_1812]]
 	\[[!debbug 12345]]
-	Check the \[[!cia ikiwiki desc="CIA page for %s"]].
+	Check the \[[!google ikiwiki desc="google search for %s"]].
 
 This page controls what shortcut links the wiki supports.
 
@@ -54,8 +54,6 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!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=cia url="http://cia.vc/stats/project/%s"]]
-* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
 * [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]
-- 
cgit v1.2.3


From 530184405147dbebfaa99f1c4de14d8a93ef376c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 15 Jun 2011 15:21:59 -0400
Subject: WIP (cherry picked from commit
 b66261d08bb978a1c5b1fe02ef25b49b4cd9d9e6)

---
 .templates/editpage.tmpl | 85 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 7 deletions(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 1ecbd0a9..b151fd05 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -1,3 +1,5 @@
+<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.css" id="theme"> 
+<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.css"> 
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <br />
@@ -43,21 +45,90 @@ if there are questions.</p>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
 <a class="toggle" href="#attachments">Attachments</a>
-<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
-<table>
+<noscript>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP NAME="ATTACHMENT_LIST">
-<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
-</TMPL_LOOP>
+</noscript>
+<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
+<div id="fileupload"> 
+<div class="fileupload-buttonbar"> 
+<label class="fileinput-button"> 
+<span>Add files...</span> 
+<input type="file" name="attachments" multiple> 
+</label> 
+<button type="submit" class="start">Start upload</button> 
+<button type="reset" class="cancel">Cancel upload</button> 
 <TMPL_IF NAME="ATTACHMENT_LIST">
-<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
+<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
 </TMPL_IF>
+</div> 
+<script id="template-upload" type="text/x-jquery-tmpl"> 
+    <tr class="template-upload{{if error}} ui-state-error{{/if}}">
+        <td><input type="checkbox" name="dummy" />${name}</td>
+        <td>${sizef}</td>
+        {{if error}}
+            <td class="error" colspan="2">Error:
+                {{if error === 'maxFileSize'}}File is too big
+                {{else error === 'minFileSize'}}File is too small
+                {{else error === 'acceptFileTypes'}}Filetype not allowed
+                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
+                {{else}}${error}
+                {{/if}}
+            </td>
+        {{else}}
+            <td class="progress"><div></div></td>
+            <td class="start"><button>Start</button></td>
+        {{/if}}
+        <td class="cancel"><button>Cancel</button></td>
+    </tr>
+</script> 
+<script id="template-download" type="text/x-jquery-tmpl"> 
+    <tr class="template-download{{if error}} ui-state-error{{/if}}">
+        <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
+        <td>${humansize}</td>
+        {{if error}}
+            <td class="error" colspan="2">Error:
+                {{if error === 1}}File exceeds upload_max_filesize (php.ini directive)
+                {{else error === 2}}File exceeds MAX_FILE_SIZE (HTML form directive)
+                {{else error === 3}}File was only partially uploaded
+                {{else error === 4}}No File was uploaded
+                {{else error === 5}}Missing a temporary folder
+                {{else error === 6}}Failed to write file to disk
+                {{else error === 7}}File upload stopped by extension
+                {{else error === 'maxFileSize'}}File is too big
+                {{else error === 'minFileSize'}}File is too small
+                {{else error === 'acceptFileTypes'}}Filetype not allowed
+                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
+                {{else error === 'uploadedBytes'}}Uploaded bytes exceed file size
+                {{else error === 'emptyResult'}}Empty file upload result
+                {{else}}${error}
+                {{/if}}
+            </td>
+        {{else}}
+            <td>${stored_msg}</td>
+        {{/if}}
+    </tr>
+</script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script> 
+<script>
+$(function () { $('#fileupload').fileupload(); }); // initialize upload widget
+</script>
+<div class="fileupload-content">
+<table class="files">
+<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<tr><td><input type="checkbox" name="attachment_select" value="<TMPL_VAR NAME ESCAPE="HTML">" /><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
+</TMPL_LOOP>
 </table>
 </div>
+</div> 
+</div>
 </TMPL_IF>
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
-
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
-- 
cgit v1.2.3


From 52ffbc165735ebbf8c1f61faa5b84dae8eb4246b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 15 Jun 2011 18:37:12 -0400
Subject: WIP (cherry picked from commit
 f77452b7caa7346625882d20f396b7154cda6a54)

---
 .templates/editpage.tmpl | 73 +++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index b151fd05..d2f68074 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -45,38 +45,25 @@ if there are questions.</p>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
 <a class="toggle" href="#attachments">Attachments</a>
-<noscript>
-<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-</noscript>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <div id="fileupload"> 
-<div class="fileupload-buttonbar"> 
-<label class="fileinput-button"> 
-<span>Add files...</span> 
-<input type="file" name="attachments" multiple> 
-</label> 
-<button type="submit" class="start">Start upload</button> 
-<button type="reset" class="cancel">Cancel upload</button> 
-<TMPL_IF NAME="ATTACHMENT_LIST">
-<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
-</TMPL_IF>
-</div> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script> 
+<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script> 
+<script>
+$(function () { $('#fileupload').fileupload(); }); // initialize upload widget
+</script>
 <script id="template-upload" type="text/x-jquery-tmpl"> 
     <tr class="template-upload{{if error}} ui-state-error{{/if}}">
-        <td><input type="checkbox" name="dummy" />${name}</td>
-        <td>${sizef}</td>
+        <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
         {{if error}}
-            <td class="error" colspan="2">Error:
-                {{if error === 'maxFileSize'}}File is too big
-                {{else error === 'minFileSize'}}File is too small
-                {{else error === 'acceptFileTypes'}}Filetype not allowed
-                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
-                {{else}}${error}
-                {{/if}}
-            </td>
+        <td class="error" colspan="2">failed!</td>
         {{else}}
-            <td class="progress"><div></div></td>
-            <td class="start"><button>Start</button></td>
+        <td class="progress" colspan="2"><div></div></td>
+        <td class="start"><button>Start</button></td>
         {{/if}}
         <td class="cancel"><button>Cancel</button></td>
     </tr>
@@ -86,37 +73,12 @@ if there are questions.</p>
         <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
         <td>${humansize}</td>
         {{if error}}
-            <td class="error" colspan="2">Error:
-                {{if error === 1}}File exceeds upload_max_filesize (php.ini directive)
-                {{else error === 2}}File exceeds MAX_FILE_SIZE (HTML form directive)
-                {{else error === 3}}File was only partially uploaded
-                {{else error === 4}}No File was uploaded
-                {{else error === 5}}Missing a temporary folder
-                {{else error === 6}}Failed to write file to disk
-                {{else error === 7}}File upload stopped by extension
-                {{else error === 'maxFileSize'}}File is too big
-                {{else error === 'minFileSize'}}File is too small
-                {{else error === 'acceptFileTypes'}}Filetype not allowed
-                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
-                {{else error === 'uploadedBytes'}}Uploaded bytes exceed file size
-                {{else error === 'emptyResult'}}Empty file upload result
-                {{else}}${error}
-                {{/if}}
-            </td>
+        <td class="error" colspan="2">failed!</td>
         {{else}}
-            <td>${stored_msg}</td>
+        <td>${stored_msg}</td>
         {{/if}}
     </tr>
 </script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script> 
-<script>
-$(function () { $('#fileupload').fileupload(); }); // initialize upload widget
-</script>
 <div class="fileupload-content">
 <table class="files">
 <TMPL_LOOP NAME="ATTACHMENT_LIST">
@@ -124,6 +86,11 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
 </TMPL_LOOP>
 </table>
 </div>
+<TMPL_VAR FIELD-ATTACHMENT>
+<noscript><TMPL_VAR FIELD-UPLOAD></noscript>
+<TMPL_IF NAME="ATTACHMENT_LIST">
+<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
+</TMPL_IF>
 </div> 
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From c033aed1c05231bad75841824803af38c6bbb3a6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 15 Jun 2011 19:08:40 -0400
Subject: load attachment javascript into template the clean way (cherry picked
 from commit e2b43578a677894d23fa526d9201e5a89b231abc)

---
 .templates/editpage.tmpl | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index d2f68074..ed12b98f 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.css" id="theme"> 
-<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.css"> 
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <br />
@@ -47,12 +45,6 @@ if there are questions.</p>
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <div id="fileupload"> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script> 
 <script>
 $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
 </script>
-- 
cgit v1.2.3


From 43a3e7e5a316c063ee2ec671a9df312b7798b377 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 11 Jul 2011 21:38:48 -0400
Subject: Display attachment manipulation links always, since attachments can
 be uploaded via javascript.

Could arrange for them to be in a span that is hidden when there are no
attachments and make the javascript upload unhide it; this is a quick fix.
(cherry picked from commit 20577d8ecb18f7954a97800cb9b9dca981d2b53e)
---
 .templates/editpage.tmpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index ed12b98f..0dd86c10 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -80,9 +80,7 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
 </div>
 <TMPL_VAR FIELD-ATTACHMENT>
 <noscript><TMPL_VAR FIELD-UPLOAD></noscript>
-<TMPL_IF NAME="ATTACHMENT_LIST">
 <TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
-</TMPL_IF>
 </div> 
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From aba24efd8c926d7032af4477b4a88da628ba5454 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 12 Jul 2011 15:16:44 -0400
Subject: auto-check just uploaded attachments

This may make it easier to eg, Insert Links after dropping in a lot of
files.
(cherry picked from commit 1aad46e15e4329eff066fc8a68719e0c27f07891)
---
 .templates/editpage.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 0dd86c10..cafb653b 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -62,7 +62,7 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
 </script> 
 <script id="template-download" type="text/x-jquery-tmpl"> 
     <tr class="template-download{{if error}} ui-state-error{{/if}}">
-        <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
+        <td><input type="checkbox" checked name="attachment_select" value="${name}" />${name}</td>
         <td>${humansize}</td>
         {{if error}}
         <td class="error" colspan="2">failed!</td>
-- 
cgit v1.2.3


From 9eaa225280d74ffd5d2c3fa30a47cdb93709aff1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 13 Apr 2012 14:28:02 -0400
Subject: add comment subscription checkbox to editpage

Reworded template, which also called the commit message a "comment".
(cherry picked from commit e81e857ba62970caefd0f674d2cdfc3f9b70fe09)
---
 .templates/editpage.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index cafb653b..f43d7232 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -18,7 +18,7 @@
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
 <TMPL_IF NAME="CAN_COMMIT">
-<label for="editmessage" class="block">Optional comment about this change:</label>
+<label for="editmessage" class="block">Optional description of this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />
 </TMPL_IF>
 
@@ -43,6 +43,9 @@ if there are questions.</p>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
 <a class="toggle" href="#attachments">Attachments</a>
+</TMPL_IF>
+<TMPL_VAR FIELD-SUBSCRIBE>
+<TMPL_IF NAME="FIELD-ATTACHMENT">
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <div id="fileupload"> 
 <script>
-- 
cgit v1.2.3


From 7887b77dccdc305f5fef56930ac27e46d1560455 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 18 Feb 2013 19:34:20 -0500
Subject: When inlining HTML pages, render enclosures. (cherry picked from
 commit aebd6c773c5c228f6fb960c5f02fed38ff1af6f7)

---
 .templates/newsitem.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.templates/newsitem.tmpl b/.templates/newsitem.tmpl
index e8a9c861..910c2060 100644
--- a/.templates/newsitem.tmpl
+++ b/.templates/newsitem.tmpl
@@ -41,6 +41,12 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_IF HTML5><section id="newsenclosure"><TMPL_ELSE><div id="newsenclosure"></TMPL_IF>
+<TMPL_IF ENCLOSURE>
+<a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
+</TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
 <TMPL_IF HTML5><footer class="newsitemfooter"><TMPL_ELSE><div class="newsitemfooter"></TMPL_IF>
 
 <!-- The saved space is more important that the information this provides.
-- 
cgit v1.2.3


From f5f11dde240e7bfea0ba52f7c4d72c413cf12ba4 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 26 Jun 2013 20:17:17 -0400
Subject: Don't add enclosure divs unless we have enclosures. (cherry picked
 from commit 6a1cbe6f09e20ead8393de184480a403bc20cda1)

---
 .templates/newsitem.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.templates/newsitem.tmpl b/.templates/newsitem.tmpl
index 910c2060..c7153bd0 100644
--- a/.templates/newsitem.tmpl
+++ b/.templates/newsitem.tmpl
@@ -41,11 +41,11 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF HTML5><section id="newsenclosure"><TMPL_ELSE><div id="newsenclosure"></TMPL_IF>
 <TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="newsenclosure"><TMPL_ELSE><div id="newsenclosure"></TMPL_IF>
 <a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
-</TMPL_IF>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
 
 <TMPL_IF HTML5><footer class="newsitemfooter"><TMPL_ELSE><div class="newsitemfooter"></TMPL_IF>
 
-- 
cgit v1.2.3


From dbe70608848cc0cb98737c4285c2e46108c29388 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 26 Jun 2013 20:21:33 -0400
Subject: Genericize download link for more use cases. (cherry picked from
 commit 0c320f45e84e454aceaf150d51e84b639444e8d5)

---
 .templates/newsitem.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.templates/newsitem.tmpl b/.templates/newsitem.tmpl
index c7153bd0..af976b57 100644
--- a/.templates/newsitem.tmpl
+++ b/.templates/newsitem.tmpl
@@ -43,7 +43,7 @@
 
 <TMPL_IF ENCLOSURE>
 <TMPL_IF HTML5><section id="newsenclosure"><TMPL_ELSE><div id="newsenclosure"></TMPL_IF>
-<a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-- 
cgit v1.2.3


From 78202a6045b349d33e66cc974e90cddd0b017813 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 4 Nov 2011 19:32:41 +0000
Subject: trail: new plugin (3rd attempt) (cherry picked from commit
 156f70912213b6520e9056050a8827de66e80176)

---
 .templates/page.tmpl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 5192138a..343f89dd 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -27,6 +27,15 @@
 <TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
 <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
 <TMPL_IF META><TMPL_VAR META></TMPL_IF>
+<TMPL_LOOP TRAILLOOP>
+<TMPL_IF PREVPAGE>
+<link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" />
+</TMPL_IF>
+<link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" />
+<TMPL_IF NEXTPAGE>
+<link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
+</TMPL_IF>
+</TMPL_LOOP>
 </head>
 <body>
 
@@ -109,6 +118,8 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<TMPL_VAR TRAILS>
+
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
-- 
cgit v1.2.3


From b041ce3d29bc36156080098a016542146c262c65 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 9 Apr 2012 16:12:07 +0100
Subject: Have trail links at both beginning and end in the default templates
 (cherry picked from commit 1a8cbf526cdc7e77bfa084e266b8633858b68a09)

---
 .templates/page.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 343f89dd..3f012575 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -155,6 +155,8 @@
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
+<TMPL_VAR TRAILS>
+
 <TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
-- 
cgit v1.2.3


From c708af237dd3f319066a76511738f8f901a5d530 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 18 Feb 2013 16:24:22 -0500
Subject: Make [[!meta enclosure=foo.mp3]] "work" for HTML. (cherry picked from
 commit cc0d875507671498e7cf9cd782357d32dbd88f66)

---
 .templates/page.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 3f012575..b707d9f0 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -134,6 +134,12 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
+<TMPL_IF ENCLOSURE>
+<a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
+</TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
-- 
cgit v1.2.3


From 291ee74ef82fb75563384e536d3ff2d4758fdbcb Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 26 Jun 2013 20:17:17 -0400
Subject: Don't add enclosure divs unless we have enclosures. (cherry picked
 from commit 6a1cbe6f09e20ead8393de184480a403bc20cda1)

---
 .templates/page.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index b707d9f0..e6e1ac02 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -134,11 +134,11 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
 <TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
 <a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
-</TMPL_IF>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
 
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
-- 
cgit v1.2.3


From 8ebc4983c761eea65a8620763e2385b225a0b81e Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 26 Jun 2013 20:21:33 -0400
Subject: Genericize download link for more use cases. (cherry picked from
 commit 0c320f45e84e454aceaf150d51e84b639444e8d5)

---
 .templates/page.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index e6e1ac02..832e50de 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -136,7 +136,7 @@
 
 <TMPL_IF ENCLOSURE>
 <TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
-<a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-- 
cgit v1.2.3


From 879006b4a872d1828cbea1c29de43a8e754da79b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 2 Mar 2013 18:11:07 +0000
Subject: page.tmpl: omit searchform, trails, sidebar and most metadata in CGI

These all seem somewhat inappropriate (searchform and sidebar are
arguable either way). I've left actions and languages enabled, since
they seem more reasonable for CGI-generated pages.

Bug: http://ikiwiki.info/bugs/trail_shows_on_cgi_pages/
Signed-off-by: Simon McVittie <smcv@debian.org>
(cherry picked from commit fae59b07b02dbcaba892e96ff86f3f800e6ef54a)
---
 .templates/page.tmpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 832e50de..44939cb5 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -21,6 +21,8 @@
 <TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </TMPL_IF>
+
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
@@ -36,6 +38,8 @@
 <link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
 </TMPL_IF>
 </TMPL_LOOP>
+</TMPL_UNLESS>
+
 </head>
 <body>
 
@@ -56,9 +60,11 @@
 </TMPL_IF>
 </span>
 </span>
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>
@@ -118,15 +124,19 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_VAR TRAILS>
+</TMPL_UNLESS>
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
+</TMPL_UNLESS>
 
 <div id="pagebody">
 
-- 
cgit v1.2.3


From 656bf8032bdf963e75432efbe7ae422ba9e900cf Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 21 Feb 2013 00:45:10 -0500
Subject: Style enclosures like content. (cherry picked from commit
 984f2ab952cb97990fc0d2460c2e335127a73491)

---
 .templates/newsitem.tmpl | 2 +-
 local.css                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.templates/newsitem.tmpl b/.templates/newsitem.tmpl
index af976b57..919200bb 100644
--- a/.templates/newsitem.tmpl
+++ b/.templates/newsitem.tmpl
@@ -42,7 +42,7 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF ENCLOSURE>
-<TMPL_IF HTML5><section id="newsenclosure"><TMPL_ELSE><div id="newsenclosure"></TMPL_IF>
+<TMPL_IF HTML5><section id="newsitemenclosure"><TMPL_ELSE><div id="newsitemenclosure"></TMPL_IF>
 <a href="<TMPL_VAR ENCLOSURE>">Download</a>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
diff --git a/local.css b/local.css
index 1249dfc7..ef2ce64f 100644
--- a/local.css
+++ b/local.css
@@ -216,13 +216,15 @@ a:hover
   padding: 0.5em 0em;
   line-height: 1;
 }
-.newsitemcontent
+.newsitemcontent,
+.newsitemenclosure
 {
   padding-left: 0.2em;
   padding-top: 0.1em;
 
 }
-.newsitemcontent p
+.newsitemcontent p,
+.newsitemenclosure p
 {
   margin: 0.3em;
 }
-- 
cgit v1.2.3


From 9d2dd947ec67dc492ef8aae91228e2c1a136ef1a Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Sun, 9 Mar 2014 17:23:01 +0100
Subject: ikiwiki update: 3.20140227.

---
 ikiwiki.setup | 100 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 20 deletions(-)

diff --git a/ikiwiki.setup b/ikiwiki.setup
index b07c582c..94a66ca9 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -56,6 +56,12 @@ IkiWiki::Setup::Standard->import({
 	cgi_wrapper => $cgi_wrapper,
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '06755',
+	# number of seconds to delay CGI requests when overloaded
+	#cgi_overload_delay => '',
+	# message to display when overloaded (may contain html)
+	#cgi_overload_message => '',
+	# enable optimization of only refreshing committed changes?
+	#only_committed_changes => 0,
 	# rcs backend to use
 	rcs => 'git',
 	# plugins to add to the default configuration
@@ -84,7 +90,7 @@ IkiWiki::Setup::Standard->import({
 	discussion => 1,
 	# name of Discussion pages
 	discussionpage => 'Discussion',
-	# generate HTML5? (experimental)
+	# generate HTML5?
 	html5 => 0,
 	# only send cookies over SSL connections?
 	sslcookie => 0,
@@ -102,14 +108,16 @@ IkiWiki::Setup::Standard->import({
 	numbacklinks => 10,
 	# attempt to hardlink source files? (optimisation for large files)
 	hardlink => 1,
-	# force ikiwiki to use a particular umask
-	#umask => 022,
+	# force ikiwiki to use a particular umask (keywords public, group or private, or a number)
+	#umask => 'public',
 	# group for wrappers to run in
 	#wrappergroup => 'ikiwiki',
 	# extra library and plugin directory
 	libdir => $srcdir.'/.library',
 	# environment variables
 	ENV => {},
+	# time zone name
+	#timezone => 'Europe/Berlin',
 	# regexp of normally excluded files to include
 	#include => '^\\.htaccess$',
 	# regexp of files that should be skipped
@@ -118,6 +126,12 @@ IkiWiki::Setup::Standard->import({
 	wiki_file_chars => '-[:alnum:]+/.:_',
 	# allow symlinks in the path leading to the srcdir (potentially insecure)
 	#allow_symlinks_before_srcdir => 0,
+	# cookie control
+	#cookiejar => {
+	#  file => ''
+	#},
+	# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
+	#useragent => 'Wget/1.13.4 (linux-gnu)',
 
 	######################################################################
 	# core plugins
@@ -207,7 +221,8 @@ IkiWiki::Setup::Standard->import({
 
 	######################################################################
 	# format plugins
-	#   (creole, highlight, hnb, html, mdwn, otl, rawhtml, textile, txt)
+	#   (creole, highlight, hnb, html, mdwn, otl, po, rawhtml, rst,
+	#    textile, txt)
 	######################################################################
 
 	# highlight plugin
@@ -221,17 +236,53 @@ IkiWiki::Setup::Standard->import({
 	# mdwn plugin
 	# enable multimarkdown features?
 	#multimarkdown => 0,
+	# disable use of markdown discount?
+	#nodiscount => 0,
+
+	# po plugin
+	# master language (non-PO files)
+	#po_master_language => 'en|English',
+	# slave languages (translated via PO files) format: ll|Langname
+	#po_slave_languages => [qw{fr|Français es|Español de|Deutsch}],
+	# PageSpec controlling which pages are translatable
+	#po_translatable_pages => '* and !*/Discussion',
+	# internal linking behavior (default/current/negotiated)
+	#po_link_to => 'current',
 
 	######################################################################
-	# misc plugins
-	#   (filecheck)
+	# special-purpose plugins
+	#   (osm, underlay)
 	######################################################################
 
+	# osm plugin
+	# the default zoom when you click on the map link
+	#osm_default_zoom => 15,
+	# the icon shown on links and on the main map
+	#osm_default_icon => 'ikiwiki/images/osm.png',
+	# the alt tag of links, defaults to empty
+	#osm_alt => '',
+	# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+	#osm_format => 'KML',
+	# the icon attached to a tag, displayed on the map for tagged pages
+	#osm_tag_default_icon => 'icon.png',
+	# Url for the OpenLayers.js file
+	#osm_openlayers_url => 'http://www.openlayers.org/api/OpenLayers.js',
+	# Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.
+	#osm_layers => {
+	#  OSM => 'GoogleSatellite'
+	#},
+	# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+	#osm_google_apikey => '',
+
+	# underlay plugin
+	# extra underlay directories to add
+	#add_underlays => [qw{}],
+
 	######################################################################
 	# web plugins
 	#   (404, attachment, comments, editdiff, edittemplate, getsource,
 	#    google, goto, mirrorlist, remove, rename, repolist, search,
-	#    theme, websetup, wmd)
+	#    theme, userlist, websetup, wmd)
 	######################################################################
 
 	# attachment plugin
@@ -253,6 +304,8 @@ IkiWiki::Setup::Standard->import({
 	#comments_allowauthor => 0,
 	# commit comments to the VCS
 	#comments_commit => 1,
+	# Restrict formats for comments to (no restriction if empty)
+	#comments_allowformats => 'mdwn txt',
 
 	# getsource plugin
 	# Mime type for returned source.
@@ -261,6 +314,8 @@ IkiWiki::Setup::Standard->import({
 	# mirrorlist plugin
 	# list of mirrors
 	#mirrorlist => {},
+	# generate links that point to the mirrors' ikiwiki CGI
+	#mirrorlist_use_cgi => 1,
 
 	# repolist plugin
 	# URIs of repositories containing the wiki's source
@@ -272,6 +327,8 @@ IkiWiki::Setup::Standard->import({
 	# search plugin
 	# path to the omega cgi program
 	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
+	# use google site search rather than internal xapian index?
+	#google_search => 1,
 
 	# theme plugin
 	# name of theme to enable
@@ -288,10 +345,10 @@ IkiWiki::Setup::Standard->import({
 	######################################################################
 	# widget plugins
 	#   (calendar, color, conditional, cutpaste, date, format, fortune,
-	#    graphviz, haiku, img, linkmap, listdirectives, map, more,
-	#    orphans, pagecount, pagestats, poll, polygen, postsparkline,
-	#    progress, shortcut, sparkline, table, template, teximg, toc,
-	#    toggle, version)
+	#    graphviz, haiku, headinganchors, img, linkmap, listdirectives,
+	#    map, more, orphans, pagecount, pagestats, poll, polygen,
+	#    postsparkline, progress, shortcut, sparkline, table, template,
+	#    teximg, toc, toggle, version)
 	######################################################################
 
 	# calendar plugin
@@ -309,6 +366,7 @@ IkiWiki::Setup::Standard->import({
 	#teximg_dvipng => '',
 	# LaTeX prefix for teximg plugin
 	#teximg_prefix => '\\documentclass{article}
+	#\\usepackage[utf8]{inputenc}
 	#\\usepackage{amsmath}
 	#\\usepackage{amsfonts}
 	#\\usepackage{amssymb}
@@ -321,11 +379,11 @@ IkiWiki::Setup::Standard->import({
 	######################################################################
 	# other plugins
 	#   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed,
-	#    favicon, field, flattr, getfield, goodstuff, htmlbalance,
-	#    localstyle, pagetemplate, pingee, pinger, prettydate,
-	#    recentchanges, recentchangesdiff, relativedate, rsync,
-	#    sidebar, smiley, sortnaturally, tag, testpagespec, underlay,
-	#    ymlfront)
+	#    favicon, field, filecheck, flattr, getfield, goodstuff,
+	#    htmlbalance, localstyle, notifyemail, pagetemplate, pingee,
+	#    pinger, prettydate, recentchanges, recentchangesdiff,
+	#    relativedate, rsync, sidebar, smiley, sortnaturally, tag,
+	#    testpagespec, trail, transient, ymlfront)
 	######################################################################
 
 	# aggregate plugin
@@ -334,6 +392,10 @@ IkiWiki::Setup::Standard->import({
 	# allow aggregation to be triggered via the web?
 	#aggregate_webtrigger => 0,
 
+	# autoindex plugin
+	# commit autocreated index pages
+	#autoindex_commit => 1,
+
 	# camelcase plugin
 	# list of words to not turn into links
 	#camelcase_ignore => [],
@@ -377,10 +439,8 @@ IkiWiki::Setup::Standard->import({
 	tagbase => 'tag',
 	# autocreate new tag pages?
 	#tag_autocreate => 1,
-
-	# underlay plugin
-	# extra underlay directories to add
-	#add_underlays => '',
+	# commit autocreated tag pages
+	#tag_autocreate_commit => 1,
 
 	# ymlfront plugin
 	# delimiters of YAML data
-- 
cgit v1.2.3


From 09d9a8c0048ae1e55b2d28643e04764eb38696ee Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Sun, 9 Mar 2014 17:23:17 +0100
Subject: Keep using libtext-markdown-perl instead of
 libtext-markdown-discount-perl.

---
 ikiwiki.setup                                 | 7 ++++++-
 public_hurd_boxen/installation/darnassus.mdwn | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 94a66ca9..27aad971 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -237,7 +237,12 @@ IkiWiki::Setup::Standard->import({
 	# enable multimarkdown features?
 	#multimarkdown => 0,
 	# disable use of markdown discount?
-	#nodiscount => 0,
+	# Testing on Ubuntu raring with libtext-markdown-discount-perl 0.04-1,
+	# libmarkdown2 2.1.5a-1, using libtext-markdown-discount-perl instead
+	# of libtext-markdown-perl introduces quite some (visible) differences
+	# in how certains things are being rendered, and I'm not interested in
+	# auditing all our *.mdwn files, so keep using libtext-markdown-perl.
+	nodiscount => 1,
 
 	# po plugin
 	# master language (non-PO files)
diff --git a/public_hurd_boxen/installation/darnassus.mdwn b/public_hurd_boxen/installation/darnassus.mdwn
index 8cb8f619..5837705b 100644
--- a/public_hurd_boxen/installation/darnassus.mdwn
+++ b/public_hurd_boxen/installation/darnassus.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2013 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2013, 2014 Free Software Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -27,6 +27,8 @@ License|/fdl]]."]]"""]]
 
       * libyaml-perl libyaml-syck-perl (for ikiwiki's YAML field plugins)
 
+      * libtext-markdown-perl (used instead of libtext-markdown-discount-perl)
+
   * gitweb highlight
 
         sudo ln -s ~hurd-web/hurd-web.git /var/lib/git/
-- 
cgit v1.2.3