Merge commit 'sisu_3.1.5' into debian/sid

2 files changed, 46 insertions, 4 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index c0955475..b6ddc8a2 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,38 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.1.5.orig.tar.xz (2011-11-21:47/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.5
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
+  sisu_3.1.5.orig.tar.xz
+  sisu_3.1.5-1.dsc
+  sisu_3.1.5-1.debian.tar.gz
+
+  * images, embedded symbol (previously overlooked, pre use of utf-8)
+    * param, sisu markup image regex match
+    * sisupod, sisu markup image regex match
+
+  * odf v1.2
+    * includes previously unimplemented hanging indents
+
+  * hanging indent
+    * done: dal, plaintext, html, epub, xhtml, xml (sax & dom), odt, pdf, sql;
+      not done: man, info
+
+  * dal_expand_insertions, link shortcut for multiple versions of sisu document,
+    omit codeblocks
+
+  * sisu manual, sisu markup, include example of: link shortcut for multiple
+    versions of a sisu document in the same directory tree
+
 %% 3.1.4.orig.tar.xz (2011-11-11:45/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.4
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.4.orig.tar.xz
-  sisu_3.1.4.orig.tar.xz
-  sisu_3.1.4-1.dsc
-  sisu_3.1.4-1.debian.tar.gz
+  536fc573d83a7c29a2e2fab8ab3fbfeb991503274c8d0816e62fd63b9b22a03e 1644396 sisu_3.1.4.orig.tar.xz
+  38366715cc44073cd63e7d75b68d17c04fc9ae7503e59ee02953990b6906aa18 1382 sisu_3.1.4-1.dsc
+  5cda46a831865ade0960707d55bdcb97ab2dea7e5b2a573747f31a804308d4be 289700 sisu_3.1.4-1.debian.tar.gz
 
   * FileUtils, make more consistent (and explicit) use of
     * explicit calls (more verbose, easier to find)
diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
index 046b1f2b..62cf013e 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
@@ -28,7 +28,7 @@
  :num_top: 1
  :breaks: new=C; break=1
  :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
+ :bold: /Gnu|Debian|Ruby|SiSU/i
 
 @links:
  { SiSU Homepage }http://www.sisudoc.org/
@@ -694,6 +694,23 @@ text marker *~name
 
 note at a heading level the same is automatically achieved by providing names to headings 1, 2 and 3 i.e. 2~[name] and 3~[name] or in the case of auto-heading numbering, without further intervention.
 
+3~ Link shortcut for multiple versions of a sisu document in the same directory tree
+
+!_ markup example:
+
+code{
+
+!_ /{"Viral Spiral"}/, David Bollier
+
+{ "Viral Spiral", David Bollier [3sS]}viral_spiral.david_bollier.sst
+
+}code
+
+
+!_ /{"Viral Spiral"}/, David Bollier
+
+{ "Viral Spiral", David Bollier [3sS]}viral_spiral.david_bollier.sst
+
 2~ Grouped Text
 
 3~ Tables