summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-01-14 14:37:43 -0400
committerJoey Hess <joey@kitenet.net>2011-01-14 14:37:43 -0400
commit9b6e3331705badfe0f40265261043b9cdd51820e (patch)
tree11be70e30e9aa724af5f87b8ec3fe7b3382a3821
parent34558e45ada6934fe690bfc1989bfd70d8c18338 (diff)
picked
-rw-r--r--debian/NEWS7
-rw-r--r--debian/changelog2
-rw-r--r--doc/todo/feed_enhancements_for_inline_pages.mdwn2
3 files changed, 11 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS
index f73ac9c3d..c53dbc068 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+ikiwiki (3.20110114) UNRELEASED; urgency=low
+
+ If you have custom CSS that uses "#feedlinks" or "#blogform", you will
+ need to change it to instead use ".feedlinks" and ".blogform"
+
+ -- Joey Hess <joeyh@debian.org> Fri, 14 Jan 2011 14:34:54 -0400
+
ikiwiki (3.20100515) unstable; urgency=low
There are two significant changes to the page.tmpl template in this version.
diff --git a/debian/changelog b/debian/changelog
index 53241e10d..36e4a9576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20110106) UNRELEASED; urgency=low
* inline: Pass feed titles to templates and add title and rel attributes
to feed links. (Giuseppe Bilotta)
+ * inline: Use class rather than id for feedlinks and blogform.
+ (Giuseppe Bilotta)
-- Joey Hess <joeyh@debian.org> Thu, 06 Jan 2011 14:41:34 -0400
diff --git a/doc/todo/feed_enhancements_for_inline_pages.mdwn b/doc/todo/feed_enhancements_for_inline_pages.mdwn
index 290326d9a..f82c30482 100644
--- a/doc/todo/feed_enhancements_for_inline_pages.mdwn
+++ b/doc/todo/feed_enhancements_for_inline_pages.mdwn
@@ -17,6 +17,8 @@ A few patches to clean up and improve feed management for inline pages.
>> \#blogform -> .blogform change. I have no idea on where to document
>> this change though.
+ >>> Picked. NEWSed. --[[Joey]]
+
* the second patch tries to define the default description for a feed based not only on the wiki name, but also on the current page name. The actual way this is built might not be the optimal one, so I'm open to suggestions
> I don't really like using "wikiname/page" as the name of the feed. It's