Merge tag 'sisu_5.6.6' into debian/sid

SiSU 5.6.6

9 files changed, 121 insertions, 613 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 1fd44736..41520e68 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,50 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.6.6.orig.tar.xz (2014-09-12:36/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.6
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.6-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.6.orig.tar.xz
+  sisu_5.6.6.orig.tar.xz
+  sisu_5.6.6-1.dsc
+
+* ao, auto naming (segment & tag), exceptions, avoidance of name collisions
+
+* ao, feedback on markup document structure (heading level) errors
+  adjustment to (existing) provided feedback, based on:
+   * level A~ title, required;
+   * levels B~ C~ D~ optional sequential document divider headings
+     (Part, Section etc. equivalent);
+   * level 1~ required, heading level preceding substantive text; followed by
+   * levels 2~ 3~ 4~ optional, sequential headings
+     (1.1, 1.1.1, 1.1.1.1 equivalents)
+
+* ao, expansion of links to internal filepaths (re: syntax based shortcut)
+  (expansion of sisu output filepaths, sync with use of --act0 to --act9)
+
+* se, processing, adjustments to default settings for --act0 to --act9
+
+* se, env, lingual: mono / multi, rc settings
+
+* sisurc, update samples
+  * adjustments to default settings for --act0 to --act9 (to match current "se")
+  * removed sisurc examples to organize output by
+    filetype, filename, monolingual, as one word diff
+    output_dir_structure_by: language
+    # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+    # language
+    #   (language and filetype directories);
+    # filetype
+    #   (filetype directories, filename includes language code);
+    # filetype_mono (or monolingual)
+    #   (filetype drectories, no language codes in filenames)
+    # filename
+    #   (directory output similar to v1 v2, filename includes language code);
+    # filename_mono
+    #   (directory output similar to v1 v2, filename without language code);
+
+* hub, /tmp processing directory checks
+
 %% 5.6.5.orig.tar.xz (2014-09-05:35/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.5-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index a6ef4d23..ba481baa 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,50 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.2.7.orig.tar.xz (2014-09-12:36/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.7.orig.tar.xz
+  sisu_6.2.7.orig.tar.xz
+  sisu_6.2.7-1.dsc
+
+* ao, auto naming (segment & tag), exceptions, avoidance of name collisions
+
+* ao, feedback on markup document structure (heading level) errors
+  adjustment to (existing) provided feedback, based on:
+   * level A~ title, required;
+   * levels B~ C~ D~ optional sequential document divider headings
+     (Part, Section etc. equivalent);
+   * level 1~ required, heading level preceding substantive text; followed by
+   * levels 2~ 3~ 4~ optional, sequential headings
+     (1.1, 1.1.1, 1.1.1.1 equivalents)
+
+* ao, expansion of links to internal filepaths (re: syntax based shortcut)
+  (expansion of sisu output filepaths, sync with use of --act0 to --act9)
+
+* se, processing, adjustments to default settings for --act0 to --act9
+
+* se, env, lingual: mono / multi, rc settings
+
+* sisurc, update samples
+  * adjustments to default settings for --act0 to --act9 (to match current "se")
+  * removed sisurc examples to organize output by
+    filetype, filename, monolingual, as one word diff
+    output_dir_structure_by: language
+    # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+    # language
+    #   (language and filetype directories);
+    # filetype
+    #   (filetype directories, filename includes language code);
+    # filetype_mono (or monolingual)
+    #   (filetype drectories, no language codes in filenames)
+    # filename
+    #   (directory output similar to v1 v2, filename includes language code);
+    # filename_mono
+    #   (directory output similar to v1 v2, filename without language code);
+
+* hub, /tmp processing directory checks
+
 %% 6.2.6.orig.tar.xz (2014-09-05:35/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.6-1
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
deleted file mode 100644
index ca829ac8..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   site environment configuration file
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu        #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-#  path:         'sisu_working'
-#  public:       '_sisu/image'
-#  #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' #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'
-#  feed:         'feed'
-#  sqlite:       'sisu/sqlite'
-#  webrick_url:  true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-#  stub:         'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-#  path:         'sisu_processing'
-#  metaverse:    'metaverse'
-#  tune:         'tune'
-#  latex:        'tex'
-#  texinfo:      'texinfo'
-#  concord_max:  400000
-
-#% 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
-#  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:
-  papersize:    'a4,letter'
-  #language:      'en'
-  #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
-  #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
-  #text_wrap:    78
-  #emphasis:     'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
-  #digest:       'sha' #sha is sha256, default is md5
-  #language:     'English'
-  #emphasis:     'italics'
-
-#% settings used by ssh scp
-#remote:
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-#  port:         '8081'
-
-#sql database info, postgresql and sqlite
-db:
-  postgresql:
-    port:       '5432' # '5432'
-   #host:       # '[if not localhost, provide host tcp/ip address or domain name]''
-   #user:       # '[(if different from user) provide username]'
-   #password:   # '[password if required]'
-#  sqlite:
-#    path:       ~ # './sisu_sqlite.db'
-#    port:       "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filename
-#% lingual: 'multi' | 'mono' (multi default)
-lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-permission_set:
-  zap:               true
-  css_modify:        true
-  remote_base_site:  true
-
-program_set:
-  rmagick:           true
-#  wc:           true
-#  editor:       true
-#  postgresql:   true
-#  sqlite:       true
-#  tidy:         true
-#  rexml:        true
-#  pdflatex:     true
-
-#program_select:
-#  editor:              'vim'
-#  pdf_viewer:          'evince'
-#  web_browser:         'iceweasel'
-#  console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
-#  xml_viewer:          'xml-viewer'
-#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
-#  info_viewer:         'pinfo -f'
-#  man:                 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-#  sisu:
-#    flag:            true
-#    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
-
-#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
deleted file mode 100644
index 04cd2a42..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   site environment configuration file
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu        #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-#  path:         'sisu_working'
-#  public:       '_sisu/image'
-#  #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' #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'
-#  feed:         'feed'
-#  sqlite:       'sisu/sqlite'
-#  webrick_url:  true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-#  stub:         'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-#  path:         'sisu_processing'
-#  metaverse:    'metaverse'
-#  tune:         'tune'
-#  latex:        'tex'
-#  texinfo:      'texinfo'
-#  concord_max:  400000
-
-#% 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
-#  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:
-  papersize:    'a4,letter'
-  #language:      'en'
-  #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
-  #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
-  #text_wrap:    78
-  #emphasis:     'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
-  #digest:       'sha' #sha is sha256, default is md5
-  #language:     'English'
-  #emphasis:     'italics'
-
-#% settings used by ssh scp
-#remote:
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-#  port:         '8081'
-
-#sql database info, postgresql and sqlite
-db:
-  postgresql:
-    port:       '5432' # '5432'
-   #host:       # '[if not localhost, provide host tcp/ip address or domain name]''
-   #user:       # '[(if different from user) provide username]'
-   #password:   # '[password if required]'
-#  sqlite:
-#    path:       ~ # './sisu_sqlite.db'
-#    port:       "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filetype
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-permission_set:
-  zap:               true
-  css_modify:        true
-  remote_base_site:  true
-
-program_set:
-  rmagick:           true
-#  wc:           true
-#  editor:       true
-#  postgresql:   true
-#  sqlite:       true
-#  tidy:         true
-#  rexml:        true
-#  pdflatex:     true
-
-#program_select:
-#  editor:              'vim'
-#  pdf_viewer:          'evince'
-#  web_browser:         'iceweasel'
-#  console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
-#  xml_viewer:          'xml-viewer'
-#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
-#  info_viewer:         'pinfo -f'
-#  man:                 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-#  sisu:
-#    flag:            true
-#    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
-
-#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
deleted file mode 100644
index 006eefa7..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   site environment configuration file
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu        #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-#  path:         'sisu_working'
-#  public:       '_sisu/image'
-#  #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' #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'
-#  feed:         'feed'
-#  sqlite:       'sisu/sqlite'
-#  webrick_url:  true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-#  stub:         'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-#  path:         'sisu_processing'
-#  metaverse:    'metaverse'
-#  tune:         'tune'
-#  latex:        'tex'
-#  texinfo:      'texinfo'
-#  concord_max:  400000
-
-#% 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
-#  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:
-  papersize:    'a4,letter'
-  #language:      'en'
-  #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
-  #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
-  #text_wrap:    78
-  #emphasis:     'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
-  #digest:       'sha' #sha is sha256, default is md5
-  #language:     'English'
-  #emphasis:     'italics'
-
-#% settings used by ssh scp
-#remote:
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-#  port:         '8081'
-
-#sql database info, postgresql and sqlite
-db:
-  postgresql:
-    port:       '5432' # '5432'
-   #host:       # '[if not localhost, provide host tcp/ip address or domain name]''
-   #user:       # '[(if different from user) provide username]'
-   #password:   # '[password if required]'
-#  sqlite:
-#    path:       ~ # './sisu_sqlite.db'
-#    port:       "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filetype
-#% lingual: 'multi' | 'mono' (multi default)
-lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-permission_set:
-  zap:               true
-  css_modify:        true
-  remote_base_site:  true
-
-program_set:
-  rmagick:           true
-#  wc:           true
-#  editor:       true
-#  postgresql:   true
-#  sqlite:       true
-#  tidy:         true
-#  rexml:        true
-#  pdflatex:     true
-
-#program_select:
-#  editor:              'vim'
-#  pdf_viewer:          'evince'
-#  web_browser:         'iceweasel'
-#  console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
-#  xml_viewer:          'xml-viewer'
-#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
-#  info_viewer:         'pinfo -f'
-#  man:                 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-#  sisu:
-#    flag:            true
-#    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
-
-#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
deleted file mode 100644
index 9dd3980f..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   site environment configuration file
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu        #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-#  path:         'sisu_working'
-#  public:       '_sisu/image'
-#  #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' #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'
-#  feed:         'feed'
-#  sqlite:       'sisu/sqlite'
-#  webrick_url:  true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-#  stub:         'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-#  path:         'sisu_processing'
-#  metaverse:    'metaverse'
-#  tune:         'tune'
-#  latex:        'tex'
-#  texinfo:      'texinfo'
-#  concord_max:  400000
-
-#% 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
-#  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:
-  papersize:    'a4,letter'
-  #language:      'en'
-  #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
-  #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
-  #text_wrap:    78
-  #emphasis:     'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
-  #digest:       'sha' #sha is sha256, default is md5
-  #language:     'English'
-  #emphasis:     'italics'
-
-#% settings used by ssh scp
-#remote:
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-#  -
-#    user:         '[usrname]'
-#    host:         '[remote.hostname]'
-#    path:         '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-#  port:         '8081'
-
-#sql database info, postgresql and sqlite
-db:
-  postgresql:
-    port:       '5432' # '5432'
-   #host:       # '[if not localhost, provide host tcp/ip address or domain name]''
-   #user:       # '[(if different from user) provide username]'
-   #password:   # '[password if required]'
-#  sqlite:
-#    path:       ~ # './sisu_sqlite.db'
-#    port:       "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: language
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-permission_set:
-  zap:               true
-  css_modify:        true
-  remote_base_site:  true
-
-program_set:
-  rmagick:           true
-#  wc:           true
-#  editor:       true
-#  postgresql:   true
-#  sqlite:       true
-#  tidy:         true
-#  rexml:        true
-#  pdflatex:     true
-
-#program_select:
-#  editor:              'vim'
-#  pdf_viewer:          'evince'
-#  web_browser:         'iceweasel'
-#  console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
-#  xml_viewer:          'xml-viewer'
-#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
-#  info_viewer:         'pinfo -f'
-#  man:                 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-#  sisu:
-#    flag:            true
-#    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
-
-#omit: minitoc
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_default.yml
index 09bb2d82..3cb49894 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_default.yml
@@ -31,13 +31,23 @@
 #  base_path:    ~
 #  port:         '8081'
 #  user:         ~
-#  file_links:   webserv
+#  file_links:   www.sisudoc.org
 
-show_output_on: 'filesystem_url'
+#show_output_on: 'filesystem_url'
 #texinfo display output
 #texinfo:
 #  stub:         'texinfo'
 
+#% output_dir_structure_by:
+#  language (language and filetype directories);
+#  filetype (filetype directories, language code added to filename includes language code);
+#  filetype_mono or monolingual (filetype drectories, no language codes in filenames)
+#  filename (directory output similar to original v1 v2, filename includes language code);
+#  filename_mono (directory output similar to original v1 v2, filename without language code);
+output_dir_structure_by: language # language filetype filetype_mono filename filename_mono
+#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
+#language_default: 'en'
+
 ##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
 #processing:
 #  path:         'sisu_processing'
@@ -50,20 +60,20 @@ 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
-#  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'
+#  act0:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose'
+#  act1:      '--manifest --text --html'
+#  act2:      '--manifest --text --html --epub --pdf'
+#  act3:      '--manifest --qrcode --text --html --epub --concordance --pdf'
+#  act4:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook'
+#  act5:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite'
+#  act6:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite'
+#  act7:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod'
+#  act8:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update'
+#  act9:      '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod'
 
 #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
-  papersize:    'a4,letter'
+  papersize:    'a4,letter' #'a4,letter,b5,a5,legal'
   #language:      'en'
   #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
   #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
@@ -99,13 +109,6 @@ db:
 #    path:       ~ # './sisu_sqlite.db'
 #    port:       "**"
 
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filename
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
 permission_set:
   zap:               true
   css_modify:        true
@@ -122,10 +125,10 @@ program_set:
 #  pdflatex:     true
 
 #program_select:
-#  editor:              'vim'
+#  editor:              'vim' #'gvim -c :R'
 #  pdf_viewer:          'evince'
 #  web_browser:         'iceweasel'
-#  console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+#  console_web_browser: 'w3m' #'links2' #'elinks' #'w3m' #'lynx' #'links'
 #  odf_viewer:          'lowriter' #'oowriter' #'abiword'
 #  xml_viewer:          'xml-viewer'
 #  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
@@ -134,13 +137,12 @@ program_set:
 
 #search:
 #  sisu:
-#    flag:            true
-#    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
+#    flag:              true
+#    action:            http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+#    action:            http://search.sisudoc.org
+#    db:                manual
+#    title:             'SiSU search form (sample)'
 
-#promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#promo:                 sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
 
 #omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
index e492f789..53d85905 120000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml
\ No newline at end of file
+../rc/sisurc_default.yml
\ No newline at end of file
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
index e492f789..53d85905 120000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml
\ No newline at end of file
+../rc/sisurc_default.yml
\ No newline at end of file