Merge tag 'sisu_5.6.3' into debian/sid

SiSU 5.6.3

9 files changed, 89 insertions, 43 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index d1609df6..93631a50 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.6.3.orig.tar.xz (2014-08-29:34/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.3-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.3.orig.tar.xz
+  sisu_5.6.3.orig.tar.xz
+  sisu_5.6.3-1.dsc
+
+* hub, sisu version info, when & what to report
+
+* dp, texpdf, copyright_and_license, minor fix, used by texpdf
+
 %% 5.6.2.orig.tar.xz (2014-08-20:33/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.2-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 7b3e3492..346332a5 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.2.4.orig.tar.xz (2014-08-29:34/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.4.orig.tar.xz
+  sisu_6.2.4.orig.tar.xz
+  sisu_6.2.4-1.dsc
+
+* hub, sisu version info, when & what to report
+
+* dp, texpdf, copyright_and_license, minor fix, used by texpdf
+
 %% 6.2.3.orig.tar.xz (2014-08-20:33/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.3-1
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
index e8d42695..09bb2d82 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
@@ -16,7 +16,8 @@
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
 #  url_root:     'http://www.your.url' #url to document root, without dir stub
-#  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  path:         '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
 #  images:       '_sisu/image'
 #  man:          'man'
 #  cgi:          '/usr/local/lib/sisu-cgi'
@@ -134,8 +135,12 @@ program_set:
 #search:
 #  sisu:
 #    flag:            true
-##    action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
 #    action:          http://search.sisudoc.org
-#    db:              sisu
+#    db:              manual
 #    title:           sample search form
+
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+
+#omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
index 432885f6..ca829ac8 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
@@ -15,8 +15,9 @@
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
-#  url_root:     'http://www.your.url' #without dir stub
-#  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.your.url' #url to document root, without dir stub
+#  path:         '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
 #  images:       '_sisu/image'
 #  man:          'man'
 #  cgi:          '/usr/local/lib/sisu-cgi'
@@ -49,12 +50,16 @@ show_output_on: 'filesystem_url'
 #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
 flag:
   color:        true                        # making colour default -c is toggle, and will now toggle colour off
-#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose'
-#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest'
-#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest'
-#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest'
-#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest'
-#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'
+#  act0:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose'
+#  act1:      '--digest --text --html --manifest'
+#  act2:      '--digest --text --html --epub --pdf --manifest'
+#  act3:      '--digest --qrcode --text --html --epub --concordance --pdf --manifest'
+#  act4:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --manifest'
+#  act5:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite --manifest'
+#  act6:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest'
+#  act7:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'
+#  act8:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --manifest'
+#  act9:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod --manifest'
 
 #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
@@ -130,8 +135,12 @@ program_set:
 #search:
 #  sisu:
 #    flag:            true
-##    action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
 #    action:          http://search.sisudoc.org
-#    db:              sisu
+#    db:              manual
 #    title:           sample search form
+
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+
+#omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
index b80808fc..04cd2a42 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
@@ -16,7 +16,8 @@
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
 #  url_root:     'http://www.your.url' #url to document root, without dir stub
-#  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  path:         '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
 #  images:       '_sisu/image'
 #  man:          'man'
 #  cgi:          '/usr/local/lib/sisu-cgi'
@@ -134,8 +135,12 @@ program_set:
 #search:
 #  sisu:
 #    flag:            true
-##    action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
 #    action:          http://search.sisudoc.org
-#    db:              sisu
+#    db:              manual
 #    title:           sample search form
+
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+
+#omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
index 752dbd66..006eefa7 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
@@ -15,8 +15,9 @@
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
-#  url_root:     'http://www.your.url' #without dir stub
-#  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.your.url' #url to document root, without dir stub
+#  path:         '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
 #  images:       '_sisu/image'
 #  man:          'man'
 #  cgi:          '/usr/local/lib/sisu-cgi'
@@ -49,12 +50,16 @@ show_output_on: 'filesystem_url'
 #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
 flag:
   color:        true                        # making colour default -c is toggle, and will now toggle colour off
-#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose'
-#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest'
-#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest'
-#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest'
-#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest'
-#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'
+#  act0:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose'
+#  act1:      '--digest --text --html --manifest'
+#  act2:      '--digest --text --html --epub --pdf --manifest'
+#  act3:      '--digest --qrcode --text --html --epub --concordance --pdf --manifest'
+#  act4:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --manifest'
+#  act5:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite --manifest'
+#  act6:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest'
+#  act7:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'
+#  act8:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --manifest'
+#  act9:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod --manifest'
 
 #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
@@ -130,8 +135,12 @@ program_set:
 #search:
 #  sisu:
 #    flag:            true
-##    action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
 #    action:          http://search.sisudoc.org
-#    db:              sisu
+#    db:              manual
 #    title:           sample search form
+
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+
+#omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
index 62fb7624..9dd3980f 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
@@ -14,9 +14,10 @@
 #  public:       '_sisu/image'
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
+webserv:
 #  url_root:     'http://www.your.url' #url to document root, without dir stub
-#  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  path:         '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
 #  images:       '_sisu/image'
 #  man:          'man'
 #  cgi:          '/usr/local/lib/sisu-cgi'
@@ -132,17 +133,12 @@ program_set:
 #search:
 #  sisu:
 #    flag:            true
-##    action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
 #    action:          http://search.sisudoc.org
 #    db:              manual
 #    title:           sample search form
+
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
 
-search:
-  sisu:
-    flag:            true
-    action:          http://192.168.1.108/cgi/sisu_search.cgi
-#   action:          http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-#    action:          http://search.sisudoc.org
-    db:              manual
-    title:           sample search form
+#omit: minitoc
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 59668da0..fa57b9ab 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.6.2
-:date_stamp: 2014w33/3
-:date: "2014-08-20"
+:version: 5.6.3
+:date_stamp: 2014w34/5
+:date: "2014-08-29"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 5697c2df..b03690af 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.2.3
-:date_stamp: 2014w33/3
-:date: "2014-08-20"
+:version: 6.2.4
+:date_stamp: 2014w34/5
+:date: "2014-08-29"