merged smcv/ready/trail

diff --git a/debian/changelog b/debian/changelog
index 689197aea1f0b4a48fb5fc8941db62318c7be413..457bd6a67ec18bebaecdaa80e23867ce1b4deed3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low
     in the pages parameter. (smcv)
   * link: Fix renaming wikilinks that contain embedded urls.
   * graphviz: Handle self-links.
+  * trail: Improve CSS, also display trail links at bottom of page,
+    and a bug fix. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2012 14:33:14 -0400
 

diff --git a/doc/plugins/trail/discussion.mdwn b/doc/plugins/trail/discussion.mdwn
index 4218553bb400146d89acbdd36beadc0e46d821d6..7598ed21919f89c944ab6ab2b49ab046348e5aad 100644 (file)
--- a/doc/plugins/trail/discussion.mdwn
+++ b/doc/plugins/trail/discussion.mdwn
@@ -101,3 +101,5 @@ Some later changes to trail:
 * Fix a possible bug regarding state deletion
 
 --[[smcv]]
+
+> Applied --[[Joey]]