7 files changed, 80 insertions, 16 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 7101d7af..ba0af469 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,14 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz]
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.14-1
+
+* v2, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
+  Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
+  <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
+
 %% 2.9.11 (2012-01-10:02/2) [see 3.1.11.orig.tar.xz]
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.11-1
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index ce9abf00..34757240 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,56 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.1.14.orig.tar.xz (2012-02-14:07/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.14-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.14.orig.tar.xz
+  sisu_3.1.14.orig.tar.xz
+  sisu_3.1.14-1.dsc
+  sisu_3.1.14-1.debian.tar.gz
+
+* v3dv: sysenv, output_dir_structure, rewritten, affected code modified
+
+* v3dv: --redirect (--redirect=dir_path) & --dump (--dump=dir_path)
+  * --dump places output in directory specified, if none specified in the
+    current directory (pwd).
+  * --redirect places output in subdirectory under specified directory,
+    subdirectory uses the filename (without the suffix). If no output
+    directory is specified places the subdirectory under the current directory
+    (pwd).
+  * html, css incorporated into each file (concordance & manifest included)
+  * html, xhtml & xmls, css copied into css subdirectory (not used by html as
+    embedded)
+  * html xmls, images copied to output directory
+  * no links to manifest
+  * manifest with relative links only
+  * longer html filenames given to avoid names clashing (e.g. for toc,
+    manifest, concordance)
+
+* v3dv: html, epub, remove manifest toc links
+
+* v3dv: -j copy images associated with file (images used by html & xmls)
+  * automatically invoked by --dump & redirect
+
+* v3dv: dal, remove sisu_manifest from document structure & toc (metadata
+  retained (provide link to sisu_manifest)), html & epub coding affected
+
+* v3dv: hooks to make it possible to control (via: the command line; the
+  document markup header, or; the command line) the likes of: toc, manifest,
+  manifest-links, metadata, html-minitoc, html-navigation, html-navigation-bar;
+  these are switched on by default and control takes the form of making it
+  possible to switch them off.
+
+* v3 v3dv: document --redirect, --dump, -j update sisu_commands.sst
+  [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
+
 %% 3.1.13.orig.tar.xz (2012-02-03:05/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.13
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.13-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.13.orig.tar.xz
-  sisu_3.1.13.orig.tar.xz
-  sisu_3.1.13-1.dsc
-  sisu_3.1.13-1.debian.tar.gz
+  c204049136ee9e1ab70732e53d3ce5817e4e5aade1e2d682e0758e65ba4b81b5 1684744 sisu_3.1.13.orig.tar.xz
+  4820b0b4381a827c7a35019848234d6d38c9916cec30f54e6802609e8900e197 1389 sisu_3.1.13-1.dsc
+  b9a7d7bb59bc903f217cff8d544d666a6df0523caeb444493a03ab6f93d63d8d 291892 sisu_3.1.13-1.debian.tar.gz
 
 * v3 v3dv, path & url links, updates for multi output directory structure
   possibilities (fixes)
diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
index 201b927e..253553a0 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
@@ -87,6 +87,9 @@ assumed for most other flags, creates new intermediate files for processing (doc
 !_ --delete [filename/wildcard] \\
 see --zap
 
+!_ --dump[=directory_path] [filename/wildcard] \\
+places output in directory specified, if none is specified in the current directory (pwd). Compare --redirect
+
 !_ -D [instruction] [filename] \\
 see --pg
 
@@ -124,7 +127,7 @@ see --git
 makes two lists of sisu output based on the sisu markup documents in a directory: list of author and authors works (year and titles), and; list by topic with titles and author. Makes use of header metadata fields (author, title, date, topic_register). Can be used with maintenance (-M) and remote placement (-R) flags.
 
 !_ --help [topic] \\
-provides help on the selected topic, where topics (keywords) include: list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage, db, install, setup, (conf)igure, convert, termsheet, search, sql, features, license
+provides help on the selected topic, where topics (keywords) include: list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage, db, install, setup, (conf)igure, convert, termsheet, search, sql, features, license.
 
 !_ --html [filename/wildcard] \\
 produces html output, segmented text with table of contents (toc.html and index.html) and the document in a single file (scroll.html). Alias -h
@@ -138,6 +141,9 @@ see --texinfo
 !_ -i [filename/wildcard] \\
 see --manpage
 
+!_ -j [filename/wildcard] \\
+copies images associated with a file for use by html, xhtml & xml outputs (automatically invoked by --dump & redirect).
+
 !_ --keep-processing-files [filename/wildcard/url] \\
 see --maintenance
 
@@ -148,7 +154,7 @@ prints license information.
 see --dal (document abstraction level/layer)
 
 !_ --maintenance [filename/wildcard/url] \\
-maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files
+maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files.
 
 !_ --manpage [filename/wildcard] \\
 produces man page of file, not suitable for all outputs. Alias -i
@@ -207,6 +213,9 @@ see --qrcode
 !_ -q [filename/wildcard] \\
 see --quiet
 
+!_ --redirect[=directory_path] [filename/wildcard] \\
+places output in subdirectory under specified directory, subdirectory uses the filename (without the suffix). If no output directory is specified places the subdirectory under the current directory (pwd). Compare --dump
+
 !_ --rsync [filename/wildcard] \\
 copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync different if -R is used with other flags from if used alone. Alone the rsync --delete parameter is sent, useful for cleaning the remote directory (when -R is used together with other flags, it is not). Also see --scp. Alias -R
 
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 00c02a34..be92d62f 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
@@ -1,7 +1,7 @@
 " SiSU Vim syntax file
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-3.0.13)
-" Last Change:     2011-06-26
+" SiSU Markup:     SiSU (sisu-2.9.12)
+" Last Change:     2012-02-11
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
 "(originally looked at Ruby Vim by Mirko Nasato)
 
@@ -11,6 +11,8 @@ elseif exists("b:current_syntax")
   finish
 else
 endif
+let s:cpo_save = &cpo
+set cpo&vim
 
 " Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
@@ -208,3 +210,5 @@ hi def link sisu_error_sem_marker      Error
 hi def link sisu_error_wspace          Error
 hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index fe766598..663c9bd2 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.9.11
-:date_stamp: 2012w02/2
-:date: "2012-01-10"
+:version: 2.9.12
+:date_stamp: 2012w07/2
+:date: "2012-02-14"
 :project: SiSU
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 2729abab..38c6f821 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.1.13
-:date_stamp: 2012w05/5
-:date: "2012-02-03"
+:version: 3.1.14
+:date_stamp: 2012w07/2
+:date: "2012-02-14"
 :project: SiSU
diff --git a/data/sisu/v3dv/v/version.yml b/data/sisu/v3dv/v/version.yml
index ea289dd5..f99d49f7 100644
--- a/data/sisu/v3dv/v/version.yml
+++ b/data/sisu/v3dv/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.2.0~pre_3.1.13
-:date_stamp: 2012w05/5
-:date: "2012-02-03"
+:version: 3.2.0~pre_3.1.14
+:date_stamp: 2012w07/2
+:date: "2012-02-14"
 :project: SiSU