update changelogs & version datesisu_3.0.0

4 files changed, 28 insertions, 12 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 98f12957..a679e6c0 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -6,7 +6,7 @@
 * <http://sisudoc.org/sisu/sisu_manual>
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* CHANGELOG CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
+* ../CHANGELOG ../v2/CHANGELOG ../v3/CHANGELOG ../README ../
 
 Reverse Chronological:
 
@@ -18,7 +18,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.0.orig.tar.gz
   sisu_2.8.0-1.dsc
   sisu_2.8.0-1.diff.gz
 
-  * note opening of version 3 branch, see v3 changelog
+  * opening of version 3 branch, see v3 changelog
+
+  * closing of version 1 branch
 
   [post Debian Squeeze]
 
diff --git a/data/doc/sisu/v3/CHANGELOG b/data/doc/sisu/v3/CHANGELOG
index 750fb749..8209e433 100644
--- a/data/doc/sisu/v3/CHANGELOG
+++ b/data/doc/sisu/v3/CHANGELOG
@@ -6,25 +6,39 @@
 * <http://sisudoc.org/sisu/sisu_manual>
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* ../CHANGELOG ../v1/CHANGELOG ../v2/CHANGELOG ../README ../
+* ../CHANGELOG ../v2/CHANGELOG ../v3/CHANGELOG ../README ../
 
 Reverse Chronological:
 
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
-%% 3.0.0.orig.tar.gz (2011-01-12:02/3)
+%% 3.0.0.orig.tar.gz (2011-02-07:06/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
   sisu_3.0.0.orig.tar.gz
   sisu_3.0.0-1.dsc
   sisu_3.0.0-1.diff.gz
 
-  NOTE: big patch, changes interim/incomplete (with possibility of breakage)
-  primarily for: ebook-readers and other downloading viewers (alternative
-  directory structures and use of title based filenames); use of git;
+  NOTE: Processing defaults to v2, for v3 use 'sisu3' or 'sisu --v3'
+
+  Versions 3 is experimental and attempts to introduce output more compatible
+  with mobile devices and other non-web use and more internationalisation
+  possibilities.
+
+  NOTE: v3 branch opened, big patch, changes interim/incomplete (with
+  possibility of breakage) primarily for: ebook-readers and other downloading
+  viewers (alternative directory structures and use of title based filenames);
   internationalisation (use with po4a, export pot & po, alternative directory
   structures, use of git to ensure changes not lost).
 
+  In v3 SiSU markup files may be organised in language directories that are
+  given their language code. There are alternative output directory structures
+  depending on whether you want: the v2 layout (mostly in a directory of the
+  given filename/a generic filetype name); a monolingual version 3 layout,
+  which organises files by filetype/given file name; multilingual v3 layout,
+  which organises files by language code/filetype/given which is illustrated
+  below
+
   * alternative output directory structures, configurable
     ├── en
     │   ├── epub
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 2a8d7941..131e0b6e 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :version: 2.8.0
-:date_stamp: 2011w05/2
-:date: "2011-02-01"
+:date_stamp: 2011w06/1
+:date: "2011-02-07"
 :project: SiSU
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 506e5d64..4fd83868 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.0-beta-0
-:date_stamp: 2011w05/2
-:date: "2011-02-01"
+:version: 3.0.0-beta
+:date_stamp: 2011w06/1
+:date: "2011-02-07"
 :project: SiSU