aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rw-r--r--debian/control6
2 files changed, 16 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index bbca7cffe..77d17f566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20100324) UNRELEASED; urgency=low
+ikiwiki (3.20100404) UNRELEASED; urgency=low
+
+ * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+ * comments: Fix missing entity encoding in title.
+ * txt: Add a special case for robots.txt.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400
+
+ikiwiki (3.20100403) unstable; urgency=low
* websetup: Add websetup_unsafe to allow marking other settings
as unsafe.
@@ -25,8 +33,11 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
used, but they are available in the session object now.)
* page.tmpl: Add Cache-Control must-revalidate to ensure that users
(especially of Firefox) see fresh page content.
+ * htmlscrubber: Allow colons in urls after '?'
+ * template: Search for templates in the templatedir, if they are not
+ found as pages in the wiki.
- -- Joey Hess <joeyh@debian.org> Sat, 13 Mar 2010 14:48:10 -0500
+ -- Joey Hess <joeyh@debian.org> Sat, 03 Apr 2010 14:17:28 -0400
ikiwiki (3.20100312) unstable; urgency=HIGH
diff --git a/debian/control b/debian/control
index 24c2c96a5..d7ce9a178 100644
--- a/debian/control
+++ b/debian/control
@@ -42,17 +42,17 @@ Conflicts: ikiwiki-plugin-table
Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table
Description: a wiki compiler
- ikiwiki converts a directory full of wiki pages into HTML pages suitable
+ Ikiwiki converts a directory full of wiki pages into HTML pages suitable
for publishing on a website. Unlike many wikis, ikiwiki does not have its
own ad-hoc means of storing page history, and instead uses a revision control
system such as Subversion or Git.
.
- ikiwiki implements all of the other standard features of a wiki, including
+ Ikiwiki implements all of the other standard features of a wiki, including
web-based page editing, user registration and logins, a RecentChanges
page, BackLinks, search, Discussion pages, tags, smart merging and conflict
resolution, and page locking.
.
- ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
+ Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
ikiwiki provides a plugin system which allows many other features to be
added. Some of the plugins have additional dependencies, found among the
Recommends and Suggests of this package.