From: Joey Hess <joey@kitenet.net>
Date: Wed, 18 Apr 2012 19:46:47 +0000 (-0400)
Subject: merged smcv/ready/trail
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7f0d58fce37d0136068917bacbf77e8cdb4358d8?ds=sidebyside

merged smcv/ready/trail
---

diff --git a/debian/changelog b/debian/changelog
index 689197aea..457bd6a67 100644
--- 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 4218553bb..7598ed219 100644
--- 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]]