Merge tag 'sisu_4.0.0' into debian/sid

1 files changed, 19 insertions, 15 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c13296bf..49c5462a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,26 +1,30 @@
-%% SiSU versions 2 & 3, 2011
+%% SiSU versions 4 & 3 2012
 Homepage: <http://www.jus.uio.no/sisu>
-* README CHANGELOG CHANGELOG_v1 CHANGELOG_v2 CHANGELOG_v3
+* README CHANGELOG CHANGELOG_v1 CHANGELOG_v2 CHANGELOG_v3 CHANGELOG_v4
 
-Herein (this package) reside SiSU versions 2 and 3.
+Herein (this package) reside SiSU versions 4 and 3.
 
-README CHANGELOG_1 CHANGELOG_v2 CHANGELOG_v3
+Changelogs are to be found in the CHANGELOGS directory:
 
-This tarball contains two versions of SiSU, the stable version 2 and the
-under-development version 3. For version 1 look to sisu 2.7 and earlier.
+CHANGELOGS/CHANGELOG_v4
+CHANGELOGS/CHANGELOG_v3
+CHANGELOGS/CHANGELOG_v2
+CHANGELOGS/CHANGELOG_v1
 
-The input for v2 & v3, a SiSU marked-up document is the same.
+you might also look at the README file
 
-As version 2 is the current implementation the source tarball is named after
-it, and the command sisu by default runs version 2. To run version 3 add the
-flag --v3, i.e. sisu --v3 [filename], or run sisu3
+* v1 sisu pretty mature in operation and syntax
+* v2 introduces new processing middle layer (document abstraction);
+   markup same except for minor changes to document headers;
+   epub output introduced
+* v3 introduces alternative (configurable) output structures
+* v4 retires what were referred to as sisu skins
 
-Compatibility Notes
-
-Versions 3 is experimental and attempts to introduce output more compatible
-with mobile devices and other non-web use and more internationalisation
-possibilities. Please see CHANGELOG_v3
+This tarball contains two versions of SiSU, version 4 and version 3 which it
+replaced
 
+The input for sisu v2, v3 & v4, a SiSU marked-up document is unchanged apart
+from document headers.
 
 * homepage at: <http://www.jus.uio.no/sisu>
 * <http://www.jus.uio.no/sisu/SiSU/download>