Merge branch 'upstream' into debian/sid

1 files changed, 16 insertions, 11 deletions

diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v3/sisurc.yml
index dea3f653..f250b71d 100644
--- a/conf/sisu/v3/sisurc.yml
+++ b/conf/sisu/v3/sisurc.yml
@@ -94,16 +94,21 @@ default:
 #  ocn:               true
 #plaintext:
 #  ocn:               true
-#% output_strucure: by_language: and/or by_filetype: (else default "bundled"
-#output) possible values ~, true, false, (default where not set, false),
-#output_structure: by_language: (language code directories with filetype
-#subdirectories); by_filetype: (filetype directories output_structure) the
-#previous default was by_language: false by_filetype: false. Note that where
-#by_language is true, by_filetype is (forced) true. If e.g. using po4a
-#by_langauge should be used and set true:
-output_structure:
-  by_language:        true
-  by_filetype:        true
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: language
+
+##% output_strucure: by_language: and/or by_filetype: (else default "bundled"
+##output) possible values ~, true, false, (default where not set, false),
+##output_structure: by_language: (language code directories with filetype
+##subdirectories); by_filetype: (filetype directories output_structure) the
+##previous default was by_language: false by_filetype: false. Note that where
+##by_language is true, by_filetype is (forced) true. If e.g. using po4a
+##by_langauge should be used and set true:
+#output_structure:
+#  by_language:        true
+#  by_filetype:        true
+
 #% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c
 #:R -c :S'.  will only ignore if value set to false, absence or nil will not
 #remove program as should operate without rc file ie in case of ~ will ignore
@@ -130,7 +135,7 @@ program_set:
 #  web_browser:  'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
 #  console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
 #  epub_viewer:  'ebook-viewer' #'calibre' #'okular' #'fbreader'
-#  odf_viewer:   'oowriter' #'abiword'
+#  odf_viewer:   'libreoffice' #'oowriter' #'abiword'
 #  xml_viewer:   'xml-viewer'
 #  man:          'nroff -man' #'groff -man -Tascii' # 'nroff -man'
 #promo:              sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby