Merge tag 'sisu_5.5.1' into debian/sid

SiSU 5.5.1

9 files changed, 74 insertions, 15 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 2cca5ac9..f6c18141 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,34 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.5.1.orig.tar.xz (2014-07-15:28/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.1.orig.tar.xz
+  sisu_5.5.1.orig.tar.xz
+  sisu_5.5.1-1.dsc
+
+* bin/sisu, hub, options, message pass sisu_called_from_directory
+
+* sysenv, general, base_markup_dir_stub (replace pwd_stub)
+
+* ao_numbering, auto name segment, extract "number" from heading, refine
+
+* src, sisupod, bring back in line
+
+* docbook,
+  * code & other block markup
+  * url links, urls
+  * images, an adjustment
+  * css (needs work)
+  * document header, sisu processing info
+  * docbook status, under construction notice removed (still much to do)
+
+* general, document parts
+  * css
+  * base images
+  * document images
+
 %% 5.5.0.orig.tar.xz (2014-07-11:27/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.0-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index ae42efe7..ddf381fd 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,34 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.1.1.orig.tar.xz (2014-07-15:28/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.1.orig.tar.xz
+  sisu_6.1.1.orig.tar.xz
+  sisu_6.1.1-1.dsc
+
+* bin/sisu, hub, options, message pass sisu_called_from_directory
+
+* sysenv, general, base_markup_dir_stub (replace pwd_stub)
+
+* ao_numbering, auto name segment, extract "number" from heading, refine
+
+* src, sisupod, bring back in line
+
+* docbook,
+  * code & other block markup
+  * url links, urls
+  * images, an adjustment
+  * css (needs work)
+  * document header, sisu processing info
+  * docbook status, under construction notice removed (still much to do)
+
+* general, document parts
+  * css
+  * base images
+  * document images
+
 %% 6.1.0.orig.tar.xz (2014-07-11:27/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.0-1
diff --git a/data/doc/sisu/COPYRIGHT b/data/doc/sisu/COPYRIGHT
index a43d9916..c77a68f1 100644
--- a/data/doc/sisu/COPYRIGHT
+++ b/data/doc/sisu/COPYRIGHT
@@ -9,7 +9,7 @@ Source: http://sisudoc.org/sisu/archive/pool/main/s/sisu/
         git://git.sisudoc.org/git/code/sisu.git
 
 Files: SiSU *
-Copyright: 1997, 2012, Ralph Amissah
+Copyright: 1997, 2014, Ralph Amissah
 License: GPL-3+
 
 Files: data/sisu/v*/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -30,7 +30,7 @@ License: LGPL-2.1
 
 Files: debian/*
 Copyright: 2005, Ralph Amissah <ralph.amissah@gmail.com>
-           2010, SiSU Project Debian, Ralph Amissah
+           2014, SiSU Project Debian, Ralph Amissah
 License: GPL-3+
 
 License: GPL-3+
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
index 72706d10..9bb0b2fa 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
@@ -3,7 +3,7 @@
  :breaks: new=C; break=1
  :bold: /Debian|Ruby|SiSU/
  :italics: /Linux|GPL|GPLv3|LaTeX|PostgreSQL|SQLite|SQL|Vim|ascii|plaintext|UTF-?8|HTML|XHTML|XML|EPUB|OpenDocument|ODF|ODT|PDF|pgSQL|TeXinfo|YAML|YML|OCN|object citation system|object citation numbering|granular search|Dublin Core/
- :substitute: /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*'
+ :substitute: /${sisu_stable}/,'5.5.1'  /${sisu_dev}/,'6.1.1' /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*'
  :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
  :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
 
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
index 016ef7ea..16661dd6 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
@@ -43,6 +43,9 @@ produces plaintext with Unix linefeeds and without markup, (object numbers are o
 !_ --ao [filename/wildcard/url] \\
 assumed for most other flags, creates new intermediate files for processing (abstract objects, document abstraction) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n. Alias -m.
 
+!_ --asciitext [filename/wildcard] \\
+asciitext, smart text (not available)
+
 !_ -b [filename/wildcard] \\
 see --xhtml
 
@@ -89,7 +92,7 @@ see --sqlite
 see --zap
 
 !_ --docbook [filename/wildcard/url] \\
-docbook smart text (not available)
+docbook xml
 
 !_ --dump[=directory_path] [filename/wildcard] \\
 places output in directory specified, if none is specified in the current directory (pwd). Unlike using default settings HTML files have embedded css. Compare --redirect
@@ -125,7 +128,7 @@ see --sample-search-form
 see --find
 
 !_ --fictionbook [filename/wildcard/url] \\
-fictionbook smart text (not available)
+fictionbook xml (not available)
 
 !_ --find [optional string part of filename] \\
 without match string, glob all .sst .ssm files in directory (including language subdirectories). With match string, find files that match given string in directory (including language subdirectories). Alias -f, --glob, -G
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
index 667a6459..b77e216a 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
@@ -52,9 +52,9 @@ to specify sisu version for sisu installed via gem
 
 gem search sisu
 
-_1 sisu _5.3.3_ --version
+_1 sisu _${sisu_stable}_ --version
 
-_1 sisu _6.0.3_ --version
+_1 sisu _${sisu_dev}_ --version
 
 to uninstall sisu installed via gem
 
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
index 64246368..196ab051 100644
--- a/data/doc/sisu/sisu.org
+++ b/data/doc/sisu/sisu.org
@@ -1860,7 +1860,7 @@ levels 1 2 & 3 are now distinguished
 (touches )
 override part font size settings for different levels (B C D)
 
-**** TODO [#C] #744384 [w|u] sisu syntax: relies on empty lines
+**** DONE CLOSED [#C] #744384 [w|u] sisu syntax: relies on empty lines
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744384>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -2220,7 +2220,7 @@ Daniel
 
 consider, work on possibly, later
 
-**** TODO [#C] #744408 [w|u] sisu: support more than one level of includes/nested includes
+**** DONE (5.5.0::6.1.0) [#C] #744408 [w|u] sisu: support more than one level of includes/nested includes
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744408>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 2e045c3e..189cbba6 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.5.0
-:date_stamp: 2014w27/5
-:date: "2014-07-11"
+:version: 5.5.1
+:date_stamp: 2014w28/2
+:date: "2014-07-15"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 7231ab70..035d57f7 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.1.0
-:date_stamp: 2014w27/5
-:date: "2014-07-11"
+:version: 6.1.1
+:date_stamp: 2014w28/2
+:date: "2014-07-15"