From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 18:16:51 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091218~37
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b74dceb884a60f6f7be395378a009ee414726d0b?hp=82c7f367ec91fba14d1c48dc55c2a859c74fc08f

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/doc/examples/softwaresite/bugs/New_bug.mdwn b/doc/examples/softwaresite/bugs/New_bug.mdwn
new file mode 100644
index 000000000..85f68d2b6
--- /dev/null
+++ b/doc/examples/softwaresite/bugs/New_bug.mdwn
@@ -0,0 +1 @@
+This is a new bug report!
diff --git a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
index a150570a4..6627ac0b9 100644
--- a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
+++ b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
@@ -1,3 +1,4 @@
 FooBar does not have enough bugs, which suggests that it's not a real Free
 Software project. Please help create more bugs by adding code to FooBar!
 :-)
+And what now?
diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index 5ca1b3347..dafffa844 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -13,7 +13,7 @@ list of active plugins.
 ## DESCRIPTION
 
 IkiWiki::Plugin::pod is an IkiWiki plugin enabling ikiwiki to
-process pages written in POD (Plain Old Documentation) format.
+process pages written in POD ([Plain Old Documentation](http://en.wikipedia.org/wiki/Plain_Old_Documentation)) format.
 This will treat files with a `.pod` or `.pm` extension as files
 which contain POD markup.