6 files changed, 68 insertions, 12 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index dcf40f63..f540f185 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,25 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.12.orig.tar.xz (2013-11-08:44/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.12
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.12-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.12.orig.tar.xz
+  sisu_4.2.12.orig.tar.xz
+  sisu_4.2.12-1.dsc
+
+* rake (& rant) sisu installer
+  * do less by default
+  * removed rant generated sisu-install
+
+* vim, ftplugin sisu.vim, fix missing <leader>
+
+* sisu_manual, minor info addition
+
+* bin/sisu-*
+  * use option flag full names
+  * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
+
 %% 4.2.11.orig.tar.xz (2013-11-05:44/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.11
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.11-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 56ca73be..398257ae 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,25 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.25.orig.tar.xz (2013-11-08:44/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.25
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.25-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.25.orig.tar.xz
+  sisu_5.0.25.orig.tar.xz
+  sisu_5.0.25-1.dsc
+
+* rake (& rant) sisu installer
+  * do less by default
+  * removed rant generated sisu-install
+
+* vim, ftplugin sisu.vim, fix missing <leader>
+
+* sisu_manual, minor info addition
+
+* bin/sisu-*
+  * use option flag full names
+  * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
+
 %% 5.0.24.orig.tar.xz (2013-11-05:44/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.24
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.24-1
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst
index 92b7f430..ddf6e570 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst
@@ -510,7 +510,7 @@ code{
 
 normal text ~[* editors notes, numbered asterisk footnote/endnote series ]~ continues
 
-normal text ~[+ editors notes, numbered asterisk footnote/endnote series ]~ continues
+normal text ~[+ editors notes, numbered plus symbol footnote/endnote series ]~ continues
 
 }code
 
@@ -518,7 +518,7 @@ normal text ~[+ editors notes, numbered asterisk footnote/endnote series ]~ cont
 
 normal text ~[* editors notes, numbered asterisk footnote/endnote series ]~ continues
 
-normal text ~[+ editors notes, numbered asterisk footnote/endnote series ]~ continues
+normal text ~[+ editors notes, numbered plus symbol footnote/endnote series ]~ continues
 
 !_ Alternative endnote pair notation for footnotes/endnotes:
 
@@ -1285,3 +1285,24 @@ code{
 }code
 
 The form described above should be relied on. Within the Vim editor it results in the text thus linked becoming hyperlinked to the document it is calling in which is convenient for editing.
+
+1~ Substitutions
+
+!_ markup example:
+
+code{
+
+The current Debian is ${debian_stable} the next debian will be ${debian_testing}
+
+Configure substitution in _sisu/sisu_document_make
+
+@make:
+ :substitute: /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*'
+
+}code
+
+!_ resulting output:
+
+The current Debian is ${debian_stable} the next debian will be ${debian_testing}
+
+Configure substitution in _sisu/sisu_document_make
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 9cb8952a..43c7e531 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -95,9 +95,6 @@
 "% directory files, placed in vertical split window
 :map <leader>ls :vs<cr> :Explore<cr>
 :map <leader>dir :vs<cr> :Explore<cr>
-:if &diff
-:  cmap q qa
-:endif
 "% remapping lines make cursor jump a line at a time within wrapped text
 :nnoremap j gj
 :nnoremap k gk
@@ -140,7 +137,7 @@
 :nmap <silent> <C-n> :silent call ToggleHLSearched()<cr>
 "%% SiSU vim folds
 "% foldsearchx FoldSearch (opens result of search all else closed) t77
-:map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
+:map <leader>fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
 :map <leader>ff :F<cr>
 :map <leader>fe :F<cr> zE
 "% foldtoggle Fold Toggle mapped to <space>
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index d010c88f..bc4a319b 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.2.11
-:date_stamp: 2013w44/2
-:date: "2013-11-05"
+:version: 4.2.12
+:date_stamp: 2013w44/5
+:date: "2013-11-08"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 39bc4b65..530acb56 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.24
-:date_stamp: 2013w44/2
-:date: "2013-11-05"
+:version: 5.0.25
+:date_stamp: 2013w44/5
+:date: "2013-11-08"
 :project: SiSU