picked

diff --git a/debian/NEWS b/debian/NEWS
index f73ac9c3d1c2d3901662a83ce4a288ad3408f074..c53dbc068b1f613d547f1b89360be9b9d08a994e 100644 (file)
--- 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.
 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 53241e10df88a3586abd07624d9a1e6819489556..36e4a957686a3449a176dacd676a83d0431ec9ad 100644 (file)
--- 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: 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
 
 
  -- 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 290326d9a5f48217eeba6fa76434102b4cd793ff..f82c304825ed64a9d97c586be1ff312b185fe1ba 100644 (file)
--- 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.
 
   >> \#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
 * 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