Merge branch 'upstream' into debian/sid

1 files changed, 18 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1b0ff017..03c016d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,18 +6,30 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.56.4.orig.tar.gz (2007-08-21:34/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.4.orig.tar.gz
-  sisu_0.56.4.orig.tar.gz
-  sisu_0.56.4-1.dsc
-  sisu_0.56.4-1.diff.gz
+%% sisu_0.57.0.orig.tar.gz (2007-08-22:34/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.57.0.orig.tar.gz
+  sisu_0.57.0.orig.tar.gz
+  sisu_0.57.0-1.dsc
+  sisu_0.57.0-1.diff.gz
+
+  * markup addition, headings, shortcut for top level title (and author)
+    :A~ @title @author (also available for level 2 (or 3) author) [version bump]
+
+  * param markup identifier (and identifier) updated to identify markup
+    addition in 0.57, :A~ @title
 
   * manifest
     * use relative link by default
     * in absence of configured url_root (http://) use info on location on local
       filesystem (file://)
 
-  * html outputs, navigation band/banner adjustment
+  * html search form in navigation band/banner and promo, adjustments,
+    hyperestraier option offered in promo, requires change in sisurc.yml
+
+  * sisurc.yml requires changes to make use search form options, [version
+    bump] sample updated and commented out
+
+  * html outputs, navigation band/banner adjustment, in concordance and manifest
 
   * html scroll, fix to document information link in table of contents