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 (file)
index 0000000..85f68d2
--- /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 a150570a4fd18c450d874c2e72a711cc5fe3b72b..6627ac0b97f7321ff9e7b3e1f2891f13df7b3193 100644 (file)
--- 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 5ca1b33475391566d5b5e0052ec27823452a0d84..dafffa8448ad5939e545a67f327e17008ae157ef 100644 (file)
--- 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.