Merge branch 'upstream' into debian/sid

1 files changed, 15 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b8007a36..16aee6da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.60.0.orig.tar.gz (2007-09-30:39/7)
+%% sisu_0.60.0.orig.tar.gz (2007-10-03:40/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   sisu_0.60.0.orig.tar.gz
   sisu_0.60.0-1.dsc
@@ -29,6 +29,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
 
   * sysenv, sisurc.yml allow use of relative output paths, expand to absolute
 
+  * parameter reading on first run of file, (initialization of parameters)
+
+  * composite files (.ssm) building moved to processing directory, to overcome
+    problem of non-writable sisu-source document directories, perhaps also
+    cleaner (management of files)
+
   * param, behavior for reading headers changed to take in multi-lines, affects
     regex matching, watch
 
@@ -38,6 +44,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   * html segmented, bugfix: footnotes for headings levels :A,:B and :C
     correctly placed in first segment when batch-processing files/output
 
+  * latex/pdf minor cleaning,
+    * caret '^' is latex special character, additional match for escaping
+    * clean major headings of markup heading tag with tilde and name
+      e.g. '1~meta'
+
   * help, (hub), minor reorganisation and a change in info returned, most
     significantly the response for typing 'sisu' without options
 
@@ -48,6 +59,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
 
   * man-pages, refinements to generation
 
+  * param / metadata, hash sums now returns has sum and file-name only even for
+    sisu-skin
+
   * NOTE you may be better off doing any diffs between 0.60 and 0.58 branch
     than against 0.59 which includes a lot of generated within the package
     documentation, 0.60 adds source only. [Am tempted to remove 0.59 completely