From f26f1b37f7ee35fa4fea8291fc05096c14ed2468 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 1 Feb 2011 07:53:24 -0500
Subject: prepare for v3 branch

---
 CHANGELOG_v1                                       |  2 +-
 CHANGELOG_v2                                       | 73 ++++++++++++++++++++-
 data/doc/sisu/v1/CHANGELOG                         |  2 +-
 .../samples/_sisu/skin/yml/skin_countries.yml      |  1 -
 data/doc/sisu/v2/CHANGELOG                         | 75 +++++++++++++++++++++-
 .../samples/_sisu/skin/yml/skin_countries.yml      |  1 -
 .../v2/conf/editor-syntax-etc/vim/syntax/sisu.vim  |  8 +--
 lib/sisu/v2/defaults.rb                            |  2 +-
 lib/sisu/v2/odf.rb                                 |  2 +-
 9 files changed, 151 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG_v1 b/CHANGELOG_v1
index 13f656e4..0d9c3aef 100644
--- a/CHANGELOG_v1
+++ b/CHANGELOG_v1
@@ -10,7 +10,7 @@
 
 Reverse Chronological:
 
-%% STABLE MANIFEST
+%% Legacy Branch, Reference
 
 %% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 1f48644b..644f1301 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -10,7 +10,7 @@
 
 Reverse Chronological:
 
-%% Development branch UNSTABLE
+%% STABLE Branch
 
 %% 2.7.10.orig.tar.gz (2010-12-16:50/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
       texpdf (adjust later)
 
 %% 2.7.9.orig.tar.gz (2010-12-09:49/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.9-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1b259aed7b454a576cf8d52acc48b8f524ef5612
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
   e4767c4e45f1b0a0d9dfcf1a077553143fd501926755b18e52a0e5d900366415 1196 sisu_2.7.9-1.dsc
@@ -81,6 +83,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   * html search form, configuration check
 
 %% 2.7.8.orig.tar.gz (2010-10-25:43/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.8-1
+http://git.sisudoc.org/?p=code/sisu.git;h=8bac1a749de5fc43b8be049532798d67ad2f97f0
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
   af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz
   fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc
@@ -126,6 +130,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
       false)
 
 %% 2.7.7.orig.tar.gz (2010-10-17:41/7)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.7-1
+http://git.sisudoc.org/?p=code/sisu.git;h=3425ce01fbb29e4c6f58b9dbeacdcdc3b430eb55
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
   0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz
   e8f3c1f8a546fa5ff58a1e14e6e4b9288b4ef1c549f018539bcc88a7f58f3c7f 1196 sisu_2.7.7-1.dsc
@@ -154,6 +160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
   * documentation related minor updates and fixes
 
 %% 2.7.6.orig.tar.gz (2010-10-11:41/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.6-1
+http://git.sisudoc.org/?p=code/sisu.git;h=0fe4c7cb80c986c31b4e8a17c57e8812db54861d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   7cd4c46fa3bcadd9bad5f009836e3f76ba33581f346c20baa750df849e132a4c 2746314 sisu_2.7.6.orig.tar.gz
   f9805002b99b9c7784a2e20a8f7ded02516f6a268e361785d7a15b0bd92c1360 1196 sisu_2.7.6-1.dsc
@@ -172,6 +180,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   * CHANGELOG v2 recount where some requests came from
 
 %% 2.7.5.orig.tar.gz (2010-10-09:40/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f3bf535de48ff8b5f236e975ce749c80db6ae046
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
   616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz
   79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc
@@ -189,6 +199,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
   * param, metadata rights, keep colon separator from interfering with urls
 
 %% 2.7.4.orig.tar.gz (2010-10-08:40/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1c84bbb8c41ff546ae007dd85f75a7a12023cdb9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
   3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz
   bc2193743fc8635a5974aa0e55507bf99264df0669d23e635cda11bff767ce3a 1196 sisu_2.7.4-1.dsc
@@ -204,6 +216,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
     * epub (epub_tune) scaling of images, fix
 
 %% 2.7.3.orig.tar.gz (2010-10-06:40/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=79ef5fd0725d0c92c18e73fa4a56b0a491d32544
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
   01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
   8c258e23ca20c57a39023a9a7cff228f3ba0581bc27bfa39d61706d6517aadc1 1196 sisu_2.7.3-1.dsc
@@ -227,6 +241,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
   * sisu_markup.sst, document a fix (v1 & 2)
 
 %% 2.7.2.orig.tar.gz (2010-10-01:39/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f019e7fa052047b0335ec7e9fc6cd5e643f25dda
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz
   b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc
@@ -242,6 +258,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   * texpdf_format, remove a few commented out lines
 
 %% 2.7.1.orig.tar.gz (2010-10-01:39/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f0336c13da195245e1ef3f0f9d3cdb1137da2d01
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
   48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz
   620b4664f3c52e70821f6c23e0c215aaef0a75ea55bf1ca0bdb261b8747768d8 1196 sisu_2.7.1-1.dsc
@@ -271,6 +289,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
   * share_src, hub cleaning
 
 %% 2.7.0.orig.tar.gz (2010-09-21:38/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a2218b6f96f9d840c5b2cfa25cd994be2f2a4069
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
   9e9e9695184e09dcf3fadee20e34d92d031c66419e49394de83a56cddd81bcba 2741663 sisu_2.7.0.orig.tar.gz
   c04567f96e711c86ac1a2bc47151314a051859c86c68ad5b11083f7b10989a25 1196 sisu_2.7.0-1.dsc
@@ -337,6 +357,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
     webrick (--webserv-webrick))
 
 %% 2.6.3.orig.tar.gz (2010-07-28:30/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=44ccd0a8aaee13bbbd9628eee05520db6922bacf
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
   11194bce22da16b3d758afc4a5209d3503aa0b51235f7a0d2f6469e43e84f2f4 1196 sisu_2.6.3-1.dsc
@@ -419,7 +441,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
 
   * options, add expressive options --[name] as alternative to flags -[x]
 
-  (2010-09-20:38/1)
+(2010-09-20:38/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=769442ea3e827937ed40a2aae7ec1bba7a0ce0ff
   a431d5a3b5285023fe09e4d7f885cabdb4eb540d9d6403f744bd65b0b91c09b5 1196 sisu_2.6.3-6.dsc
   3d9daf8718c9ffbd42a9492dc23d8c333e121687b84f9ac16333f6a813f60279 321360 sisu_2.6.3-6.diff.gz
   [debian freeze, documentation, minor fixes]
@@ -441,6 +464,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
     webrick (--webserv-webrick))
 
 %% 2.6.2.orig.tar.gz (2010-07-15:28/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=b8de42c9a93f38ea0f1a542811d740da028d3c00
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
   63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
   e880807a7bddec2c574da599f1ea08b3564ed5fb8d3cd63a4e57dee0a22a7497 1151 sisu_2.6.2-1.dsc
@@ -468,6 +493,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
   * debian/control update ruby1.9 related depends to ruby1.9.1 (libfcgi-ruby1.9.1)
 
 %% 2.6.1.orig.tar.gz (2010-07-09:27/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4392e22ce84c432e9e2d79429e2319e0dfdcc882
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
   bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
@@ -486,6 +513,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   * sysenv, default output path, fix
 
 %% 2.6.0.orig.tar.gz (2010-07-07:27/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4056a5a2480d3505d648869e6c6bfef101ab27f1
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
   c7a85d6960012a29f37fda02f3cf6a26276344a62f1b404660b9c8729c683187 1151 sisu_2.6.0-1.dsc
@@ -513,6 +542,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   * manpages, some additional manpages and some updates
 
 %% 2.5.1.orig.tar.gz (2010-06-12:23/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=80e3cbf97af98b094703efece3ca459577a19a21
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
   c87a04a3071de4e8388b214fb6bb1a602657c5859a817bd0f001c92a4ce1f98d 2768984 sisu_2.5.1.orig.tar.gz
   5698680779692893ba39666c6deebae8d796cf4b7b0a643853c49e6691f23f12 1145 sisu_2.5.1-1.dsc
@@ -522,6 +553,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
     configured, (was intended, required fix)
 
 %% 2.5.0.orig.tar.gz (2010-06-11:23/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f136873c61bf6239101df3a40e94550858a01813
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
   8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
   6c4c9a1737e6bd22b4d0a2a30419280f5bde67bc272bf9f2f2b8e59dc15d6c65 1145 sisu_2.5.0-1.dsc
@@ -545,6 +578,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
     content
 
 %% 2.4.3.orig.tar.gz (2010-06-05:22/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=dd2989e951435bc617bbfc0647dcf24ee8dc8b57
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
   bf0e596113b60b873efc738ec2a9ab9a7b2d0687cd7011d27700331faab4e2c5 2767084 sisu_2.4.3.orig.tar.gz
   01784bc068f91858534f157a024d4ca723e4afb0161c50cf3a42ab0cbaeef889 1145 sisu_2.4.3-1.dsc
@@ -570,6 +605,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
       result of search all else closed)
 
 %% 2.4.2.orig.tar.gz (2010-06-01:22/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=35bd9574ae05e9f5db138522803ed7915ea46b45
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
   d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
   b9d161be07f01a42aa87ae4ca5a36309e99c52e6d76d092b0e15345674e23dad 1145 sisu_2.4.2-1.dsc
@@ -583,6 +620,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
     (related to reporting "http" file not found)
 
 %% 2.4.1.orig.tar.gz (2010-05-26:21/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2bb04d2d78b4f5693737deb764ddfd33dc8d1982
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
   ee7ac449291c9aff05731fdefc1b31584f4ff6c0d3ec4b7b2250ef05c1d3b343 2765591 sisu_2.4.1.orig.tar.gz
   67e89b24d527361711543d503c0fc05c82dc7df845e31b28eba53b15522e520e 1145 sisu_2.4.1-1.dsc
@@ -596,6 +635,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
     * dal_syntax fix, no auto-bold or italics on relative or internal links
 
 %% 2.4.0.orig.tar.gz (2010-05-26:21/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=84e6d09e5706320eb63d7913ca4f94dfa7d0a95b
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
   5a7ca024e36d9d08653e2cfe335e83345305c16e531de361d84ba3315739303b 2764579 sisu_2.4.0.orig.tar.gz
   33097b5afccfff9cfea9b08acea55741482ae6f6eca5aa9d2fd8d90661708e83 1145 sisu_2.4.0-1.dsc
@@ -619,6 +660,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
   * sisu markup, documentation on_sisu_markup/sisu_markup.txt added much todo
 
 %% 2.3.5.orig.tar.gz (2010-05-18:20/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=16e4ef02a770d4c809bf0d654da71d6407699e20
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
   fb599fc29a6c1f67ae3ed6fe79ed2768045899870717d719d5b91be2a3db56fb 2755625 sisu_2.3.5.orig.tar.gz
   04e5430529ffdf77e6fbdd956b0eddaae1c00bd0640bad26c3a25c63bc2aac20 1145 sisu_2.3.5-1.dsc
@@ -633,6 +676,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
   * vim templates for .sst .ssm & .ssi
 
 %% 2.3.4.orig.tar.gz (2010-05-12:19/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=36e60044c9daa3b5f4b90b254cb2547254919d66
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
   3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
   c646cd4a08ad7e58c38b5bdcf0259574dd30db5db51a269be2a5bdf92b6a1293 1145 sisu_2.3.4-1.dsc
@@ -645,6 +690,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
   * sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
 
 %% 2.3.3.orig.tar.gz (2010-05-05:18/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2ed17e169f26f27969f6f133ae4b562ef2f03d31
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
   89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
   c64f5d52720c666872bacadf1867b4aa01c04380a257df5dbf95a3f23ca0293b 1145 sisu_2.3.3-1.dsc
@@ -659,6 +706,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
   * screen output (ansi), control
 
 %% 2.3.2.orig.tar.gz (2010-05-03:18/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=c49812567cd574d9ccb870a6cdc4943038c8b97f
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
   5719841cbacf87088a9e34c868b6e2e9b0e9ac17221b4a02bddbe2a055b019c2 1145 sisu_2.3.2-1.dsc
@@ -687,6 +736,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   * dal_numbering, number headings, a fix
 
 %% 2.3.1.orig.tar.gz (2010-04-28:17/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=512fb10b2f3d3affdef7be8b072b0a0b9fc8e368
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
   03a9912a475a634e4e18024a508c64c67b60337cf0edeab01b96f3d54bc96e4a 2751600 sisu_2.3.1.orig.tar.gz
   475643cc77b3bef83cbeebdb8282240396805c328d2c6b48411555861d9d09e8 1145 sisu_2.3.1-1.dsc
@@ -695,6 +746,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
   * param, for topic_register, an additional check required, bug fix, repost
 
 %% 2.3.0.orig.tar.gz (2010-04-27:17/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=efb456ab2b61f2a5c5efeb42924ef1320d0b8891
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
   6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
   6423bf0b1d231bb766886fa23561fce565375c60902705ca0611ea6897b7de59 1145 sisu_2.3.0-1.dsc
@@ -742,6 +795,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
     alternatively to be in italics [requested]
 
 %% 2.2.0.orig.tar.gz (2010-04-20:16/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.2.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4bc96b7b8ef87840125556c418be970cd84b9bf9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
   aa487605bc6bf89419c96773ed3738685307353ef4df1ead50d829785910747f 2746848 sisu_2.2.0.orig.tar.gz
   2709ec54dd49cc7796eff532b7d122d5383b2ca907ec39df4c87213de12bfb85 1145 sisu_2.2.0-1.dsc
@@ -780,6 +835,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
     [2.1.1 fix release was not built, changes appear under 2.2.0]
 
 %% 2.1.0.orig.tar.gz (2010-04-16:15/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.1.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=df791cb9ef04e558a54ef57a61ea7c81adb3417a
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   ceb7fb71ed815f7f64faac98174639f0008d4d7659053f6832cd3023f656a14b 2745619 sisu_2.1.0.orig.tar.gz
   a1a452dc0ff287a746a408862156afa054c51ae9efc232f8fa59a67d9af6b4b6 1145 sisu_2.1.0-1.dsc
@@ -812,6 +869,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   * vim syntax highlighting, minor
 
 %% 2.0.5.orig.tar.gz (2010-03-31:13/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=aba8f88aadbb8e08a3a2f875d8650363b14fc0d3
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
   8fad44b225512ab436562fc759244752b722c6d8aa4f3df3de3b1b97001fad43 2738182 sisu_2.0.5.orig.tar.gz
   e9fbc9b60f38067f1f3e7f1c89b20df39127ce322968df8390ed041289ecde7b 1145 sisu_2.0.5-1.dsc
@@ -828,6 +887,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
   * harvest, add search form for directory, if configured in sisurc.yml
 
 %% 2.0.4.orig.tar.gz (2010-03-23:12/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e603e6c35e27537422e038de94fa7f7d7b3f1d2d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
   7fb8b578813fbd6cd4bf441e8eefeb9b52860064d1c66b83889bfc65468c90fd 2737242 sisu_2.0.4.orig.tar.gz
   262c08353f44e75f1f0da02ab4f7d5a843da687ddfd416ed4c2b7ad08f1226a7 1145 sisu_2.0.4-1.dsc
@@ -840,6 +901,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
   * free_as_in_freedom, additional links to available material
 
 %% 2.0.3.orig.tar.gz (2010-03-22:12/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e5be411e7c179a4ab8636a120c71978c57fe55e9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
   5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
   4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc
@@ -852,6 +915,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
     * xml_dom, behaviours fixes
 
 %% 2.0.2.orig.tar.gz (2010-03-21:11/7)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1578133349a33a7e1e3fe39927bcfe50fffd86e4
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
   c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
   721ff54e991ede11da9c584530e4ec4b37f2e6f60e50d04a6c87a974c3e10a62 1145 sisu_2.0.2-1.dsc
@@ -866,6 +931,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
     updated/corrected
 
 %% 2.0.1.orig.tar.gz (2010-03-17:11/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=59653d4445a43d00efcad161bdeeae6cb3c874cc
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
   364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz
   7b6eb6a962b3120f0e0820fecae7ef0ceadd4ef510719727b63e70f7ae2a323c 1145 sisu_2.0.1-1.dsc
@@ -882,6 +949,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
   * docs, add epub, more to be done
 
 %% 2.0.0.orig.tar.gz (2010-03-06:09/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a1838881e7874b8eb857c81ce53a755985265e04
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
   4fc214d40542e0d2ba7447e9ff06de3612d857d9015e8233877f9b4f93a9875f 2733550 sisu_2.0.0.orig.tar.gz
   6a157cbfc838f8141b352ab1513ac67bb43802db22f62902275df48ba41c5a0f 1145 sisu_2.0.0-1.dsc
diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 28b9ae5c..e27bba61 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -10,7 +10,7 @@
 
 Reverse Chronological:
 
-%% STABLE MANIFEST
+%% Legacy Branch, Reference
 
 %% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
diff --git a/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
index 179b9978..274e19fa 100644
--- a/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
@@ -479,4 +479,3 @@ id: WF
   name: Wallis and Futuna Islands
 id: EH
   name: Western Sahara
-
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index e1f2d14a..644f1301 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -6,11 +6,11 @@
 * <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 CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
 
 Reverse Chronological:
 
-%% Development branch UNSTABLE
+%% STABLE Branch
 
 %% 2.7.10.orig.tar.gz (2010-12-16:50/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
       texpdf (adjust later)
 
 %% 2.7.9.orig.tar.gz (2010-12-09:49/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.9-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1b259aed7b454a576cf8d52acc48b8f524ef5612
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
   e4767c4e45f1b0a0d9dfcf1a077553143fd501926755b18e52a0e5d900366415 1196 sisu_2.7.9-1.dsc
@@ -81,6 +83,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   * html search form, configuration check
 
 %% 2.7.8.orig.tar.gz (2010-10-25:43/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.8-1
+http://git.sisudoc.org/?p=code/sisu.git;h=8bac1a749de5fc43b8be049532798d67ad2f97f0
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
   af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz
   fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc
@@ -126,6 +130,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
       false)
 
 %% 2.7.7.orig.tar.gz (2010-10-17:41/7)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.7-1
+http://git.sisudoc.org/?p=code/sisu.git;h=3425ce01fbb29e4c6f58b9dbeacdcdc3b430eb55
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
   0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz
   e8f3c1f8a546fa5ff58a1e14e6e4b9288b4ef1c549f018539bcc88a7f58f3c7f 1196 sisu_2.7.7-1.dsc
@@ -154,6 +160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
   * documentation related minor updates and fixes
 
 %% 2.7.6.orig.tar.gz (2010-10-11:41/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.6-1
+http://git.sisudoc.org/?p=code/sisu.git;h=0fe4c7cb80c986c31b4e8a17c57e8812db54861d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   7cd4c46fa3bcadd9bad5f009836e3f76ba33581f346c20baa750df849e132a4c 2746314 sisu_2.7.6.orig.tar.gz
   f9805002b99b9c7784a2e20a8f7ded02516f6a268e361785d7a15b0bd92c1360 1196 sisu_2.7.6-1.dsc
@@ -172,6 +180,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   * CHANGELOG v2 recount where some requests came from
 
 %% 2.7.5.orig.tar.gz (2010-10-09:40/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f3bf535de48ff8b5f236e975ce749c80db6ae046
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
   616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz
   79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc
@@ -189,6 +199,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
   * param, metadata rights, keep colon separator from interfering with urls
 
 %% 2.7.4.orig.tar.gz (2010-10-08:40/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1c84bbb8c41ff546ae007dd85f75a7a12023cdb9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
   3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz
   bc2193743fc8635a5974aa0e55507bf99264df0669d23e635cda11bff767ce3a 1196 sisu_2.7.4-1.dsc
@@ -204,6 +216,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
     * epub (epub_tune) scaling of images, fix
 
 %% 2.7.3.orig.tar.gz (2010-10-06:40/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=79ef5fd0725d0c92c18e73fa4a56b0a491d32544
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
   01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
   8c258e23ca20c57a39023a9a7cff228f3ba0581bc27bfa39d61706d6517aadc1 1196 sisu_2.7.3-1.dsc
@@ -227,6 +241,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
   * sisu_markup.sst, document a fix (v1 & 2)
 
 %% 2.7.2.orig.tar.gz (2010-10-01:39/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f019e7fa052047b0335ec7e9fc6cd5e643f25dda
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz
   b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc
@@ -242,6 +258,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   * texpdf_format, remove a few commented out lines
 
 %% 2.7.1.orig.tar.gz (2010-10-01:39/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f0336c13da195245e1ef3f0f9d3cdb1137da2d01
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
   48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz
   620b4664f3c52e70821f6c23e0c215aaef0a75ea55bf1ca0bdb261b8747768d8 1196 sisu_2.7.1-1.dsc
@@ -271,6 +289,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
   * share_src, hub cleaning
 
 %% 2.7.0.orig.tar.gz (2010-09-21:38/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a2218b6f96f9d840c5b2cfa25cd994be2f2a4069
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
   9e9e9695184e09dcf3fadee20e34d92d031c66419e49394de83a56cddd81bcba 2741663 sisu_2.7.0.orig.tar.gz
   c04567f96e711c86ac1a2bc47151314a051859c86c68ad5b11083f7b10989a25 1196 sisu_2.7.0-1.dsc
@@ -337,6 +357,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
     webrick (--webserv-webrick))
 
 %% 2.6.3.orig.tar.gz (2010-07-28:30/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=44ccd0a8aaee13bbbd9628eee05520db6922bacf
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
   11194bce22da16b3d758afc4a5209d3503aa0b51235f7a0d2f6469e43e84f2f4 1196 sisu_2.6.3-1.dsc
@@ -419,7 +441,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
 
   * options, add expressive options --[name] as alternative to flags -[x]
 
-  (2010-09-20:38/1)
+(2010-09-20:38/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=769442ea3e827937ed40a2aae7ec1bba7a0ce0ff
   a431d5a3b5285023fe09e4d7f885cabdb4eb540d9d6403f744bd65b0b91c09b5 1196 sisu_2.6.3-6.dsc
   3d9daf8718c9ffbd42a9492dc23d8c333e121687b84f9ac16333f6a813f60279 321360 sisu_2.6.3-6.diff.gz
   [debian freeze, documentation, minor fixes]
@@ -441,6 +464,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
     webrick (--webserv-webrick))
 
 %% 2.6.2.orig.tar.gz (2010-07-15:28/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=b8de42c9a93f38ea0f1a542811d740da028d3c00
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
   63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
   e880807a7bddec2c574da599f1ea08b3564ed5fb8d3cd63a4e57dee0a22a7497 1151 sisu_2.6.2-1.dsc
@@ -468,6 +493,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
   * debian/control update ruby1.9 related depends to ruby1.9.1 (libfcgi-ruby1.9.1)
 
 %% 2.6.1.orig.tar.gz (2010-07-09:27/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4392e22ce84c432e9e2d79429e2319e0dfdcc882
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
   bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
@@ -486,6 +513,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
   * sysenv, default output path, fix
 
 %% 2.6.0.orig.tar.gz (2010-07-07:27/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4056a5a2480d3505d648869e6c6bfef101ab27f1
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
   c7a85d6960012a29f37fda02f3cf6a26276344a62f1b404660b9c8729c683187 1151 sisu_2.6.0-1.dsc
@@ -513,6 +542,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   * manpages, some additional manpages and some updates
 
 %% 2.5.1.orig.tar.gz (2010-06-12:23/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=80e3cbf97af98b094703efece3ca459577a19a21
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
   c87a04a3071de4e8388b214fb6bb1a602657c5859a817bd0f001c92a4ce1f98d 2768984 sisu_2.5.1.orig.tar.gz
   5698680779692893ba39666c6deebae8d796cf4b7b0a643853c49e6691f23f12 1145 sisu_2.5.1-1.dsc
@@ -522,6 +553,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
     configured, (was intended, required fix)
 
 %% 2.5.0.orig.tar.gz (2010-06-11:23/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=f136873c61bf6239101df3a40e94550858a01813
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
   8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
   6c4c9a1737e6bd22b4d0a2a30419280f5bde67bc272bf9f2f2b8e59dc15d6c65 1145 sisu_2.5.0-1.dsc
@@ -545,6 +578,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
     content
 
 %% 2.4.3.orig.tar.gz (2010-06-05:22/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=dd2989e951435bc617bbfc0647dcf24ee8dc8b57
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
   bf0e596113b60b873efc738ec2a9ab9a7b2d0687cd7011d27700331faab4e2c5 2767084 sisu_2.4.3.orig.tar.gz
   01784bc068f91858534f157a024d4ca723e4afb0161c50cf3a42ab0cbaeef889 1145 sisu_2.4.3-1.dsc
@@ -570,6 +605,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
       result of search all else closed)
 
 %% 2.4.2.orig.tar.gz (2010-06-01:22/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=35bd9574ae05e9f5db138522803ed7915ea46b45
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
   d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
   b9d161be07f01a42aa87ae4ca5a36309e99c52e6d76d092b0e15345674e23dad 1145 sisu_2.4.2-1.dsc
@@ -583,6 +620,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
     (related to reporting "http" file not found)
 
 %% 2.4.1.orig.tar.gz (2010-05-26:21/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2bb04d2d78b4f5693737deb764ddfd33dc8d1982
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
   ee7ac449291c9aff05731fdefc1b31584f4ff6c0d3ec4b7b2250ef05c1d3b343 2765591 sisu_2.4.1.orig.tar.gz
   67e89b24d527361711543d503c0fc05c82dc7df845e31b28eba53b15522e520e 1145 sisu_2.4.1-1.dsc
@@ -596,6 +635,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
     * dal_syntax fix, no auto-bold or italics on relative or internal links
 
 %% 2.4.0.orig.tar.gz (2010-05-26:21/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=84e6d09e5706320eb63d7913ca4f94dfa7d0a95b
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
   5a7ca024e36d9d08653e2cfe335e83345305c16e531de361d84ba3315739303b 2764579 sisu_2.4.0.orig.tar.gz
   33097b5afccfff9cfea9b08acea55741482ae6f6eca5aa9d2fd8d90661708e83 1145 sisu_2.4.0-1.dsc
@@ -619,6 +660,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
   * sisu markup, documentation on_sisu_markup/sisu_markup.txt added much todo
 
 %% 2.3.5.orig.tar.gz (2010-05-18:20/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=16e4ef02a770d4c809bf0d654da71d6407699e20
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
   fb599fc29a6c1f67ae3ed6fe79ed2768045899870717d719d5b91be2a3db56fb 2755625 sisu_2.3.5.orig.tar.gz
   04e5430529ffdf77e6fbdd956b0eddaae1c00bd0640bad26c3a25c63bc2aac20 1145 sisu_2.3.5-1.dsc
@@ -633,6 +676,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
   * vim templates for .sst .ssm & .ssi
 
 %% 2.3.4.orig.tar.gz (2010-05-12:19/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=36e60044c9daa3b5f4b90b254cb2547254919d66
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
   3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
   c646cd4a08ad7e58c38b5bdcf0259574dd30db5db51a269be2a5bdf92b6a1293 1145 sisu_2.3.4-1.dsc
@@ -645,6 +690,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
   * sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
 
 %% 2.3.3.orig.tar.gz (2010-05-05:18/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=2ed17e169f26f27969f6f133ae4b562ef2f03d31
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
   89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
   c64f5d52720c666872bacadf1867b4aa01c04380a257df5dbf95a3f23ca0293b 1145 sisu_2.3.3-1.dsc
@@ -659,6 +706,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
   * screen output (ansi), control
 
 %% 2.3.2.orig.tar.gz (2010-05-03:18/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=c49812567cd574d9ccb870a6cdc4943038c8b97f
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
   5719841cbacf87088a9e34c868b6e2e9b0e9ac17221b4a02bddbe2a055b019c2 1145 sisu_2.3.2-1.dsc
@@ -687,6 +736,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   * dal_numbering, number headings, a fix
 
 %% 2.3.1.orig.tar.gz (2010-04-28:17/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=512fb10b2f3d3affdef7be8b072b0a0b9fc8e368
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
   03a9912a475a634e4e18024a508c64c67b60337cf0edeab01b96f3d54bc96e4a 2751600 sisu_2.3.1.orig.tar.gz
   475643cc77b3bef83cbeebdb8282240396805c328d2c6b48411555861d9d09e8 1145 sisu_2.3.1-1.dsc
@@ -695,6 +746,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
   * param, for topic_register, an additional check required, bug fix, repost
 
 %% 2.3.0.orig.tar.gz (2010-04-27:17/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=efb456ab2b61f2a5c5efeb42924ef1320d0b8891
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
   6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
   6423bf0b1d231bb766886fa23561fce565375c60902705ca0611ea6897b7de59 1145 sisu_2.3.0-1.dsc
@@ -742,6 +795,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
     alternatively to be in italics [requested]
 
 %% 2.2.0.orig.tar.gz (2010-04-20:16/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.2.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=4bc96b7b8ef87840125556c418be970cd84b9bf9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
   aa487605bc6bf89419c96773ed3738685307353ef4df1ead50d829785910747f 2746848 sisu_2.2.0.orig.tar.gz
   2709ec54dd49cc7796eff532b7d122d5383b2ca907ec39df4c87213de12bfb85 1145 sisu_2.2.0-1.dsc
@@ -780,6 +835,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
     [2.1.1 fix release was not built, changes appear under 2.2.0]
 
 %% 2.1.0.orig.tar.gz (2010-04-16:15/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.1.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=df791cb9ef04e558a54ef57a61ea7c81adb3417a
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   ceb7fb71ed815f7f64faac98174639f0008d4d7659053f6832cd3023f656a14b 2745619 sisu_2.1.0.orig.tar.gz
   a1a452dc0ff287a746a408862156afa054c51ae9efc232f8fa59a67d9af6b4b6 1145 sisu_2.1.0-1.dsc
@@ -812,6 +869,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
   * vim syntax highlighting, minor
 
 %% 2.0.5.orig.tar.gz (2010-03-31:13/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.5-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=aba8f88aadbb8e08a3a2f875d8650363b14fc0d3
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
   8fad44b225512ab436562fc759244752b722c6d8aa4f3df3de3b1b97001fad43 2738182 sisu_2.0.5.orig.tar.gz
   e9fbc9b60f38067f1f3e7f1c89b20df39127ce322968df8390ed041289ecde7b 1145 sisu_2.0.5-1.dsc
@@ -828,6 +887,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
   * harvest, add search form for directory, if configured in sisurc.yml
 
 %% 2.0.4.orig.tar.gz (2010-03-23:12/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.4-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e603e6c35e27537422e038de94fa7f7d7b3f1d2d
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
   7fb8b578813fbd6cd4bf441e8eefeb9b52860064d1c66b83889bfc65468c90fd 2737242 sisu_2.0.4.orig.tar.gz
   262c08353f44e75f1f0da02ab4f7d5a843da687ddfd416ed4c2b7ad08f1226a7 1145 sisu_2.0.4-1.dsc
@@ -840,6 +901,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
   * free_as_in_freedom, additional links to available material
 
 %% 2.0.3.orig.tar.gz (2010-03-22:12/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=e5be411e7c179a4ab8636a120c71978c57fe55e9
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
   5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
   4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc
@@ -852,6 +915,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
     * xml_dom, behaviours fixes
 
 %% 2.0.2.orig.tar.gz (2010-03-21:11/7)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=1578133349a33a7e1e3fe39927bcfe50fffd86e4
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
   c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
   721ff54e991ede11da9c584530e4ec4b37f2e6f60e50d04a6c87a974c3e10a62 1145 sisu_2.0.2-1.dsc
@@ -866,6 +931,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
     updated/corrected
 
 %% 2.0.1.orig.tar.gz (2010-03-17:11/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=59653d4445a43d00efcad161bdeeae6cb3c874cc
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
   364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz
   7b6eb6a962b3120f0e0820fecae7ef0ceadd4ef510719727b63e70f7ae2a323c 1145 sisu_2.0.1-1.dsc
@@ -882,6 +949,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
   * docs, add epub, more to be done
 
 %% 2.0.0.orig.tar.gz (2010-03-06:09/6)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=commitdiff;h=a1838881e7874b8eb857c81ce53a755985265e04
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
   4fc214d40542e0d2ba7447e9ff06de3612d857d9015e8233877f9b4f93a9875f 2733550 sisu_2.0.0.orig.tar.gz
   6a157cbfc838f8141b352ab1513ac67bb43802db22f62902275df48ba41c5a0f 1145 sisu_2.0.0-1.dsc
diff --git a/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
index 179b9978..274e19fa 100644
--- a/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
@@ -479,4 +479,3 @@ id: WF
   name: Wallis and Futuna Islands
 id: EH
   name: Western Sahara
-
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 1f7e94ba..4bf5a045 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -17,8 +17,8 @@ syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
 if !exists("sisu_no_identifiers")
   syn match   sisu_mark_endnote                                           "\~^"
   syn match   sisu_break               contains=@NoSpell                  "<br>\|<br />"
-  syn match   sisu_control             contains=@NoSpell                  "<:p[bn]>"
-  syn match   sisu_control             contains=@NoSpell                  "<:\(ols\|---\)>"
+  syn match   sisu_control             contains=@NoSpell                  "^<:p[bn]>\s*$"
+  syn match   sisu_control             contains=@NoSpell                  "^<:\(bo\|---\)>\s*$"
   syn match   sisu_marktail                                               "[~-]#"
   syn match   sisu_control                                                "\""
   syn match   sisu_underline                                              "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
@@ -72,10 +72,10 @@ syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 "headings
 syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
-"grouped text
+"block/group text
 syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
 syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
-syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)"
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
 syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
 "endnotes
 syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb
index a5305e4d..2c3cf207 100644
--- a/lib/sisu/v2/defaults.rb
+++ b/lib/sisu/v2/defaults.rb
@@ -1980,7 +1980,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P
 </div>
 <div id="column_center">
 <p class="bold">
-SiSU Short Description  
+SiSU Short Description
 </p>
 <p>
 SiSU is a comprehensive future-proofing electronic document management system.  Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format.  Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats.  Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB).  Word mapping allows you to easily create word indexes for your documents.  Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed.  All these and many other features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing.
diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb
index d19945c0..2e2a88b4 100644
--- a/lib/sisu/v2/odf.rb
+++ b/lib/sisu/v2/odf.rb
@@ -612,7 +612,7 @@ module SiSU_ODF
           %{<style:style style:name="T4" style:family="text"><style:text-properties style:text-position="super 58%"/></style:style>#{@br}} +
           %{<style:style style:name="T5" style:family="text"><style:text-properties style:text-position="sub 58%"/></style:style>#{@br}} +
           %{<style:style style:name="T6" style:family="text"><style:text-properties style:font-name="Courier 10 Pitch" fo:font-size="12pt"/></style:style>#{@br}} +
-          %{<style:style style:name="T7" style:family="text"><style:text-properties style:font-name="DejaVu Sans Mono" fo:font-size="10pt" fo:font-weight="normal" fo:background-color="#e6e6e6"/></style:style>#{@br}} +  
+          %{<style:style style:name="T7" style:family="text"><style:text-properties style:font-name="DejaVu Sans Mono" fo:font-size="10pt" fo:font-weight="normal" fo:background-color="#e6e6e6"/></style:style>#{@br}} +
           %{<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics"><style:graphic-properties style:wrap="none" style:horizontal-pos="left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/></style:style>#{@br}} +
           %{<style:style style:name="gr1" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%" draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:image-opacity="100%" style:mirror="none" style:run-through="background" style:wrap="none" style:vertical-pos="top" style:vertical-rel="baseline" style:horizontal-pos="left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" style:flow-with-text="false"/></style:style>#{@br}} +
           %{<style:style style:name="gr2" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%" draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:image-opacity="100%" style:mirror="none" style:run-through="background" style:wrap="none" style:vertical-pos="middle" style:vertical-rel="baseline" style:horizontal-pos="left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" style:flow-with-text="false"/></style:style>#{@br}} +
-- 
cgit v1.2.3