releasing version 1.1

diff --git a/debian/NEWS b/debian/NEWS
index 565ca21fca41d9d729e7f834efef770e99de4791..177fbc9ad2023de5e6b65e4cbecddb4cb0e12e18 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -16,14 +16,14 @@ ikiwiki (1.1) unstable; urgency=low
   use --disable-plugin=htmlscrubber, or modify the plugin setting in the
   setup file.
 
-  If your wiki is configured with a setup file, you will need to add a line
-  to enable Discussion links at the top of pages:
+  Discussion pages are enabled by default, but if your wiki is configured
+  with a setup file, you need to edit it to keep them enabled on upgrade
+  to this version. Add a line reading:
   discussion => 1,
-  Discussion pages are enabled by default, but old setup files won't enable
-  them unless you add tat line.
 
   You will need to rebuild your wiki when upgrading to this version.
   If you listed your wiki in /etc/ikiwiki/wikilist this will be done
-  automatically when the Debian package is upgraded.
+  automatically when the Debian package is upgraded. Or use
+  ikiiki-mass-rebuild to force a rebuild.
 
  -- Joey Hess <joeyh@debian.org>  Tue,  2 May 2006 14:13:59 -0400

diff --git a/debian/changelog b/debian/changelog
index b3d70190caf8b647e71a31c078636022cbe0fc33..12d3752e0ea6ef1cff8670b5467633f2b3d70db4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (1.1) UNRELEASED; urgency=low
+ikiwiki (1.1) unstable; urgency=low
 
   * Rename inlinepage to depends, so that it can be used to refer to more
     dependency relationships than just inlining. This will require a rebuild
@@ -50,7 +50,7 @@ ikiwiki (1.1) UNRELEASED; urgency=low
   * Add some new config items to the estseek.conf template, which are needed
     by hyperestraier 1.2.3.
 
- -- Joey Hess <joeyh@debian.org>  Fri,  5 May 2006 16:23:03 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri,  5 May 2006 17:00:41 -0400
 
 ikiwiki (1.0) unstable; urgency=low