Merge branch 'upstream' into debian/sid

1 files changed, 21 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e1f016ad..deef2a9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,9 +23,27 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.3.orig.tar.gz
       better
     * indentation levels reset
 
-  * cgi, generated sample search form, rearranged presentation
-
-  * editor syntax highlighting, kate, kwrite visited
+  * cgi, generated sample search form
+    * presentation rearranged
+    * additional result information provided
+      * canned searches provided to show matched text or indexes in matched documents
+      * links to odf text
+      * new results defaults set
+    * better highlighting of matches
+    * footnotes and footnote references have links to the main text in which
+      they are found
+
+  * manifest and concordance, output presentation title and author information
+    more prominent
+
+  * editor syntax highlighting (for SiSU), visited/improved
+    * diakonos
+    * gedit
+    * kate, kwrite
+  * renamed directory "syntax" "editor-syntax-etc"
+    * vim directory moved into editor-syntax-etc
+
+  * debian install, correctly map moved vim directory
 
 %% sisu_0.55.2.orig.tar.gz (2007-07-07:27/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.2.orig.tar.gz