Merge branch 'upstream' into debian/sid

1 files changed, 26 insertions, 3 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 378ad2b9..358c3762 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,34 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.4.0.orig.tar.gz (2010-05-26:21/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
+  sisu_2.4.0.orig.tar.gz
+  sisu_2.4.0-1.dsc
+  sisu_2.4.0-1.diff.gz
+
+  * sisu markup syntax added to, related to internal document links and
+    relative links, see note on additions to vim syntax highlighting (version
+    bump)
+
+  * dal, added internal document link to tagged point, affecting downstream
+    processing
+
+  * output formats internal document (and relative) linking as possible
+
+  * vim syntax highlighting, added tag for internal document link to tagged
+    point  { Linked text }#tagname also relative link
+   { linked }:document_name/file.html#23
+   which is the preferred equivalent of
+   { linked }../document_name/file.html#23
+
+  * sisu markup, documentation on_sisu_markup/sisu_markup.txt added much todo
+
 %% 2.3.5.orig.tar.gz (2010-05-18:20/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
-  sisu_2.3.5.orig.tar.gz
-  sisu_2.3.5-1.dsc
-  sisu_2.3.5-1.diff.gz
+  fb599fc29a6c1f67ae3ed6fe79ed2768045899870717d719d5b91be2a3db56fb 2755625 sisu_2.3.5.orig.tar.gz
+  04e5430529ffdf77e6fbdd956b0eddaae1c00bd0640bad26c3a25c63bc2aac20 1145 sisu_2.3.5-1.dsc
+  36cd9012a33837aa1032bf9a9c78444b31f2a397634625e9e15323a17a17a8dd 276135 sisu_2.3.5-1.diff.gz
 
   * dal_syntax, url match fix