Merge tag 'sisu_4.2.1' into debian/sid

SiSU 4.2.1

4 files changed, 44 insertions, 2 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 12d19140..d84e0dab 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,26 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.1.orig.tar.xz (2013-08-28:34/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz
+  sisu_4.2.1.orig.tar.xz
+  sisu_4.2.1-1.dsc
+
+* config files (by filetype & filename) touched
+
+* manifest, output organised by, info, minor touch
+
+* vim syntax, sisu.vim, fix typo
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+
+* pdf (latex) tables, bugfix
+
+* odf:odt, footnotes, fix
+
+* dal, text blocks, tuning
+
 %% 4.2.0.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 86274ec8..e7a27cc6 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,28 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.14.orig.tar.xz (2013-08-28:34/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.14
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.14-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
+  sisu_5.0.14.orig.tar.xz
+  sisu_5.0.14-1.dsc
+
+* config files (by filetype & filename) touched
+
+* manifest, output organised by, info, minor touch
+
+* vim syntax, sisu.vim, fix typo
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+
+* dal
+  * grouped text with fontface spanning newlines, partial solution, test
+  * text blocks, tuning
+
+* pdf (latex) tables, bugfix
+
+* odf:odt, footnotes, fix
+
 %% 5.0.13.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
index 9bcc416e..bf88977f 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
@@ -97,7 +97,7 @@ db:
 #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
 output_dir_structure_by: filename
 #% lingual: 'multi' | 'mono' (multi default)
-#lingual: multi
+#lingual: mono
 
 permission_set:
   zap:               true
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
index bf34d249..0963780c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
@@ -97,7 +97,7 @@ db:
 #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
 output_dir_structure_by: filetype
 #% lingual: 'multi' | 'mono' (multi default)
-#lingual: multi
+#lingual: mono
 
 permission_set:
   zap:               true