c&d: project dir structure, libs moved under new branch names

* libs & version files under new branch names: current & develop
* previously under branch version numbers (v5|v6)
* version .yml files moved
* associated adjustments made as required, notably to:
  bin/sisu se* qi* (file headers); breakage potential, testing
  required
* [on dir names, want release to (alphabetically) precede
  next/development, considered (cur|dev)
  (current|(dev|development|progress|next)) (stable|unstable),
  alpha sorting fail (release|(next|develop))]

314 files changed, 639 insertions, 415 deletions

diff --git a/bin/sisu b/bin/sisu
index 317d036d..d96f8a7c 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -18,6 +18,12 @@ class Orient
     def default
      stable
     end
+    def current
+     'current'
+    end
+    def next
+     'next'
+    end
     self
   end
   def sisu_called_from_directory
@@ -57,6 +63,12 @@ class Orient
     def default
       'v' + version.default
     end
+    def current
+      'current'
+    end
+    def next
+      'develop'
+    end
     def stable_bin_file_regex
       %r{\bsisu#{version.stable}$}
     end
@@ -70,10 +82,10 @@ class Orient
       %r{\/sisu-#{version.unstable}\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
     end
     def stable_modifier_regex
-      %r{"(?:--v#{version.stable}|--current|--stable)"}
+      %r{"(?:--v#{version.stable}|--current|--stable|--release)"}
     end
     def unstable_modifier_regex
-      %r{"(?:--v#{version.unstable}|--current|--stable)"}
+      %r{"(?:--v#{version.unstable}|--next|--unstable|--dev)"}
     end
     self
   end
@@ -88,28 +100,28 @@ class Orient
     end
   end
   def sisu_version_info_path
-    "#{sisu_path_base_system_data}/#{select_version_check}/v/version.yml"
+    "#{sisu_path_base_system_data}/version/#{select_version_check}.yml"
   end
   def select_version_check
     if sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
     or sisu_run_from == :system_install
       case processing.called_as
-      when processing.stable_bin_file_regex      then processing.stable
-      when processing.unstable_bin_file_regex    then processing.unstable
+      when processing.stable_bin_file_regex      then processing.current
+      when processing.unstable_bin_file_regex    then processing.next
       else
         case processing.argv_str
-        when processing.stable_modifier_regex    then processing.stable
-        when processing.unstable_modifier_regex  then processing.unstable
-        else                                          processing.default
+        when processing.stable_modifier_regex    then processing.current
+        when processing.unstable_modifier_regex  then processing.next
+        else                                          processing.current
         end
       end
     elsif sisu_run_from == :gem_install
       case processing.file_full_path
-      when processing.stable_gem_regex           then processing.stable
-      when processing.unstable_gem_regex         then processing.unstable
-      else                                            processing.default
+      when processing.stable_gem_regex           then processing.current
+      when processing.unstable_gem_regex         then processing.next
+      else                                            processing.current
       end
-    else                                              processing.default
+    else                                              processing.current
     end
   end
   def paths_set
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 49795a6a..55fc1e4b 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -56,6 +56,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
 
   * code headers reformatted for viewing as org-mode files
 
+  * c&d: project dir structure, libs moved under new branch names
+    * libs & version files under new branch names: current & develop
+    * previously under branch version numbers (v5|v6)
+    * version .yml files moved
+    * associated adjustments made as required, notably to:
+      bin/sisu se* qi* (file headers)
+    * [on dir names, want release to precede next/development,
+      considered (cur|dev) (current|(dev|development|progress|next))
+      (stable|unstable), alpha sorting fail (release|(next|develop))]
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 5.7.2 intended for Jessie (packaged for Debian as 5.7.1-2)
   was not accepted)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 1cd25574..e0f568d2 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -46,6 +46,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
 
   * code headers reformatted for viewing as org-mode files
 
+  * c&d: project dir structure, libs moved under new branch names
+    * libs & version files under new branch names: current & develop
+    * previously under branch version numbers (v5|v6)
+    * version .yml files moved
+    * associated adjustments made as required, notably to:
+      bin/sisu se* qi* (file headers)
+    * [on dir names, want release to precede next/development,
+      considered (cur|dev) (current|(dev|development|progress|next))
+      (stable|unstable), alpha sorting fail (release|(next|develop))]
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
   5.7.1-2) was not accepted)
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/version/current.yml
index 68ce89cd..68ce89cd 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/version/current.yml
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/version/develop.yml
index 57e32956..57e32956 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/version/develop.yml
diff --git a/lib/sisu/v6/air.rb b/lib/sisu/current/air.rb
index b50bbe5a..1876a0ec 100644
--- a/lib/sisu/v6/air.rb
+++ b/lib/sisu/current/air.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/air.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/air.rb;hb=HEAD>
 
 =end
 module SiSU_Air
diff --git a/lib/sisu/v6/ao.rb b/lib/sisu/current/ao.rb
index 0cfc9af8..864d5836 100644
--- a/lib/sisu/v6/ao.rb
+++ b/lib/sisu/current/ao.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao.rb;hb=HEAD>
 
 =end
 module SiSU_AO
diff --git a/lib/sisu/v5/ao_character_check.rb b/lib/sisu/current/ao_character_check.rb
index cf477591..faee5924 100644
--- a/lib/sisu/v5/ao_character_check.rb
+++ b/lib/sisu/current/ao_character_check.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_character_check.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_character_check.rb;hb=HEAD>
 
 =end
 module SiSU_AO_CharacterCheck
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/current/ao_composite.rb
index a90937ae..611dd70c 100644
--- a/lib/sisu/v5/ao_composite.rb
+++ b/lib/sisu/current/ao_composite.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_composite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_composite.rb;hb=HEAD>
 
 =end
 module SiSU_Assemble
diff --git a/lib/sisu/v5/ao_doc_objects.rb b/lib/sisu/current/ao_doc_objects.rb
index f55f3003..ac528b90 100644
--- a/lib/sisu/v5/ao_doc_objects.rb
+++ b/lib/sisu/current/ao_doc_objects.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_objects.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_objects.rb;hb=HEAD>
 
 =end
 module SiSU_AO_DocumentStructure
diff --git a/lib/sisu/v6/ao_doc_str.rb b/lib/sisu/current/ao_doc_str.rb
index 5ba38e76..40e1e0d0 100644
--- a/lib/sisu/v6/ao_doc_str.rb
+++ b/lib/sisu/current/ao_doc_str.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_str.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_str.rb;hb=HEAD>
 
 =end
 module SiSU_AO_DocumentStructureExtract
diff --git a/lib/sisu/v6/ao_endnotes.rb b/lib/sisu/current/ao_endnotes.rb
index 0933f1bc..7c9ae067 100644
--- a/lib/sisu/v6/ao_endnotes.rb
+++ b/lib/sisu/current/ao_endnotes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_endnotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_endnotes.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Endnotes
diff --git a/lib/sisu/v6/ao_expand_insertions.rb b/lib/sisu/current/ao_expand_insertions.rb
index deb7eac9..3a749df3 100644
--- a/lib/sisu/v6/ao_expand_insertions.rb
+++ b/lib/sisu/current/ao_expand_insertions.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_expand_insertions.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_expand_insertions.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Insertions
diff --git a/lib/sisu/v6/ao_hash_digest.rb b/lib/sisu/current/ao_hash_digest.rb
index 8169a279..bc86a485 100644
--- a/lib/sisu/v6/ao_hash_digest.rb
+++ b/lib/sisu/current/ao_hash_digest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_hash_digest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_hash_digest.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Hash
diff --git a/lib/sisu/v6/ao_idx.rb b/lib/sisu/current/ao_idx.rb
index 41ea655a..0c9c8a43 100644
--- a/lib/sisu/v6/ao_idx.rb
+++ b/lib/sisu/current/ao_idx.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_idx.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_idx.rb;hb=HEAD>
 
 =end
 module SiSU_AO_BookIndex
diff --git a/lib/sisu/v6/ao_images.rb b/lib/sisu/current/ao_images.rb
index 0deb8897..86dcb2ca 100644
--- a/lib/sisu/v6/ao_images.rb
+++ b/lib/sisu/current/ao_images.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_images.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_images.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Images
diff --git a/lib/sisu/v6/ao_metadata.rb b/lib/sisu/current/ao_metadata.rb
index 5cbb3d8a..46e80a7d 100644
--- a/lib/sisu/v6/ao_metadata.rb
+++ b/lib/sisu/current/ao_metadata.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_metadata.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_metadata.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Metadata
diff --git a/lib/sisu/v5/ao_misc_arrange.rb b/lib/sisu/current/ao_misc_arrange.rb
index 7140a502..e010eaca 100644
--- a/lib/sisu/v5/ao_misc_arrange.rb
+++ b/lib/sisu/current/ao_misc_arrange.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_misc_arrange.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_misc_arrange.rb;hb=HEAD>
 
 =end
 module SiSU_AO_MiscArrangeText
diff --git a/lib/sisu/v5/ao_numbering.rb b/lib/sisu/current/ao_numbering.rb
index 843ee85c..9df1479a 100644
--- a/lib/sisu/v5/ao_numbering.rb
+++ b/lib/sisu/current/ao_numbering.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_numbering.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_numbering.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Numbering
diff --git a/lib/sisu/v5/ao_syntax.rb b/lib/sisu/current/ao_syntax.rb
index 56c792cc..cfcc9045 100644
--- a/lib/sisu/v5/ao_syntax.rb
+++ b/lib/sisu/current/ao_syntax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_syntax.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_syntax.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Syntax
diff --git a/lib/sisu/v5/cgi.rb b/lib/sisu/current/cgi.rb
index 6489ed12..99f2e987 100644
--- a/lib/sisu/v5/cgi.rb
+++ b/lib/sisu/current/cgi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI                                        #% database building documents
diff --git a/lib/sisu/v6/cgi_pgsql.rb b/lib/sisu/current/cgi_pgsql.rb
index 1fc7655f..9a4c555b 100644
--- a/lib/sisu/v6/cgi_pgsql.rb
+++ b/lib/sisu/current/cgi_pgsql.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_pgsql.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_pgsql.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI_PgSQL                                  #% database building documents
diff --git a/lib/sisu/v5/cgi_sql_common.rb b/lib/sisu/current/cgi_sql_common.rb
index 4f2c428d..957bcf94 100644
--- a/lib/sisu/v5/cgi_sql_common.rb
+++ b/lib/sisu/current/cgi_sql_common.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_common.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_sql_common.rb;hb=HEAD>
 
 =end
 module SiSU_CGI_SQL
diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/current/cgi_sqlite.rb
index 4c8ba325..91444237 100644
--- a/lib/sisu/v6/cgi_sqlite.rb
+++ b/lib/sisu/current/cgi_sqlite.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_sql_sqlite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_sql_sqlite.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI_SQLite                                 #% database building documents
diff --git a/lib/sisu/v6/conf.rb b/lib/sisu/current/conf.rb
index 5b980bb2..2bc71ce7 100644
--- a/lib/sisu/v6/conf.rb
+++ b/lib/sisu/current/conf.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/conf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/conf.rb;hb=HEAD>
 
 =end
 module SiSU_Initialize
diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/current/constants.rb
index fec2f4a1..73534567 100644
--- a/lib/sisu/v5/constants.rb
+++ b/lib/sisu/current/constants.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/constants.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/constants.rb;hb=HEAD>
 
 =end
 #Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
diff --git a/lib/sisu/v5/css.rb b/lib/sisu/current/css.rb
index aaf1dc58..8e57abba 100644
--- a/lib/sisu/v5/css.rb
+++ b/lib/sisu/current/css.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/css.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/css.rb;hb=HEAD>
 
 =end
 module SiSU_Style
diff --git a/lib/sisu/v5/db_columns.rb b/lib/sisu/current/db_columns.rb
index b2204f93..adeced8f 100644
--- a/lib/sisu/v5/db_columns.rb
+++ b/lib/sisu/current/db_columns.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_columns.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_columns.rb;hb=HEAD>
 
 =end
 module SiSU_DbColumns
diff --git a/lib/sisu/v6/db_create.rb b/lib/sisu/current/db_create.rb
index 561c297f..df8983d2 100644
--- a/lib/sisu/v6/db_create.rb
+++ b/lib/sisu/current/db_create.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_create.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_create.rb;hb=HEAD>
 
 =end
 module SiSU_DbCreate
diff --git a/lib/sisu/v5/db_dbi.rb b/lib/sisu/current/db_dbi.rb
index b585aa8e..9824a6c5 100644
--- a/lib/sisu/v5/db_dbi.rb
+++ b/lib/sisu/current/db_dbi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_dbi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_dbi.rb;hb=HEAD>
 
 =end
 module  SiSU_DbDBI
diff --git a/lib/sisu/v5/db_drop.rb b/lib/sisu/current/db_drop.rb
index d96ab452..acdae9da 100644
--- a/lib/sisu/v5/db_drop.rb
+++ b/lib/sisu/current/db_drop.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_drop.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_drop.rb;hb=HEAD>
 
 =end
 module SiSU_DbDrop
diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/current/db_import.rb
index 7a365ff8..43da9c44 100644
--- a/lib/sisu/v5/db_import.rb
+++ b/lib/sisu/current/db_import.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_import.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_import.rb;hb=HEAD>
 
 =end
 module SiSU_DbImport
diff --git a/lib/sisu/v5/db_indexes.rb b/lib/sisu/current/db_indexes.rb
index a1d41e0b..25373bf5 100644
--- a/lib/sisu/v5/db_indexes.rb
+++ b/lib/sisu/current/db_indexes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_indexes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_indexes.rb;hb=HEAD>
 
 =end
 module SiSU_DbIndex
diff --git a/lib/sisu/v5/db_load_tuple.rb b/lib/sisu/current/db_load_tuple.rb
index 49b9a3ee..ebf7a45e 100644
--- a/lib/sisu/v5/db_load_tuple.rb
+++ b/lib/sisu/current/db_load_tuple.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_load_tuple.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_load_tuple.rb;hb=HEAD>
 
 =end
 module SiSU_DbTuple
diff --git a/lib/sisu/v6/db_remove.rb b/lib/sisu/current/db_remove.rb
index d2bffc61..c8287aa9 100644
--- a/lib/sisu/v6/db_remove.rb
+++ b/lib/sisu/current/db_remove.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_remove.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_remove.rb;hb=HEAD>
 
 =end
 module SiSU_DbRemove
diff --git a/lib/sisu/v6/db_select.rb b/lib/sisu/current/db_select.rb
index 82f1a89a..284bd135 100644
--- a/lib/sisu/v6/db_select.rb
+++ b/lib/sisu/current/db_select.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_select.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_select.rb;hb=HEAD>
 
 =end
 module SiSU_DbAction
diff --git a/lib/sisu/v5/db_sqltxt.rb b/lib/sisu/current/db_sqltxt.rb
index fac0263f..a307dc1d 100644
--- a/lib/sisu/v5/db_sqltxt.rb
+++ b/lib/sisu/current/db_sqltxt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_sqltxt.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_sqltxt.rb;hb=HEAD>
 
 =end
 module SiSU_DbText
diff --git a/lib/sisu/v5/db_tests.rb b/lib/sisu/current/db_tests.rb
index 092bc169..137850ab 100644
--- a/lib/sisu/v5/db_tests.rb
+++ b/lib/sisu/current/db_tests.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_tests.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_tests.rb;hb=HEAD>
 
 =end
 module SiSU_DbTests
diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/current/dbi.rb
index 392f8472..93e4769a 100644
--- a/lib/sisu/v5/dbi.rb
+++ b/lib/sisu/current/dbi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dbi.rb;hb=HEAD>
 
 =end
 module  SiSU_DBI                                                                 #% database building
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/current/dbi_discrete.rb
index 092ccccb..f62204c6 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/current/dbi_discrete.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi_discrete.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dbi_discrete.rb;hb=HEAD>
 
 =end
 module  SiSU_DBI_Discrete                               #% database building
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/current/digests.rb
index 0fb42b3e..8a3a2d08 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/current/digests.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/digests.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/digests.rb;hb=HEAD>
 
 =end
 module SiSU_DigestView
diff --git a/lib/sisu/v6/dp.rb b/lib/sisu/current/dp.rb
index e0513ec2..c57112de 100644
--- a/lib/sisu/v6/dp.rb
+++ b/lib/sisu/current/dp.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp.rb;hb=HEAD>
 
 =end
 module SiSU_Param
diff --git a/lib/sisu/v6/dp_identify_markup.rb b/lib/sisu/current/dp_identify_markup.rb
index d0119e0b..acb6070a 100644
--- a/lib/sisu/v6/dp_identify_markup.rb
+++ b/lib/sisu/current/dp_identify_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_identify_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp_identify_markup.rb;hb=HEAD>
 
 =end
 module SiSU_MarkupType
diff --git a/lib/sisu/v5/dp_make.rb b/lib/sisu/current/dp_make.rb
index bdb02f88..ad2cb32e 100644
--- a/lib/sisu/v5/dp_make.rb
+++ b/lib/sisu/current/dp_make.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp_make.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp_make.rb;hb=HEAD>
 
 =end
 
diff --git a/lib/sisu/v6/embedded.rb b/lib/sisu/current/embedded.rb
index 62c4eca9..14f2bd4a 100644
--- a/lib/sisu/v6/embedded.rb
+++ b/lib/sisu/current/embedded.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/embedded.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/embedded.rb;hb=HEAD>
 
 =end
 module SiSU_Embedded
diff --git a/lib/sisu/v5/errors.rb b/lib/sisu/current/errors.rb
index 90f135dd..73b2feaa 100644
--- a/lib/sisu/v5/errors.rb
+++ b/lib/sisu/current/errors.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/errors.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/errors.rb;hb=HEAD>
 
 =end
 module SiSU_Errors
diff --git a/lib/sisu/v5/generic_parts.rb b/lib/sisu/current/generic_parts.rb
index cef047d3..ba10b38e 100644
--- a/lib/sisu/v5/generic_parts.rb
+++ b/lib/sisu/current/generic_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_Generic
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/current/git.rb
index 72481782..f9723186 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/current/git.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/git.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/git.rb;hb=HEAD>
 
 =end
 module SiSU_Git
diff --git a/lib/sisu/v6/html.rb b/lib/sisu/current/html.rb
index 82ea5323..582773e5 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/current/html.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html.rb;hb=HEAD>
 
 =end
 module SiSU_HTML
diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/current/html_concordance.rb
index 17ece8da..3b3275e3 100644
--- a/lib/sisu/v6/html_concordance.rb
+++ b/lib/sisu/current/html_concordance.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_concordance.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_concordance.rb;hb=HEAD>
 
 =end
 module SiSU_Concordance
diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/current/html_format.rb
index 1d5ee89d..d5910e9a 100644
--- a/lib/sisu/v5/html_format.rb
+++ b/lib/sisu/current/html_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_format.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Format
diff --git a/lib/sisu/v6/html_harvest.rb b/lib/sisu/current/html_harvest.rb
index 552bef41..0ac5c95f 100644
--- a/lib/sisu/v6/html_harvest.rb
+++ b/lib/sisu/current/html_harvest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest.rb;hb=HEAD>
 
 =end
 module SiSU_Harvest
diff --git a/lib/sisu/v5/html_harvest_author_format.rb b/lib/sisu/current/html_harvest_author_format.rb
index 2118f047..db71b013 100644
--- a/lib/sisu/v5/html_harvest_author_format.rb
+++ b/lib/sisu/current/html_harvest_author_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_author_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_author_format.rb;hb=HEAD>
 
 =end
 module SiSU_FormatAuthor
diff --git a/lib/sisu/v6/html_harvest_authors.rb b/lib/sisu/current/html_harvest_authors.rb
index 3345acc2..cbbd153c 100644
--- a/lib/sisu/v6/html_harvest_authors.rb
+++ b/lib/sisu/current/html_harvest_authors.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_authors.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_authors.rb;hb=HEAD>
 
 =end
 module SiSU_HarvestAuthors
diff --git a/lib/sisu/v5/html_harvest_topics.rb b/lib/sisu/current/html_harvest_topics.rb
index 032fe430..58f92bcb 100644
--- a/lib/sisu/v5/html_harvest_topics.rb
+++ b/lib/sisu/current/html_harvest_topics.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_topics.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_topics.rb;hb=HEAD>
 
 =end
 module SiSU_HarvestTopics
diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/current/html_lite_shared.rb
index ac747a7a..aac53727 100644
--- a/lib/sisu/v6/html_lite_shared.rb
+++ b/lib/sisu/current/html_lite_shared.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_lite_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_lite_shared.rb;hb=HEAD>
 
 =end
 module SiSU_FormatShared
diff --git a/lib/sisu/v6/html_manifest.rb b/lib/sisu/current/html_manifest.rb
index 747fabda..44094383 100644
--- a/lib/sisu/v6/html_manifest.rb
+++ b/lib/sisu/current/html_manifest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_manifest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_manifest.rb;hb=HEAD>
 
 =end
 module SiSU_Manifest
diff --git a/lib/sisu/v5/html_minitoc.rb b/lib/sisu/current/html_minitoc.rb
index 2838c877..902a68d4 100644
--- a/lib/sisu/v5/html_minitoc.rb
+++ b/lib/sisu/current/html_minitoc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_minitoc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_minitoc.rb;hb=HEAD>
 
 =end
   module SiSU_HTML_MiniToc
diff --git a/lib/sisu/v6/html_parts.rb b/lib/sisu/current/html_parts.rb
index 81ff8942..db7cdb76 100644
--- a/lib/sisu/v6/html_parts.rb
+++ b/lib/sisu/current/html_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_HTML
diff --git a/lib/sisu/v6/html_promo.rb b/lib/sisu/current/html_promo.rb
index 997098ed..28b4e356 100644
--- a/lib/sisu/v6/html_promo.rb
+++ b/lib/sisu/current/html_promo.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_promo.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_promo.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Promo
diff --git a/lib/sisu/v6/html_scroll.rb b/lib/sisu/current/html_scroll.rb
index b2aba096..4751a01b 100644
--- a/lib/sisu/v6/html_scroll.rb
+++ b/lib/sisu/current/html_scroll.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_scroll.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_scroll.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Scroll
diff --git a/lib/sisu/v6/html_segments.rb b/lib/sisu/current/html_segments.rb
index f9130c0a..3288b8f4 100644
--- a/lib/sisu/v6/html_segments.rb
+++ b/lib/sisu/current/html_segments.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_segments.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_segments.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Seg
diff --git a/lib/sisu/v6/html_shared.rb b/lib/sisu/current/html_shared.rb
index c9f14027..883467b1 100644
--- a/lib/sisu/v6/html_shared.rb
+++ b/lib/sisu/current/html_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_shared.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Shared
diff --git a/lib/sisu/v5/html_table.rb b/lib/sisu/current/html_table.rb
index 0ddee4e9..ddcb513d 100644
--- a/lib/sisu/v5/html_table.rb
+++ b/lib/sisu/current/html_table.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_table.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_table.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Table
diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/current/html_tune.rb
index 9e661046..5a4575cf 100644
--- a/lib/sisu/v6/html_tune.rb
+++ b/lib/sisu/current/html_tune.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_tune.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_tune.rb;hb=HEAD>
 
 =end
 require_relative 'dp'                                   # dp.rb
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/current/hub.rb
index c1faeb40..6b0832eb 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/current/hub.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub.rb;hb=HEAD>
 
 =end
 module SiSU
diff --git a/lib/sisu/v6/hub_actions.rb b/lib/sisu/current/hub_actions.rb
index 01c7405a..8878855d 100644
--- a/lib/sisu/v6/hub_actions.rb
+++ b/lib/sisu/current/hub_actions.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_actions.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_actions.rb;hb=HEAD>
 
 =end
 module SiSU_Hub_Actions
diff --git a/lib/sisu/v5/hub_loop_markup_files.rb b/lib/sisu/current/hub_loop_markup_files.rb
index 0d8ed6db..626dc8e1 100644
--- a/lib/sisu/v5/hub_loop_markup_files.rb
+++ b/lib/sisu/current/hub_loop_markup_files.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_loop_markup_files.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_loop_markup_files.rb;hb=HEAD>
 
 =end
 module SiSU_Hub_Loops
diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/current/hub_options.rb
index e73dc3f1..40775a3c 100644
--- a/lib/sisu/v5/hub_options.rb
+++ b/lib/sisu/current/hub_options.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_options.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_options.rb;hb=HEAD>
 
 =end
 module SiSU_Commandline
diff --git a/lib/sisu/v5/i18n.rb b/lib/sisu/current/i18n.rb
index e625f24d..0413bb87 100644
--- a/lib/sisu/v5/i18n.rb
+++ b/lib/sisu/current/i18n.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/i18n.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/i18n.rb;hb=HEAD>
 
 =end
 module SiSU_i18n
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/current/manpage.rb
index 8234e8c4..fb5a1f3c 100644
--- a/lib/sisu/v6/manpage.rb
+++ b/lib/sisu/current/manpage.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/manpage.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/manpage.rb;hb=HEAD>
 
 =end
 module SiSU_Manpage
diff --git a/lib/sisu/v5/manpage_format.rb b/lib/sisu/current/manpage_format.rb
index 3f913988..88291535 100644
--- a/lib/sisu/v5/manpage_format.rb
+++ b/lib/sisu/current/manpage_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/manpage_format.rb;hb=HEAD>
 
 =end
 module SiSU_ManpageFormat
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/current/po4a.rb
index aedc6683..7d602f7c 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/current/po4a.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/po4a.rb;hb=HEAD>
 
 =end
 module SiSU_Po4a
diff --git a/lib/sisu/v6/po4a_set.rb b/lib/sisu/current/po4a_set.rb
index 759208b2..a08eea35 100644
--- a/lib/sisu/v6/po4a_set.rb
+++ b/lib/sisu/current/po4a_set.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/po4a_set.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/po4a_set.rb;hb=HEAD>
 
 =end
 module SiSU_Po4aUtils
diff --git a/lib/sisu/v5/prog_text_translation.rb b/lib/sisu/current/prog_text_translation.rb
index fe79995f..1b96e651 100644
--- a/lib/sisu/v5/prog_text_translation.rb
+++ b/lib/sisu/current/prog_text_translation.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/prog_text_translation.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/prog_text_translation.rb;hb=HEAD>
 
 =end
 module SiSU_Translate
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/current/qrcode.rb
index fd047ce6..8d933b71 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/current/qrcode.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/qrcode.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/qrcode.rb;hb=HEAD>
 
 =end
 module SiSU_QRcode
diff --git a/lib/sisu/v6/relaxng.rb b/lib/sisu/current/relaxng.rb
index 570c6c82..c0083834 100644
--- a/lib/sisu/v6/relaxng.rb
+++ b/lib/sisu/current/relaxng.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/relaxng.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/relaxng.rb;hb=HEAD>
 
 =end
 module SiSU_Relaxng
diff --git a/lib/sisu/v6/remote.rb b/lib/sisu/current/remote.rb
index 9bc605b6..7741a6a3 100644
--- a/lib/sisu/v6/remote.rb
+++ b/lib/sisu/current/remote.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/remote.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/remote.rb;hb=HEAD>
 
 =end
 module SiSU_Remote
diff --git a/lib/sisu/v6/rexml.rb b/lib/sisu/current/rexml.rb
index 1580626e..8a0e62b5 100644
--- a/lib/sisu/v6/rexml.rb
+++ b/lib/sisu/current/rexml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/rexml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/rexml.rb;hb=HEAD>
 
 =end
 module SiSU_Rexml
diff --git a/lib/sisu/v5/se.rb b/lib/sisu/current/se.rb
index fbba39b0..94ada012 100644
--- a/lib/sisu/v5/se.rb
+++ b/lib/sisu/current/se.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se.rb;hb=HEAD>
 
 =end
 @@cX=nil
diff --git a/lib/sisu/v5/se_cleanoutput.rb b/lib/sisu/current/se_cleanoutput.rb
index 57cf5b86..8fee88cf 100644
--- a/lib/sisu/v5/se_cleanoutput.rb
+++ b/lib/sisu/current/se_cleanoutput.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_cleanoutput.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_cleanoutput.rb;hb=HEAD>
 
 =end
 module SiSU_Clean_Output
diff --git a/lib/sisu/v5/se_clear.rb b/lib/sisu/current/se_clear.rb
index a36ee849..f39ea9d6 100644
--- a/lib/sisu/v5/se_clear.rb
+++ b/lib/sisu/current/se_clear.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_clear.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_clear.rb;hb=HEAD>
 
 =end
 module SiSU_Clear
diff --git a/lib/sisu/v6/se_createsite.rb b/lib/sisu/current/se_createsite.rb
index e87b682c..591c0d3d 100644
--- a/lib/sisu/v6/se_createsite.rb
+++ b/lib/sisu/current/se_createsite.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_createsite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_createsite.rb;hb=HEAD>
 
 =end
 module SiSU_Create_Site
diff --git a/lib/sisu/v5/se_css.rb b/lib/sisu/current/se_css.rb
index a184aa8b..13a099d5 100644
--- a/lib/sisu/v5/se_css.rb
+++ b/lib/sisu/current/se_css.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_css.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_css.rb;hb=HEAD>
 
 =end
 module SiSU_CSS
diff --git a/lib/sisu/v5/se_date.rb b/lib/sisu/current/se_date.rb
index a9152390..0cdf8841 100644
--- a/lib/sisu/v5/se_date.rb
+++ b/lib/sisu/current/se_date.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_date.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_date.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Date
diff --git a/lib/sisu/v6/se_db.rb b/lib/sisu/current/se_db.rb
index 2eceb5ff..2207fb3d 100644
--- a/lib/sisu/v6/se_db.rb
+++ b/lib/sisu/current/se_db.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_db.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_db.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Db
diff --git a/lib/sisu/v6/se_envcall.rb b/lib/sisu/current/se_envcall.rb
index 4e00a3f7..cda71630 100644
--- a/lib/sisu/v6/se_envcall.rb
+++ b/lib/sisu/current/se_envcall.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_envcall.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_envcall.rb;hb=HEAD>
 
 =end
 module SiSU_Env_Call
diff --git a/lib/sisu/v6/se_file_op.rb b/lib/sisu/current/se_file_op.rb
index 7e2a35a0..b64aef94 100644
--- a/lib/sisu/v6/se_file_op.rb
+++ b/lib/sisu/current/se_file_op.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_file_op.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_file_op.rb;hb=HEAD>
 
 =end
 module SiSU_Info_File
diff --git a/lib/sisu/v5/se_filemap.rb b/lib/sisu/current/se_filemap.rb
index 41f9b1b2..82580025 100644
--- a/lib/sisu/v5/se_filemap.rb
+++ b/lib/sisu/current/se_filemap.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_filemap.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_filemap.rb;hb=HEAD>
 
 =end
 module SiSU_File_Map
diff --git a/lib/sisu/v5/se_get_init.rb b/lib/sisu/current/se_get_init.rb
index 121c89e2..a6e30edc 100644
--- a/lib/sisu/v5/se_get_init.rb
+++ b/lib/sisu/current/se_get_init.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_get_init.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_get_init.rb;hb=HEAD>
 
 =end
 module SiSU_Get_Init
diff --git a/lib/sisu/v5/se_hub_particulars.rb b/lib/sisu/current/se_hub_particulars.rb
index d4892fe8..f1c7f816 100644
--- a/lib/sisu/v5/se_hub_particulars.rb
+++ b/lib/sisu/current/se_hub_particulars.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_hub_particulars.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_hub_particulars.rb;hb=HEAD>
 
 =end
 module SiSU_Particulars
diff --git a/lib/sisu/v5/se_info_env.rb b/lib/sisu/current/se_info_env.rb
index 5f6498e0..42288f7e 100644
--- a/lib/sisu/v5/se_info_env.rb
+++ b/lib/sisu/current/se_info_env.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_env.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_env.rb;hb=HEAD>
 
 =end
 @@current_document=Dir.pwd #nil #''
diff --git a/lib/sisu/v5/se_info_port.rb b/lib/sisu/current/se_info_port.rb
index 6ea1ffe1..17275b0c 100644
--- a/lib/sisu/v5/se_info_port.rb
+++ b/lib/sisu/current/se_info_port.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_port.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_port.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Port
diff --git a/lib/sisu/v5/se_info_system.rb b/lib/sisu/current/se_info_system.rb
index 327389a1..62fe4d6d 100644
--- a/lib/sisu/v5/se_info_system.rb
+++ b/lib/sisu/current/se_info_system.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_system.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_system.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Sys_Gen
diff --git a/lib/sisu/v5/se_load.rb b/lib/sisu/current/se_load.rb
index 1c9cf0e7..a0086049 100644
--- a/lib/sisu/v5/se_load.rb
+++ b/lib/sisu/current/se_load.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_load.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_load.rb;hb=HEAD>
 
 =end
 module SiSU_Load
diff --git a/lib/sisu/v5/se_processing.rb b/lib/sisu/current/se_processing.rb
index a72c83b6..9a5f9ab2 100644
--- a/lib/sisu/v5/se_processing.rb
+++ b/lib/sisu/current/se_processing.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_processing.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_processing.rb;hb=HEAD>
 
 =end
 module SiSU_Processing_Settings
diff --git a/lib/sisu/v6/se_programs.rb b/lib/sisu/current/se_programs.rb
index cba5e864..e85b9be7 100644
--- a/lib/sisu/v6/se_programs.rb
+++ b/lib/sisu/current/se_programs.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_programs.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_programs.rb;hb=HEAD>
 
 =end
 module SiSU_Sys_Call
diff --git a/lib/sisu/v5/se_remotes.rb b/lib/sisu/current/se_remotes.rb
index d5a028de..77876637 100644
--- a/lib/sisu/v5/se_remotes.rb
+++ b/lib/sisu/current/se_remotes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_remotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_remotes.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Remote_Host
diff --git a/lib/sisu/v6/se_standardise_lang.rb b/lib/sisu/current/se_standardise_lang.rb
index 5d06b680..3293b8c4 100644
--- a/lib/sisu/v6/se_standardise_lang.rb
+++ b/lib/sisu/current/se_standardise_lang.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_standardise_lang.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_standardise_lang.rb;hb=HEAD>
 
 =end
 @@lang_info=nil
diff --git a/lib/sisu/v6/se_version.rb b/lib/sisu/current/se_version.rb
index 92c24717..59b2e4eb 100644
--- a/lib/sisu/v6/se_version.rb
+++ b/lib/sisu/current/se_version.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_version.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_version.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Version
diff --git a/lib/sisu/v5/shared_images.rb b/lib/sisu/current/shared_images.rb
index 33185d30..4357b0a0 100644
--- a/lib/sisu/v5/shared_images.rb
+++ b/lib/sisu/current/shared_images.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_images.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_images.rb;hb=HEAD>
 
 =end
 module SiSU_Images
diff --git a/lib/sisu/v5/shared_markup_alt.rb b/lib/sisu/current/shared_markup_alt.rb
index ddaa0b5c..50984a22 100644
--- a/lib/sisu/v5/shared_markup_alt.rb
+++ b/lib/sisu/current/shared_markup_alt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_markup_alt.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_markup_alt.rb;hb=HEAD>
 
 =end
 module SiSU_TextRepresentation
diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/current/shared_metadata.rb
index b6d0ad20..92d32dda 100644
--- a/lib/sisu/v6/shared_metadata.rb
+++ b/lib/sisu/current/shared_metadata.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_metadata.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_metadata.rb;hb=HEAD>
 
 =end
 module SiSU_Metadata
diff --git a/lib/sisu/v6/shared_sem.rb b/lib/sisu/current/shared_sem.rb
index d7103e8a..35547f3a 100644
--- a/lib/sisu/v6/shared_sem.rb
+++ b/lib/sisu/current/shared_sem.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_sem.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_sem.rb;hb=HEAD>
 
 =end
 module SiSU_Sem
diff --git a/lib/sisu/v5/sitemaps.rb b/lib/sisu/current/sitemaps.rb
index a1ad2501..61c62172 100644
--- a/lib/sisu/v5/sitemaps.rb
+++ b/lib/sisu/current/sitemaps.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sitemaps.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sitemaps.rb;hb=HEAD>
 
 =end
 module SiSU_Sitemaps
diff --git a/lib/sisu/v6/src_kdissert_share.rb b/lib/sisu/current/src_kdissert_share.rb
index 56ccace3..2220aea0 100644
--- a/lib/sisu/v6/src_kdissert_share.rb
+++ b/lib/sisu/current/src_kdissert_share.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_share_kdissert.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_share_kdissert.rb;hb=HEAD>
 
 =end
 module SiSU_KdiSource
diff --git a/lib/sisu/v6/src_share.rb b/lib/sisu/current/src_share.rb
index eefd66e6..7d3564f2 100644
--- a/lib/sisu/v6/src_share.rb
+++ b/lib/sisu/current/src_share.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_share.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_share.rb;hb=HEAD>
 
 =end
 module SiSU_Markup
diff --git a/lib/sisu/v5/src_shared.rb b/lib/sisu/current/src_shared.rb
index bcd7bd92..a6c41c22 100644
--- a/lib/sisu/v5/src_shared.rb
+++ b/lib/sisu/current/src_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_shared.rb;hb=HEAD>
 
 =end
 module SiSU_Source
diff --git a/lib/sisu/v6/src_sisupod_make.rb b/lib/sisu/current/src_sisupod_make.rb
index 80a11e4e..5eefdcff 100644
--- a/lib/sisu/v6/src_sisupod_make.rb
+++ b/lib/sisu/current/src_sisupod_make.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_sisupod_make.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_sisupod_make.rb;hb=HEAD>
 
 =end
 module SiSU_Doc
diff --git a/lib/sisu/v5/sst_convert_markup.rb b/lib/sisu/current/sst_convert_markup.rb
index 106c074e..447514f4 100644
--- a/lib/sisu/v5/sst_convert_markup.rb
+++ b/lib/sisu/current/sst_convert_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_convert_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_convert_markup.rb;hb=HEAD>
 
 =end
 module SiSU_Modify
diff --git a/lib/sisu/v6/sst_do_inline_footnotes.rb b/lib/sisu/current/sst_do_inline_footnotes.rb
index b6368f2e..3a623d55 100644
--- a/lib/sisu/v6/sst_do_inline_footnotes.rb
+++ b/lib/sisu/current/sst_do_inline_footnotes.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/set_do_inline_footnotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/set_do_inline_footnotes.rb;hb=HEAD>
 
 =end
 module SiSU_ConvertFootnotes
diff --git a/lib/sisu/v5/sst_from_xml.rb b/lib/sisu/current/sst_from_xml.rb
index 017cb5aa..3b253775 100644
--- a/lib/sisu/v5/sst_from_xml.rb
+++ b/lib/sisu/current/sst_from_xml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_from_xml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_from_xml.rb;hb=HEAD>
 
 =end
 module SiSU_sstFromXML
diff --git a/lib/sisu/v6/sst_identify_markup.rb b/lib/sisu/current/sst_identify_markup.rb
index 295760d4..5a41fb54 100644
--- a/lib/sisu/v6/sst_identify_markup.rb
+++ b/lib/sisu/current/sst_identify_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_identify_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_identify_markup.rb;hb=HEAD>
 
 =end
 module SiSU_Markup
diff --git a/lib/sisu/v6/sst_to_s_xml_sax.rb b/lib/sisu/current/sst_to_s_xml_sax.rb
index 07df23ec..f82f44b6 100644
--- a/lib/sisu/v6/sst_to_s_xml_sax.rb
+++ b/lib/sisu/current/sst_to_s_xml_sax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_to_s_xml_sax.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_to_s_xml_sax.rb;hb=HEAD>
 
 =end
 module SiSU_SimpleXML_ModelSax
diff --git a/lib/sisu/v6/termsheet.rb b/lib/sisu/current/termsheet.rb
index 4bbaa113..7089f1c5 100644
--- a/lib/sisu/v6/termsheet.rb
+++ b/lib/sisu/current/termsheet.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/termsheet.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/termsheet.rb;hb=HEAD>
 
 =end
 require_relative 'se'                                   # se.rb
diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/current/texinfo.rb
index 5d263e44..898312cc 100644
--- a/lib/sisu/v6/texinfo.rb
+++ b/lib/sisu/current/texinfo.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texinfo.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texinfo.rb;hb=HEAD>
 
 =end
 module SiSU_TexInfo
diff --git a/lib/sisu/v5/texinfo_format.rb b/lib/sisu/current/texinfo_format.rb
index a7ddc90d..c03e2ec7 100644
--- a/lib/sisu/v5/texinfo_format.rb
+++ b/lib/sisu/current/texinfo_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texinfo_format.rb;hb=HEAD>
 
 =end
 module SiSU_TexInfoFormat
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/current/texpdf.rb
index a906fa09..cd4504aa 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/current/texpdf.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texpdf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texpdf.rb;hb=HEAD>
 
 =end
 module SiSU_TeX
diff --git a/lib/sisu/v5/texpdf_format.rb b/lib/sisu/current/texpdf_format.rb
index 696c5705..a1a147e1 100644
--- a/lib/sisu/v5/texpdf_format.rb
+++ b/lib/sisu/current/texpdf_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texpdf_format.rb;hb=HEAD>
 
 =end
 module SiSU_TeX_Pdf
diff --git a/lib/sisu/v5/texpdf_parts.rb b/lib/sisu/current/texpdf_parts.rb
index 64d3ac1f..229785df 100644
--- a/lib/sisu/v5/texpdf_parts.rb
+++ b/lib/sisu/current/texpdf_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_TeXpdf
diff --git a/lib/sisu/v5/txt_asciidoc.rb b/lib/sisu/current/txt_asciidoc.rb
index 20113df3..65488bd5 100644
--- a/lib/sisu/v5/txt_asciidoc.rb
+++ b/lib/sisu/current/txt_asciidoc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_asciidoc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_asciidoc.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_AsciiDoc
diff --git a/lib/sisu/v5/txt_markdown.rb b/lib/sisu/current/txt_markdown.rb
index 50d8c826..1ec2bdf2 100644
--- a/lib/sisu/v5/txt_markdown.rb
+++ b/lib/sisu/current/txt_markdown.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_markdown.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_markdown.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Markdown
diff --git a/lib/sisu/v5/txt_plain.rb b/lib/sisu/current/txt_plain.rb
index dce08bf7..0edd6551 100644
--- a/lib/sisu/v5/txt_plain.rb
+++ b/lib/sisu/current/txt_plain.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Plain
diff --git a/lib/sisu/v5/txt_rst.rb b/lib/sisu/current/txt_rst.rb
index 8d041b99..238c0bb7 100644
--- a/lib/sisu/v5/txt_rst.rb
+++ b/lib/sisu/current/txt_rst.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_rst.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_rst.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_rST
diff --git a/lib/sisu/v5/txt_shared.rb b/lib/sisu/current/txt_shared.rb
index a0b048c7..a47279bb 100644
--- a/lib/sisu/v5/txt_shared.rb
+++ b/lib/sisu/current/txt_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/txt_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/txt_shared.rb;hb=HEAD>
 
 =end
 module SiSU_TextUtils
diff --git a/lib/sisu/v5/txt_textile.rb b/lib/sisu/current/txt_textile.rb
index 04de8fa5..86187a3d 100644
--- a/lib/sisu/v5/txt_textile.rb
+++ b/lib/sisu/current/txt_textile.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_textile.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_textile.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Textile
diff --git a/lib/sisu/v6/update.rb b/lib/sisu/current/update.rb
index fbadb51a..32fdd1a2 100644
--- a/lib/sisu/v6/update.rb
+++ b/lib/sisu/current/update.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/update.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/update.rb;hb=HEAD>
 
 =end
 module SiSU_UpdateControlFlag
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/current/urls.rb
index e57fd7e2..db31282b 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/current/urls.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/urls.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/urls.rb;hb=HEAD>
 
 =end
 module SiSU_Urls
diff --git a/lib/sisu/v5/utils.rb b/lib/sisu/current/utils.rb
index 37bee3c0..1049fdf4 100644
--- a/lib/sisu/v5/utils.rb
+++ b/lib/sisu/current/utils.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils.rb;hb=HEAD>
 
 =end
 module SiSU_Utils
diff --git a/lib/sisu/v5/utils_response.rb b/lib/sisu/current/utils_response.rb
index 529eb82c..6f30437c 100644
--- a/lib/sisu/v5/utils_response.rb
+++ b/lib/sisu/current/utils_response.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_response.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_response.rb;hb=HEAD>
 
 =end
 module SiSU_Response
diff --git a/lib/sisu/v5/utils_screen_text_color.rb b/lib/sisu/current/utils_screen_text_color.rb
index 43e81557..4fd9f6a1 100644
--- a/lib/sisu/v5/utils_screen_text_color.rb
+++ b/lib/sisu/current/utils_screen_text_color.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_screen_text_color.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_screen_text_color.rb;hb=HEAD>
 
 =end
 module SiSU_Screen
diff --git a/lib/sisu/v6/utils_spell.rb b/lib/sisu/current/utils_spell.rb
index a163706e..ffd781d1 100644
--- a/lib/sisu/v6/utils_spell.rb
+++ b/lib/sisu/current/utils_spell.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_spell.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_spell.rb;hb=HEAD>
 
 =end
 module SiSU_SpellUtility
diff --git a/lib/sisu/v5/webrick.rb b/lib/sisu/current/webrick.rb
index 3cd3a103..cabdf6cc 100644
--- a/lib/sisu/v5/webrick.rb
+++ b/lib/sisu/current/webrick.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/webrick.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/webrick.rb;hb=HEAD>
 
 =end
 module SiSU_Webserv
diff --git a/lib/sisu/v6/wikispeak.rb b/lib/sisu/current/wikispeak.rb
index 9bc3eac6..a40f6424 100644
--- a/lib/sisu/v6/wikispeak.rb
+++ b/lib/sisu/current/wikispeak.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/wikispeak.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/wikispeak.rb;hb=HEAD>
 
 =end
 module SiSU_Wikispeak
diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/current/xhtml.rb
index 63dfbdcd..8a7cc176 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/current/xhtml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML
diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/current/xhtml_epub2.rb
index bde2e401..9072bf93 100644
--- a/lib/sisu/v6/xhtml_epub2.rb
+++ b/lib/sisu/current/xhtml_epub2.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_epub2.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2
diff --git a/lib/sisu/v5/xhtml_epub2_concordance.rb b/lib/sisu/current/xhtml_epub2_concordance.rb
index f369f700..d3dfec0e 100644
--- a/lib/sisu/v5/xhtml_epub2_concordance.rb
+++ b/lib/sisu/current/xhtml_epub2_concordance.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_epub2_concordance.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_concordance.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Concordance
diff --git a/lib/sisu/v6/xhtml_epub2_format.rb b/lib/sisu/current/xhtml_epub2_format.rb
index 3e7f7c5f..9cfc5736 100644
--- a/lib/sisu/v6/xhtml_epub2_format.rb
+++ b/lib/sisu/current/xhtml_epub2_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_epub2_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_format.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Format
diff --git a/lib/sisu/v5/xhtml_epub2_segments.rb b/lib/sisu/current/xhtml_epub2_segments.rb
index f8823f11..3f7e878f 100644
--- a/lib/sisu/v5/xhtml_epub2_segments.rb
+++ b/lib/sisu/current/xhtml_epub2_segments.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_epub2_segments.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_segments.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Seg
diff --git a/lib/sisu/v5/xhtml_epub2_tune.rb b/lib/sisu/current/xhtml_epub2_tune.rb
index d49cd953..f8cc3774 100644
--- a/lib/sisu/v5/xhtml_epub2_tune.rb
+++ b/lib/sisu/current/xhtml_epub2_tune.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_epub2_tune.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_tune.rb;hb=HEAD>
 
 =end
 require_relative 'dp'                                   # dp.rb
diff --git a/lib/sisu/v6/xhtml_parts.rb b/lib/sisu/current/xhtml_parts.rb
index 248551f8..3a7cff04 100644
--- a/lib/sisu/v6/xhtml_parts.rb
+++ b/lib/sisu/current/xhtml_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_XHTML
diff --git a/lib/sisu/v6/xhtml_shared.rb b/lib/sisu/current/xhtml_shared.rb
index f7a21d95..c2026799 100644
--- a/lib/sisu/v6/xhtml_shared.rb
+++ b/lib/sisu/current/xhtml_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_shared.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_Shared
diff --git a/lib/sisu/v5/xhtml_table.rb b/lib/sisu/current/xhtml_table.rb
index 7f5e5074..42698f0b 100644
--- a/lib/sisu/v5/xhtml_table.rb
+++ b/lib/sisu/current/xhtml_table.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_table.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_table.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_Table
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/current/xml_docbook5.rb
index 467c2c7b..384efbe0 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/current/xml_docbook5.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_docbook_book.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_docbook_book.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Docbook_Book
diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/current/xml_dom.rb
index e0e365ca..9707deec 100644
--- a/lib/sisu/v6/xml_dom.rb
+++ b/lib/sisu/current/xml_dom.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_dom.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_dom.rb;hb=HEAD>
 
 =end
 module SiSU_XML_DOM
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/current/xml_fictionbook2.rb
index 68f70bad..f8c0ed6b 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/current/xml_fictionbook2.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_fictionbook.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_fictionbook.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Fictionbook
diff --git a/lib/sisu/v6/xml_format.rb b/lib/sisu/current/xml_format.rb
index 5aa47399..08eed960 100644
--- a/lib/sisu/v6/xml_format.rb
+++ b/lib/sisu/current/xml_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_format.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Format
diff --git a/lib/sisu/v5/xml_md_oai_pmh_dc.rb b/lib/sisu/current/xml_md_oai_pmh_dc.rb
index 4ffebde2..b5fe2ccf 100644
--- a/lib/sisu/v5/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/current/xml_md_oai_pmh_dc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_md_oai_pmh_dc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_md_oai_pmh_dc.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Metadata
diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/current/xml_odf_odt.rb
index d394e0e5..8b7c493c 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/current/xml_odf_odt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/odf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/odf.rb;hb=HEAD>
 
 =end
 module SiSU_XML_ODF_ODT
diff --git a/lib/sisu/v5/xml_odf_odt_format.rb b/lib/sisu/current/xml_odf_odt_format.rb
index 5be61af8..436c3996 100644
--- a/lib/sisu/v5/xml_odf_odt_format.rb
+++ b/lib/sisu/current/xml_odf_odt_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/odf_format.rb;hb=HEAD>
 
 =end
 module SiSU_XML_ODF_ODT_Format
diff --git a/lib/sisu/v5/xml_parts.rb b/lib/sisu/current/xml_parts.rb
index c5d0202a..d8acea66 100644
--- a/lib/sisu/v5/xml_parts.rb
+++ b/lib/sisu/current/xml_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_XML
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/current/xml_sax.rb
index a1716a1e..21455628 100644
--- a/lib/sisu/v6/xml_sax.rb
+++ b/lib/sisu/current/xml_sax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml.rb;hb=HEAD>
 
 =end
 module SiSU_XML_SAX
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/current/xml_scaffold_structure_collapsed.rb
index f26cf4ef..2da1f135 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/current/xml_scaffold_structure_collapsed.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_scaffold.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_scaffold.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Scaffold_Structure_Collapse
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/current/xml_scaffold_structure_sisu.rb
index feb4732e..dbb6be7d 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/current/xml_scaffold_structure_sisu.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_scaffold.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_scaffold.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Scaffold_Structure_Sisu
diff --git a/lib/sisu/v5/xml_shared.rb b/lib/sisu/current/xml_shared.rb
index 5a7ff463..f392d9fc 100644
--- a/lib/sisu/v5/xml_shared.rb
+++ b/lib/sisu/current/xml_shared.rb
@@ -49,7 +49,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_shared.rb;hb=HEAD>
 
 ** Ralph Amissah
   <ralph@amissah.com>
diff --git a/lib/sisu/v5/xml_tables.rb b/lib/sisu/current/xml_tables.rb
index c53249de..55b0be41 100644
--- a/lib/sisu/v5/xml_tables.rb
+++ b/lib/sisu/current/xml_tables.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_tables.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_tables.rb;hb=HEAD>
 
 =end
 module SiSU_Tables
diff --git a/lib/sisu/v6/zap.rb b/lib/sisu/current/zap.rb
index b2bc8177..6e1e0fb0 100644
--- a/lib/sisu/v6/zap.rb
+++ b/lib/sisu/current/zap.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/zap.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/zap.rb;hb=HEAD>
 
 =end
 module SiSU_Zap
diff --git a/lib/sisu/v5/air.rb b/lib/sisu/develop/air.rb
index 9f6acadf..2822fe52 100644
--- a/lib/sisu/v5/air.rb
+++ b/lib/sisu/develop/air.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/air.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/air.rb;hb=HEAD>
 
 =end
 module SiSU_Air
diff --git a/lib/sisu/v5/ao.rb b/lib/sisu/develop/ao.rb
index c1fd00ac..e3e4703b 100644
--- a/lib/sisu/v5/ao.rb
+++ b/lib/sisu/develop/ao.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao.rb;hb=HEAD>
 
 =end
 module SiSU_AO
diff --git a/lib/sisu/v6/ao_character_check.rb b/lib/sisu/develop/ao_character_check.rb
index 09d18d7a..b7cfc6df 100644
--- a/lib/sisu/v6/ao_character_check.rb
+++ b/lib/sisu/develop/ao_character_check.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_character_check.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_character_check.rb;hb=HEAD>
 
 =end
 module SiSU_AO_CharacterCheck
diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/develop/ao_composite.rb
index d4e074eb..05d01dd6 100644
--- a/lib/sisu/v6/ao_composite.rb
+++ b/lib/sisu/develop/ao_composite.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_composite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_composite.rb;hb=HEAD>
 
 =end
 module SiSU_Assemble
diff --git a/lib/sisu/v6/ao_doc_objects.rb b/lib/sisu/develop/ao_doc_objects.rb
index c36cb154..0d9fd7d5 100644
--- a/lib/sisu/v6/ao_doc_objects.rb
+++ b/lib/sisu/develop/ao_doc_objects.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_objects.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_objects.rb;hb=HEAD>
 
 =end
 module SiSU_AO_DocumentStructure
diff --git a/lib/sisu/v5/ao_doc_str.rb b/lib/sisu/develop/ao_doc_str.rb
index 5aa8d0d3..ae029002 100644
--- a/lib/sisu/v5/ao_doc_str.rb
+++ b/lib/sisu/develop/ao_doc_str.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_str.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_str.rb;hb=HEAD>
 
 =end
 module SiSU_AO_DocumentStructureExtract
diff --git a/lib/sisu/v5/ao_endnotes.rb b/lib/sisu/develop/ao_endnotes.rb
index 7e7ed1d3..c6dafd4c 100644
--- a/lib/sisu/v5/ao_endnotes.rb
+++ b/lib/sisu/develop/ao_endnotes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_endnotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_endnotes.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Endnotes
diff --git a/lib/sisu/v5/ao_expand_insertions.rb b/lib/sisu/develop/ao_expand_insertions.rb
index d81f2387..0d416314 100644
--- a/lib/sisu/v5/ao_expand_insertions.rb
+++ b/lib/sisu/develop/ao_expand_insertions.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_expand_insertions.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_expand_insertions.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Insertions
diff --git a/lib/sisu/v5/ao_hash_digest.rb b/lib/sisu/develop/ao_hash_digest.rb
index f29c7b54..97087a2a 100644
--- a/lib/sisu/v5/ao_hash_digest.rb
+++ b/lib/sisu/develop/ao_hash_digest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_hash_digest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_hash_digest.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Hash
diff --git a/lib/sisu/v5/ao_idx.rb b/lib/sisu/develop/ao_idx.rb
index 204fc567..cd24854f 100644
--- a/lib/sisu/v5/ao_idx.rb
+++ b/lib/sisu/develop/ao_idx.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_idx.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_idx.rb;hb=HEAD>
 
 =end
 module SiSU_AO_BookIndex
diff --git a/lib/sisu/v5/ao_images.rb b/lib/sisu/develop/ao_images.rb
index 3c6b23db..2e152573 100644
--- a/lib/sisu/v5/ao_images.rb
+++ b/lib/sisu/develop/ao_images.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_images.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_images.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Images
diff --git a/lib/sisu/v5/ao_metadata.rb b/lib/sisu/develop/ao_metadata.rb
index 78dfac39..95743213 100644
--- a/lib/sisu/v5/ao_metadata.rb
+++ b/lib/sisu/develop/ao_metadata.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_metadata.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_metadata.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Metadata
diff --git a/lib/sisu/v6/ao_misc_arrange.rb b/lib/sisu/develop/ao_misc_arrange.rb
index 2ffddd6e..d474f553 100644
--- a/lib/sisu/v6/ao_misc_arrange.rb
+++ b/lib/sisu/develop/ao_misc_arrange.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_misc_arrange.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_misc_arrange.rb;hb=HEAD>
 
 =end
 module SiSU_AO_MiscArrangeText
diff --git a/lib/sisu/v6/ao_numbering.rb b/lib/sisu/develop/ao_numbering.rb
index cd3f366a..cc6b595a 100644
--- a/lib/sisu/v6/ao_numbering.rb
+++ b/lib/sisu/develop/ao_numbering.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_numbering.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_numbering.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Numbering
diff --git a/lib/sisu/v6/ao_syntax.rb b/lib/sisu/develop/ao_syntax.rb
index faab30d6..16f54b61 100644
--- a/lib/sisu/v6/ao_syntax.rb
+++ b/lib/sisu/develop/ao_syntax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_syntax.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_syntax.rb;hb=HEAD>
 
 =end
 module SiSU_AO_Syntax
diff --git a/lib/sisu/v6/cgi.rb b/lib/sisu/develop/cgi.rb
index 8e5d43c7..23df361f 100644
--- a/lib/sisu/v6/cgi.rb
+++ b/lib/sisu/develop/cgi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI                                        #% database building documents
diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/develop/cgi_pgsql.rb
index 0f44ec0a..bb561b08 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/develop/cgi_pgsql.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_pgsql.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_pgsql.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI_PgSQL                                  #% database building documents
diff --git a/lib/sisu/v6/cgi_sql_common.rb b/lib/sisu/develop/cgi_sql_common.rb
index 0c6dbfe0..0b29640d 100644
--- a/lib/sisu/v6/cgi_sql_common.rb
+++ b/lib/sisu/develop/cgi_sql_common.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_sql_common.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_sql_common.rb;hb=HEAD>
 
 =end
 module SiSU_CGI_SQL
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/develop/cgi_sqlite.rb
index 4c4210f1..7b3a5b02 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/develop/cgi_sqlite.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_sqlite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_sql_sqlite.rb;hb=HEAD>
 
 =end
 module  SiSU_CGI_SQLite                                 #% database building documents
diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/develop/conf.rb
index 2176215d..90364899 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/develop/conf.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/conf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/conf.rb;hb=HEAD>
 
 =end
 module SiSU_Initialize
diff --git a/lib/sisu/v6/constants.rb b/lib/sisu/develop/constants.rb
index 0b4de00a..072f5085 100644
--- a/lib/sisu/v6/constants.rb
+++ b/lib/sisu/develop/constants.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/constants.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/constants.rb;hb=HEAD>
 
 =end
 #Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
diff --git a/lib/sisu/v6/css.rb b/lib/sisu/develop/css.rb
index 491942e9..b32bfc50 100644
--- a/lib/sisu/v6/css.rb
+++ b/lib/sisu/develop/css.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/css.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/css.rb;hb=HEAD>
 
 =end
 module SiSU_Style
diff --git a/lib/sisu/v6/db_columns.rb b/lib/sisu/develop/db_columns.rb
index 6db5b1de..e79c0263 100644
--- a/lib/sisu/v6/db_columns.rb
+++ b/lib/sisu/develop/db_columns.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_columns.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_columns.rb;hb=HEAD>
 
 =end
 module SiSU_DbColumns
diff --git a/lib/sisu/v5/db_create.rb b/lib/sisu/develop/db_create.rb
index d660125b..782b0e60 100644
--- a/lib/sisu/v5/db_create.rb
+++ b/lib/sisu/develop/db_create.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_create.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_create.rb;hb=HEAD>
 
 =end
 module SiSU_DbCreate
diff --git a/lib/sisu/v6/db_dbi.rb b/lib/sisu/develop/db_dbi.rb
index f3162bc4..e72c0e7f 100644
--- a/lib/sisu/v6/db_dbi.rb
+++ b/lib/sisu/develop/db_dbi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_dbi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_dbi.rb;hb=HEAD>
 
 =end
 module  SiSU_DbDBI
diff --git a/lib/sisu/v6/db_drop.rb b/lib/sisu/develop/db_drop.rb
index 21220117..a65f1e75 100644
--- a/lib/sisu/v6/db_drop.rb
+++ b/lib/sisu/develop/db_drop.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_drop.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_drop.rb;hb=HEAD>
 
 =end
 module SiSU_DbDrop
diff --git a/lib/sisu/v6/db_import.rb b/lib/sisu/develop/db_import.rb
index a9440212..c221885c 100644
--- a/lib/sisu/v6/db_import.rb
+++ b/lib/sisu/develop/db_import.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_import.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_import.rb;hb=HEAD>
 
 =end
 module SiSU_DbImport
diff --git a/lib/sisu/v6/db_indexes.rb b/lib/sisu/develop/db_indexes.rb
index 0f437770..bb925090 100644
--- a/lib/sisu/v6/db_indexes.rb
+++ b/lib/sisu/develop/db_indexes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_indexes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_indexes.rb;hb=HEAD>
 
 =end
 module SiSU_DbIndex
diff --git a/lib/sisu/v6/db_load_tuple.rb b/lib/sisu/develop/db_load_tuple.rb
index da88716b..3833c686 100644
--- a/lib/sisu/v6/db_load_tuple.rb
+++ b/lib/sisu/develop/db_load_tuple.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_load_tuple.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_load_tuple.rb;hb=HEAD>
 
 =end
 module SiSU_DbTuple
diff --git a/lib/sisu/v5/db_remove.rb b/lib/sisu/develop/db_remove.rb
index d921978f..bb98a814 100644
--- a/lib/sisu/v5/db_remove.rb
+++ b/lib/sisu/develop/db_remove.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_remove.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_remove.rb;hb=HEAD>
 
 =end
 module SiSU_DbRemove
diff --git a/lib/sisu/v5/db_select.rb b/lib/sisu/develop/db_select.rb
index d0963107..ad56e65c 100644
--- a/lib/sisu/v5/db_select.rb
+++ b/lib/sisu/develop/db_select.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_select.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_select.rb;hb=HEAD>
 
 =end
 module SiSU_DbAction
diff --git a/lib/sisu/v6/db_sqltxt.rb b/lib/sisu/develop/db_sqltxt.rb
index f0b4e4f1..ba1549ad 100644
--- a/lib/sisu/v6/db_sqltxt.rb
+++ b/lib/sisu/develop/db_sqltxt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_sqltxt.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_sqltxt.rb;hb=HEAD>
 
 =end
 module SiSU_DbText
diff --git a/lib/sisu/v6/db_tests.rb b/lib/sisu/develop/db_tests.rb
index 84856b83..a3022414 100644
--- a/lib/sisu/v6/db_tests.rb
+++ b/lib/sisu/develop/db_tests.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_tests.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_tests.rb;hb=HEAD>
 
 =end
 module SiSU_DbTests
diff --git a/lib/sisu/v6/dbi.rb b/lib/sisu/develop/dbi.rb
index 93fd65ab..90e4312c 100644
--- a/lib/sisu/v6/dbi.rb
+++ b/lib/sisu/develop/dbi.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dbi.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dbi.rb;hb=HEAD>
 
 =end
 module  SiSU_DBI                                                                 #% database building
diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/develop/dbi_discrete.rb
index b53cd11d..19b1dc82 100644
--- a/lib/sisu/v6/dbi_discrete.rb
+++ b/lib/sisu/develop/dbi_discrete.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dbi_discrete.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dbi_discrete.rb;hb=HEAD>
 
 =end
 module  SiSU_DBI_Discrete                               #% database building
diff --git a/lib/sisu/v6/digests.rb b/lib/sisu/develop/digests.rb
index ff38e151..358bd929 100644
--- a/lib/sisu/v6/digests.rb
+++ b/lib/sisu/develop/digests.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/digests.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/digests.rb;hb=HEAD>
 
 =end
 module SiSU_DigestView
diff --git a/lib/sisu/v5/dp.rb b/lib/sisu/develop/dp.rb
index 6f6207a9..3736630b 100644
--- a/lib/sisu/v5/dp.rb
+++ b/lib/sisu/develop/dp.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp.rb;hb=HEAD>
 
 =end
 module SiSU_Param
diff --git a/lib/sisu/v5/dp_identify_markup.rb b/lib/sisu/develop/dp_identify_markup.rb
index 50a3f5da..411ea5da 100644
--- a/lib/sisu/v5/dp_identify_markup.rb
+++ b/lib/sisu/develop/dp_identify_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp_identify_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp_identify_markup.rb;hb=HEAD>
 
 =end
 module SiSU_MarkupType
diff --git a/lib/sisu/v6/dp_make.rb b/lib/sisu/develop/dp_make.rb
index 6b58ccb4..a7ba2e06 100644
--- a/lib/sisu/v6/dp_make.rb
+++ b/lib/sisu/develop/dp_make.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_make.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp_make.rb;hb=HEAD>
 
 =end
 
diff --git a/lib/sisu/v5/embedded.rb b/lib/sisu/develop/embedded.rb
index cfb7b0dc..fbe73d6d 100644
--- a/lib/sisu/v5/embedded.rb
+++ b/lib/sisu/develop/embedded.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/embedded.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/embedded.rb;hb=HEAD>
 
 =end
 module SiSU_Embedded
diff --git a/lib/sisu/v6/errors.rb b/lib/sisu/develop/errors.rb
index 7494dd26..e24b9571 100644
--- a/lib/sisu/v6/errors.rb
+++ b/lib/sisu/develop/errors.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/errors.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/errors.rb;hb=HEAD>
 
 =end
 module SiSU_Errors
diff --git a/lib/sisu/v6/generic_parts.rb b/lib/sisu/develop/generic_parts.rb
index 8de6ed1a..1545a72a 100644
--- a/lib/sisu/v6/generic_parts.rb
+++ b/lib/sisu/develop/generic_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_Generic
diff --git a/lib/sisu/v6/git.rb b/lib/sisu/develop/git.rb
index d33f70d2..fb2b1631 100644
--- a/lib/sisu/v6/git.rb
+++ b/lib/sisu/develop/git.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/git.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/git.rb;hb=HEAD>
 
 =end
 module SiSU_Git
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/develop/html.rb
index 760b8308..1f128afc 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/develop/html.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html.rb;hb=HEAD>
 
 =end
 module SiSU_HTML
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/develop/html_concordance.rb
index 83f1c5f3..d988dd33 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/develop/html_concordance.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_concordance.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_concordance.rb;hb=HEAD>
 
 =end
 module SiSU_Concordance
diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/develop/html_format.rb
index 573a71d7..a7b62586 100644
--- a/lib/sisu/v6/html_format.rb
+++ b/lib/sisu/develop/html_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_format.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Format
diff --git a/lib/sisu/v5/html_harvest.rb b/lib/sisu/develop/html_harvest.rb
index 088c2a45..cc867352 100644
--- a/lib/sisu/v5/html_harvest.rb
+++ b/lib/sisu/develop/html_harvest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest.rb;hb=HEAD>
 
 =end
 module SiSU_Harvest
diff --git a/lib/sisu/v6/html_harvest_author_format.rb b/lib/sisu/develop/html_harvest_author_format.rb
index 6de2822a..24f8af8d 100644
--- a/lib/sisu/v6/html_harvest_author_format.rb
+++ b/lib/sisu/develop/html_harvest_author_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_author_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_author_format.rb;hb=HEAD>
 
 =end
 module SiSU_FormatAuthor
diff --git a/lib/sisu/v5/html_harvest_authors.rb b/lib/sisu/develop/html_harvest_authors.rb
index 9479f2e3..5fd6bc72 100644
--- a/lib/sisu/v5/html_harvest_authors.rb
+++ b/lib/sisu/develop/html_harvest_authors.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_authors.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_authors.rb;hb=HEAD>
 
 =end
 module SiSU_HarvestAuthors
diff --git a/lib/sisu/v6/html_harvest_topics.rb b/lib/sisu/develop/html_harvest_topics.rb
index 7c540cdc..b86f4914 100644
--- a/lib/sisu/v6/html_harvest_topics.rb
+++ b/lib/sisu/develop/html_harvest_topics.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_topics.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_topics.rb;hb=HEAD>
 
 =end
 module SiSU_HarvestTopics
diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/develop/html_lite_shared.rb
index 37e76cfd..65c0537d 100644
--- a/lib/sisu/v5/html_lite_shared.rb
+++ b/lib/sisu/develop/html_lite_shared.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_lite_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_lite_shared.rb;hb=HEAD>
 
 =end
 module SiSU_FormatShared
diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/develop/html_manifest.rb
index b46eb061..397f040d 100644
--- a/lib/sisu/v5/html_manifest.rb
+++ b/lib/sisu/develop/html_manifest.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_manifest.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_manifest.rb;hb=HEAD>
 
 =end
 module SiSU_Manifest
diff --git a/lib/sisu/v6/html_minitoc.rb b/lib/sisu/develop/html_minitoc.rb
index f741264e..3cb87577 100644
--- a/lib/sisu/v6/html_minitoc.rb
+++ b/lib/sisu/develop/html_minitoc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_minitoc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_minitoc.rb;hb=HEAD>
 
 =end
   module SiSU_HTML_MiniToc
diff --git a/lib/sisu/v5/html_parts.rb b/lib/sisu/develop/html_parts.rb
index b2b0b69f..e29b450f 100644
--- a/lib/sisu/v5/html_parts.rb
+++ b/lib/sisu/develop/html_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_HTML
diff --git a/lib/sisu/v5/html_promo.rb b/lib/sisu/develop/html_promo.rb
index 42b11c86..b58fcac2 100644
--- a/lib/sisu/v5/html_promo.rb
+++ b/lib/sisu/develop/html_promo.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_promo.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_promo.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Promo
diff --git a/lib/sisu/v5/html_scroll.rb b/lib/sisu/develop/html_scroll.rb
index af0a15fe..9229e5fb 100644
--- a/lib/sisu/v5/html_scroll.rb
+++ b/lib/sisu/develop/html_scroll.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_scroll.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_scroll.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Scroll
diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/develop/html_segments.rb
index 7ebb02a2..61bed7bf 100644
--- a/lib/sisu/v5/html_segments.rb
+++ b/lib/sisu/develop/html_segments.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_segments.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_segments.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Seg
diff --git a/lib/sisu/v5/html_shared.rb b/lib/sisu/develop/html_shared.rb
index 3c62be03..5d716368 100644
--- a/lib/sisu/v5/html_shared.rb
+++ b/lib/sisu/develop/html_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_shared.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Shared
diff --git a/lib/sisu/v6/html_table.rb b/lib/sisu/develop/html_table.rb
index a24edc5d..7cc005c8 100644
--- a/lib/sisu/v6/html_table.rb
+++ b/lib/sisu/develop/html_table.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_table.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_table.rb;hb=HEAD>
 
 =end
 module SiSU_HTML_Table
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/develop/html_tune.rb
index a465ef7e..89757bb9 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/develop/html_tune.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_tune.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_tune.rb;hb=HEAD>
 
 =end
 require_relative 'dp'                                   # dp.rb
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/develop/hub.rb
index 3710bca0..df668922 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/develop/hub.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub.rb;hb=HEAD>
 
 =end
 module SiSU
diff --git a/lib/sisu/v5/hub_actions.rb b/lib/sisu/develop/hub_actions.rb
index 23f26d80..6ae81b70 100644
--- a/lib/sisu/v5/hub_actions.rb
+++ b/lib/sisu/develop/hub_actions.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_actions.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_actions.rb;hb=HEAD>
 
 =end
 module SiSU_Hub_Actions
diff --git a/lib/sisu/v6/hub_loop_markup_files.rb b/lib/sisu/develop/hub_loop_markup_files.rb
index e297ec44..541b205a 100644
--- a/lib/sisu/v6/hub_loop_markup_files.rb
+++ b/lib/sisu/develop/hub_loop_markup_files.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_loop_markup_files.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_loop_markup_files.rb;hb=HEAD>
 
 =end
 module SiSU_Hub_Loops
diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/develop/hub_options.rb
index 5c8bfef2..3d46a84f 100644
--- a/lib/sisu/v6/hub_options.rb
+++ b/lib/sisu/develop/hub_options.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_options.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_options.rb;hb=HEAD>
 
 =end
 module SiSU_Commandline
diff --git a/lib/sisu/v6/i18n.rb b/lib/sisu/develop/i18n.rb
index 0bef7a83..5e30b760 100644
--- a/lib/sisu/v6/i18n.rb
+++ b/lib/sisu/develop/i18n.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/i18n.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/i18n.rb;hb=HEAD>
 
 =end
 module SiSU_i18n
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/develop/manpage.rb
index 196f8057..e0dbad21 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/develop/manpage.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/manpage.rb;hb=HEAD>
 
 =end
 module SiSU_Manpage
diff --git a/lib/sisu/v6/manpage_format.rb b/lib/sisu/develop/manpage_format.rb
index 78581aeb..4885fb75 100644
--- a/lib/sisu/v6/manpage_format.rb
+++ b/lib/sisu/develop/manpage_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/manpage_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/manpage_format.rb;hb=HEAD>
 
 =end
 module SiSU_ManpageFormat
diff --git a/lib/sisu/v6/po4a.rb b/lib/sisu/develop/po4a.rb
index 415d3169..6c2f9df5 100644
--- a/lib/sisu/v6/po4a.rb
+++ b/lib/sisu/develop/po4a.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/po4a.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/po4a.rb;hb=HEAD>
 
 =end
 module SiSU_Po4a
diff --git a/lib/sisu/v5/po4a_set.rb b/lib/sisu/develop/po4a_set.rb
index 6d4221fb..2ae73102 100644
--- a/lib/sisu/v5/po4a_set.rb
+++ b/lib/sisu/develop/po4a_set.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a_set.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/po4a_set.rb;hb=HEAD>
 
 =end
 module SiSU_Po4aUtils
diff --git a/lib/sisu/v6/prog_text_translation.rb b/lib/sisu/develop/prog_text_translation.rb
index 8a1488a0..a13f75d3 100644
--- a/lib/sisu/v6/prog_text_translation.rb
+++ b/lib/sisu/develop/prog_text_translation.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/prog_text_translation.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/prog_text_translation.rb;hb=HEAD>
 
 =end
 module SiSU_Translate
diff --git a/lib/sisu/v6/qrcode.rb b/lib/sisu/develop/qrcode.rb
index f94509a3..4cdc5b2d 100644
--- a/lib/sisu/v6/qrcode.rb
+++ b/lib/sisu/develop/qrcode.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/qrcode.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/qrcode.rb;hb=HEAD>
 
 =end
 module SiSU_QRcode
diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/develop/relaxng.rb
index fa894bee..194e2e3d 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/develop/relaxng.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/relaxng.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/relaxng.rb;hb=HEAD>
 
 =end
 module SiSU_Relaxng
diff --git a/lib/sisu/v5/remote.rb b/lib/sisu/develop/remote.rb
index 1e136a40..56275227 100644
--- a/lib/sisu/v5/remote.rb
+++ b/lib/sisu/develop/remote.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/remote.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/remote.rb;hb=HEAD>
 
 =end
 module SiSU_Remote
diff --git a/lib/sisu/v5/rexml.rb b/lib/sisu/develop/rexml.rb
index 800f4a84..07fabc93 100644
--- a/lib/sisu/v5/rexml.rb
+++ b/lib/sisu/develop/rexml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/rexml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/rexml.rb;hb=HEAD>
 
 =end
 module SiSU_Rexml
diff --git a/lib/sisu/v6/se.rb b/lib/sisu/develop/se.rb
index 1ecb93a5..5525f46f 100644
--- a/lib/sisu/v6/se.rb
+++ b/lib/sisu/develop/se.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se.rb;hb=HEAD>
 
 =end
 @@cX=nil
diff --git a/lib/sisu/v6/se_cleanoutput.rb b/lib/sisu/develop/se_cleanoutput.rb
index bad40e42..99833ccb 100644
--- a/lib/sisu/v6/se_cleanoutput.rb
+++ b/lib/sisu/develop/se_cleanoutput.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_cleanoutput.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_cleanoutput.rb;hb=HEAD>
 
 =end
 module SiSU_Clean_Output
diff --git a/lib/sisu/v6/se_clear.rb b/lib/sisu/develop/se_clear.rb
index e97cfde0..553fd98b 100644
--- a/lib/sisu/v6/se_clear.rb
+++ b/lib/sisu/develop/se_clear.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_clear.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_clear.rb;hb=HEAD>
 
 =end
 module SiSU_Clear
diff --git a/lib/sisu/v5/se_createsite.rb b/lib/sisu/develop/se_createsite.rb
index c3a826d7..d2210625 100644
--- a/lib/sisu/v5/se_createsite.rb
+++ b/lib/sisu/develop/se_createsite.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_createsite.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_createsite.rb;hb=HEAD>
 
 =end
 module SiSU_Create_Site
diff --git a/lib/sisu/v6/se_css.rb b/lib/sisu/develop/se_css.rb
index f87f303c..5654d09d 100644
--- a/lib/sisu/v6/se_css.rb
+++ b/lib/sisu/develop/se_css.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_css.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_css.rb;hb=HEAD>
 
 =end
 module SiSU_CSS
diff --git a/lib/sisu/v6/se_date.rb b/lib/sisu/develop/se_date.rb
index a4bb874b..8c2ca8ea 100644
--- a/lib/sisu/v6/se_date.rb
+++ b/lib/sisu/develop/se_date.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_date.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_date.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Date
diff --git a/lib/sisu/v5/se_db.rb b/lib/sisu/develop/se_db.rb
index ebe5a159..39701ef6 100644
--- a/lib/sisu/v5/se_db.rb
+++ b/lib/sisu/develop/se_db.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_db.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_db.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Db
diff --git a/lib/sisu/v5/se_envcall.rb b/lib/sisu/develop/se_envcall.rb
index 00a25775..b5a9500d 100644
--- a/lib/sisu/v5/se_envcall.rb
+++ b/lib/sisu/develop/se_envcall.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_envcall.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_envcall.rb;hb=HEAD>
 
 =end
 module SiSU_Env_Call
diff --git a/lib/sisu/v5/se_file_op.rb b/lib/sisu/develop/se_file_op.rb
index 5a82633a..01d72c19 100644
--- a/lib/sisu/v5/se_file_op.rb
+++ b/lib/sisu/develop/se_file_op.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_file_op.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_file_op.rb;hb=HEAD>
 
 =end
 module SiSU_Info_File
diff --git a/lib/sisu/v6/se_filemap.rb b/lib/sisu/develop/se_filemap.rb
index 2f52aa9a..1179e417 100644
--- a/lib/sisu/v6/se_filemap.rb
+++ b/lib/sisu/develop/se_filemap.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_filemap.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_filemap.rb;hb=HEAD>
 
 =end
 module SiSU_File_Map
diff --git a/lib/sisu/v6/se_get_init.rb b/lib/sisu/develop/se_get_init.rb
index 66b18902..9bdafae3 100644
--- a/lib/sisu/v6/se_get_init.rb
+++ b/lib/sisu/develop/se_get_init.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_get_init.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_get_init.rb;hb=HEAD>
 
 =end
 module SiSU_Get_Init
@@ -79,15 +79,33 @@ module SiSU_Get_Init
       @@tx ||=SiSU_Parts_TeXpdf::TeX.new
     end
     def rc_path_options
+      v=SiSU_Env::InfoVersion.instance.get_version
       [
-        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}",
-        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
-        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}",
-        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
-        "#{@@home}/.sisu/#{SiSU_is[:version_dir]}",
-        "#{@@home}/.sisu",
-        "#{@@sisu_etc}/#{SiSU_is[:version_dir]}",
-        "#{@@sisu_etc}",
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/.sisu/v' \
+        + v[:branch_number],
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/.sisu/' \
+        + v[:branch_name],
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/.sisu',
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/_sisu/v' \
+        + v[:branch_number],
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/_sisu/' \
+        + v[:branch_name],
+        $sisu_document_markup_directory_base_fixed_path \
+        + '/_sisu',
+        @@home \
+        + '/.sisu/' \
+        + SiSU_is[:version_dir],
+        @@home \
+        + '/.sisu', \
+        @@sisu_etc \
+        + '/' \
+        + SiSU_is[:version_dir],
+        @@sisu_etc,
       ]
     end
     def sisu_document_make
diff --git a/lib/sisu/v6/se_hub_particulars.rb b/lib/sisu/develop/se_hub_particulars.rb
index dc28291d..e7e9decf 100644
--- a/lib/sisu/v6/se_hub_particulars.rb
+++ b/lib/sisu/develop/se_hub_particulars.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_hub_particulars.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_hub_particulars.rb;hb=HEAD>
 
 =end
 module SiSU_Particulars
diff --git a/lib/sisu/v6/se_info_env.rb b/lib/sisu/develop/se_info_env.rb
index dcd54ed6..992d978e 100644
--- a/lib/sisu/v6/se_info_env.rb
+++ b/lib/sisu/develop/se_info_env.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_env.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_env.rb;hb=HEAD>
 
 =end
 @@current_document=Dir.pwd #nil #''
diff --git a/lib/sisu/v6/se_info_port.rb b/lib/sisu/develop/se_info_port.rb
index b28b66cc..f878142b 100644
--- a/lib/sisu/v6/se_info_port.rb
+++ b/lib/sisu/develop/se_info_port.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_port.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_port.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Port
diff --git a/lib/sisu/v6/se_info_system.rb b/lib/sisu/develop/se_info_system.rb
index 8145dcb6..c616ec47 100644
--- a/lib/sisu/v6/se_info_system.rb
+++ b/lib/sisu/develop/se_info_system.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_system.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_system.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Sys_Gen
diff --git a/lib/sisu/v6/se_load.rb b/lib/sisu/develop/se_load.rb
index 3d64d2b7..6f61ddd6 100644
--- a/lib/sisu/v6/se_load.rb
+++ b/lib/sisu/develop/se_load.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_load.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_load.rb;hb=HEAD>
 
 =end
 module SiSU_Load
diff --git a/lib/sisu/v6/se_processing.rb b/lib/sisu/develop/se_processing.rb
index 76c897e2..b40dfc59 100644
--- a/lib/sisu/v6/se_processing.rb
+++ b/lib/sisu/develop/se_processing.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_processing.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_processing.rb;hb=HEAD>
 
 =end
 module SiSU_Processing_Settings
diff --git a/lib/sisu/v5/se_programs.rb b/lib/sisu/develop/se_programs.rb
index ddf683b5..92a5a6fe 100644
--- a/lib/sisu/v5/se_programs.rb
+++ b/lib/sisu/develop/se_programs.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_programs.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_programs.rb;hb=HEAD>
 
 =end
 module SiSU_Sys_Call
diff --git a/lib/sisu/v6/se_remotes.rb b/lib/sisu/develop/se_remotes.rb
index 27ae6234..23f1386d 100644
--- a/lib/sisu/v6/se_remotes.rb
+++ b/lib/sisu/develop/se_remotes.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_remotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_remotes.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Remote_Host
diff --git a/lib/sisu/v5/se_standardise_lang.rb b/lib/sisu/develop/se_standardise_lang.rb
index 09ff54ef..94c6baa3 100644
--- a/lib/sisu/v5/se_standardise_lang.rb
+++ b/lib/sisu/develop/se_standardise_lang.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_standardise_lang.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_standardise_lang.rb;hb=HEAD>
 
 =end
 @@lang_info=nil
diff --git a/lib/sisu/v5/se_version.rb b/lib/sisu/develop/se_version.rb
index 4a7c487f..b0bb693c 100644
--- a/lib/sisu/v5/se_version.rb
+++ b/lib/sisu/develop/se_version.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_version.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_version.rb;hb=HEAD>
 
 =end
 module SiSU_Info_Version
@@ -75,7 +75,7 @@ module SiSU_Info_Version
     end
     @@lib_path=nil
     def get_version
-      @version={}
+      version={}
       @pwd=ENV['PWD']
       lib_path=
         @@lib_path \
@@ -83,16 +83,19 @@ module SiSU_Info_Version
         : `echo $RUBYLIB`.split(':')
       @@lib_path ||=lib_path
       if File.exist?(SiSU_is[:version_info_path])
-        @version=YAML::load(File::open(SiSU_is[:version_info_path]))
+        version=YAML::load(File::open(SiSU_is[:version_info_path]))
       end
-      @version[:install_method]=if SiSU_is[:run_from]==:gem_install
+      version[:install_method]=if SiSU_is[:run_from]==:gem_install
         spec = Gem::Specification.find_by_name("sisu")
         gem_root = spec.gem_dir
         (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is[:version_dir]}/,'')) == gem_root) \
         ? ' (ruby gem install)' : ''
       else ''
       end
-      @version
+      version[:branch_name]=SiSU_is[:version_dir]
+      version[:branch]=version[:branch_name]
+      version[:branch_number]=/^([0-9]+)\./.match(version[:version])[1]
+      version
     end
     def rbversion
       %x{ruby -v}.strip
diff --git a/lib/sisu/v6/shared_images.rb b/lib/sisu/develop/shared_images.rb
index 31677316..a4f0421b 100644
--- a/lib/sisu/v6/shared_images.rb
+++ b/lib/sisu/develop/shared_images.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_images.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_images.rb;hb=HEAD>
 
 =end
 module SiSU_Images
diff --git a/lib/sisu/v6/shared_markup_alt.rb b/lib/sisu/develop/shared_markup_alt.rb
index d09f240a..b33c29f5 100644
--- a/lib/sisu/v6/shared_markup_alt.rb
+++ b/lib/sisu/develop/shared_markup_alt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_markup_alt.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_markup_alt.rb;hb=HEAD>
 
 =end
 module SiSU_TextRepresentation
diff --git a/lib/sisu/v5/shared_metadata.rb b/lib/sisu/develop/shared_metadata.rb
index 3ce45603..1859b510 100644
--- a/lib/sisu/v5/shared_metadata.rb
+++ b/lib/sisu/develop/shared_metadata.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_metadata.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_metadata.rb;hb=HEAD>
 
 =end
 module SiSU_Metadata
diff --git a/lib/sisu/v5/shared_sem.rb b/lib/sisu/develop/shared_sem.rb
index 889a388f..1866cc3b 100644
--- a/lib/sisu/v5/shared_sem.rb
+++ b/lib/sisu/develop/shared_sem.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_sem.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_sem.rb;hb=HEAD>
 
 =end
 module SiSU_Sem
diff --git a/lib/sisu/v6/sitemaps.rb b/lib/sisu/develop/sitemaps.rb
index 8f241c8d..b34ff57c 100644
--- a/lib/sisu/v6/sitemaps.rb
+++ b/lib/sisu/develop/sitemaps.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sitemaps.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sitemaps.rb;hb=HEAD>
 
 =end
 module SiSU_Sitemaps
diff --git a/lib/sisu/v5/src_kdissert_share.rb b/lib/sisu/develop/src_kdissert_share.rb
index c0d66865..351e5004 100644
--- a/lib/sisu/v5/src_kdissert_share.rb
+++ b/lib/sisu/develop/src_kdissert_share.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_share_kdissert.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_share_kdissert.rb;hb=HEAD>
 
 =end
 module SiSU_KdiSource
diff --git a/lib/sisu/v5/src_share.rb b/lib/sisu/develop/src_share.rb
index 520f3ccb..b499ed6f 100644
--- a/lib/sisu/v5/src_share.rb
+++ b/lib/sisu/develop/src_share.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_share.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_share.rb;hb=HEAD>
 
 =end
 module SiSU_Markup
diff --git a/lib/sisu/v6/src_shared.rb b/lib/sisu/develop/src_shared.rb
index b3aa4e29..8b85825a 100644
--- a/lib/sisu/v6/src_shared.rb
+++ b/lib/sisu/develop/src_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_shared.rb;hb=HEAD>
 
 =end
 module SiSU_Source
diff --git a/lib/sisu/v5/src_sisupod_make.rb b/lib/sisu/develop/src_sisupod_make.rb
index bdf77a01..0d3194ba 100644
--- a/lib/sisu/v5/src_sisupod_make.rb
+++ b/lib/sisu/develop/src_sisupod_make.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_sisupod_make.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_sisupod_make.rb;hb=HEAD>
 
 =end
 module SiSU_Doc
diff --git a/lib/sisu/v6/sst_convert_markup.rb b/lib/sisu/develop/sst_convert_markup.rb
index 975fe78c..b2e233cd 100644
--- a/lib/sisu/v6/sst_convert_markup.rb
+++ b/lib/sisu/develop/sst_convert_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_convert_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_convert_markup.rb;hb=HEAD>
 
 =end
 module SiSU_Modify
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/develop/sst_do_inline_footnotes.rb
index 793f90fc..42e70b05 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/develop/sst_do_inline_footnotes.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/set_do_inline_footnotes.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/set_do_inline_footnotes.rb;hb=HEAD>
 
 =end
 module SiSU_ConvertFootnotes
diff --git a/lib/sisu/v6/sst_from_xml.rb b/lib/sisu/develop/sst_from_xml.rb
index 28a854b0..40174892 100644
--- a/lib/sisu/v6/sst_from_xml.rb
+++ b/lib/sisu/develop/sst_from_xml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_from_xml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_from_xml.rb;hb=HEAD>
 
 =end
 module SiSU_sstFromXML
diff --git a/lib/sisu/v5/sst_identify_markup.rb b/lib/sisu/develop/sst_identify_markup.rb
index dcb410e3..e8cc954f 100644
--- a/lib/sisu/v5/sst_identify_markup.rb
+++ b/lib/sisu/develop/sst_identify_markup.rb
@@ -53,7 +53,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_identify_markup.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_identify_markup.rb;hb=HEAD>
 
 =end
 module SiSU_Markup
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/develop/sst_to_s_xml_sax.rb
index 5d60aeb7..af3a6a13 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/develop/sst_to_s_xml_sax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_to_s_xml_sax.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_to_s_xml_sax.rb;hb=HEAD>
 
 =end
 module SiSU_SimpleXML_ModelSax
diff --git a/lib/sisu/v5/termsheet.rb b/lib/sisu/develop/termsheet.rb
index 7e4f531c..08bba53a 100644
--- a/lib/sisu/v5/termsheet.rb
+++ b/lib/sisu/develop/termsheet.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/termsheet.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/termsheet.rb;hb=HEAD>
 
 =end
 require_relative 'se'                                   # se.rb
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/develop/texinfo.rb
index 4415b42e..807173e0 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/develop/texinfo.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texinfo.rb;hb=HEAD>
 
 =end
 module SiSU_TexInfo
diff --git a/lib/sisu/v6/texinfo_format.rb b/lib/sisu/develop/texinfo_format.rb
index f625393d..096e1c5c 100644
--- a/lib/sisu/v6/texinfo_format.rb
+++ b/lib/sisu/develop/texinfo_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texinfo_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texinfo_format.rb;hb=HEAD>
 
 =end
 module SiSU_TexInfoFormat
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/develop/texpdf.rb
index 36d88d89..451f9ff8 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/develop/texpdf.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texpdf.rb;hb=HEAD>
 
 =end
 module SiSU_TeX
diff --git a/lib/sisu/v6/texpdf_format.rb b/lib/sisu/develop/texpdf_format.rb
index 43e7f263..573c45d6 100644
--- a/lib/sisu/v6/texpdf_format.rb
+++ b/lib/sisu/develop/texpdf_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texpdf_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texpdf_format.rb;hb=HEAD>
 
 =end
 module SiSU_TeX_Pdf
diff --git a/lib/sisu/v6/texpdf_parts.rb b/lib/sisu/develop/texpdf_parts.rb
index dbd38974..6ede6454 100644
--- a/lib/sisu/v6/texpdf_parts.rb
+++ b/lib/sisu/develop/texpdf_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_TeXpdf
diff --git a/lib/sisu/v6/txt_asciidoc.rb b/lib/sisu/develop/txt_asciidoc.rb
index 29a61e1b..496b2025 100644
--- a/lib/sisu/v6/txt_asciidoc.rb
+++ b/lib/sisu/develop/txt_asciidoc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_asciidoc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_asciidoc.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_AsciiDoc
diff --git a/lib/sisu/v6/txt_markdown.rb b/lib/sisu/develop/txt_markdown.rb
index 801e2b7f..d7cf988f 100644
--- a/lib/sisu/v6/txt_markdown.rb
+++ b/lib/sisu/develop/txt_markdown.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_markdown.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_markdown.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Markdown
diff --git a/lib/sisu/v6/txt_plain.rb b/lib/sisu/develop/txt_plain.rb
index 77e96434..45cab309 100644
--- a/lib/sisu/v6/txt_plain.rb
+++ b/lib/sisu/develop/txt_plain.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Plain
diff --git a/lib/sisu/v6/txt_rst.rb b/lib/sisu/develop/txt_rst.rb
index c3cbe927..4bba77b2 100644
--- a/lib/sisu/v6/txt_rst.rb
+++ b/lib/sisu/develop/txt_rst.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_rst.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_rst.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_rST
diff --git a/lib/sisu/v6/txt_shared.rb b/lib/sisu/develop/txt_shared.rb
index e5c888f3..825d8041 100644
--- a/lib/sisu/v6/txt_shared.rb
+++ b/lib/sisu/develop/txt_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_shared.rb;hb=HEAD>
 
 =end
 module SiSU_TextUtils
diff --git a/lib/sisu/v6/txt_textile.rb b/lib/sisu/develop/txt_textile.rb
index 598fd7ba..c515e8d1 100644
--- a/lib/sisu/v6/txt_textile.rb
+++ b/lib/sisu/develop/txt_textile.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_textile.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_textile.rb;hb=HEAD>
 
 =end
 module SiSU_Txt_Textile
diff --git a/lib/sisu/v5/update.rb b/lib/sisu/develop/update.rb
index 1eac18c4..eb1094ea 100644
--- a/lib/sisu/v5/update.rb
+++ b/lib/sisu/develop/update.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/update.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/update.rb;hb=HEAD>
 
 =end
 module SiSU_UpdateControlFlag
diff --git a/lib/sisu/v6/urls.rb b/lib/sisu/develop/urls.rb
index 56d9780b..fc84f16b 100644
--- a/lib/sisu/v6/urls.rb
+++ b/lib/sisu/develop/urls.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/urls.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/urls.rb;hb=HEAD>
 
 =end
 module SiSU_Urls
diff --git a/lib/sisu/v6/utils.rb b/lib/sisu/develop/utils.rb
index bdc6df84..f100b2d8 100644
--- a/lib/sisu/v6/utils.rb
+++ b/lib/sisu/develop/utils.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils.rb;hb=HEAD>
 
 =end
 module SiSU_Utils
diff --git a/lib/sisu/v6/utils_response.rb b/lib/sisu/develop/utils_response.rb
index 136e01c7..31092bed 100644
--- a/lib/sisu/v6/utils_response.rb
+++ b/lib/sisu/develop/utils_response.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_response.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_response.rb;hb=HEAD>
 
 =end
 module SiSU_Response
diff --git a/lib/sisu/v6/utils_screen_text_color.rb b/lib/sisu/develop/utils_screen_text_color.rb
index a4d2b422..fef7ba77 100644
--- a/lib/sisu/v6/utils_screen_text_color.rb
+++ b/lib/sisu/develop/utils_screen_text_color.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_screen_text_color.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_screen_text_color.rb;hb=HEAD>
 
 =end
 module SiSU_Screen
diff --git a/lib/sisu/v5/utils_spell.rb b/lib/sisu/develop/utils_spell.rb
index cd097d6b..ba401c69 100644
--- a/lib/sisu/v5/utils_spell.rb
+++ b/lib/sisu/develop/utils_spell.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_spell.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_spell.rb;hb=HEAD>
 
 =end
 module SiSU_SpellUtility
diff --git a/lib/sisu/v6/webrick.rb b/lib/sisu/develop/webrick.rb
index c307f85d..9de19792 100644
--- a/lib/sisu/v6/webrick.rb
+++ b/lib/sisu/develop/webrick.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/webrick.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/webrick.rb;hb=HEAD>
 
 =end
 module SiSU_Webserv
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/develop/wikispeak.rb
index ccd223fa..e8c45c1b 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/develop/wikispeak.rb
@@ -52,7 +52,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/wikispeak.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/wikispeak.rb;hb=HEAD>
 
 =end
 module SiSU_Wikispeak
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/develop/xhtml.rb
index b3aa35db..ca015c02 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/develop/xhtml.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/develop/xhtml_epub2.rb
index d08ecf97..edfb6e62 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/develop/xhtml_epub2.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_epub2.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2
diff --git a/lib/sisu/v6/xhtml_epub2_concordance.rb b/lib/sisu/develop/xhtml_epub2_concordance.rb
index 9a0911ec..024a5a5e 100644
--- a/lib/sisu/v6/xhtml_epub2_concordance.rb
+++ b/lib/sisu/develop/xhtml_epub2_concordance.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_epub2_concordance.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_concordance.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Concordance
diff --git a/lib/sisu/v5/xhtml_epub2_format.rb b/lib/sisu/develop/xhtml_epub2_format.rb
index 5c610d41..e4d4ac0f 100644
--- a/lib/sisu/v5/xhtml_epub2_format.rb
+++ b/lib/sisu/develop/xhtml_epub2_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_epub2_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_format.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Format
diff --git a/lib/sisu/v6/xhtml_epub2_segments.rb b/lib/sisu/develop/xhtml_epub2_segments.rb
index 15055a09..7193c776 100644
--- a/lib/sisu/v6/xhtml_epub2_segments.rb
+++ b/lib/sisu/develop/xhtml_epub2_segments.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_epub2_segments.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_segments.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_EPUB2_Seg
diff --git a/lib/sisu/v6/xhtml_epub2_tune.rb b/lib/sisu/develop/xhtml_epub2_tune.rb
index b5f638b0..4f965fa5 100644
--- a/lib/sisu/v6/xhtml_epub2_tune.rb
+++ b/lib/sisu/develop/xhtml_epub2_tune.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_epub2_tune.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_tune.rb;hb=HEAD>
 
 =end
 require_relative 'dp'                                   # dp.rb
diff --git a/lib/sisu/v5/xhtml_parts.rb b/lib/sisu/develop/xhtml_parts.rb
index 912b224d..36a8cd9a 100644
--- a/lib/sisu/v5/xhtml_parts.rb
+++ b/lib/sisu/develop/xhtml_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_XHTML
diff --git a/lib/sisu/v5/xhtml_shared.rb b/lib/sisu/develop/xhtml_shared.rb
index 2cca9e82..84d6a36b 100644
--- a/lib/sisu/v5/xhtml_shared.rb
+++ b/lib/sisu/develop/xhtml_shared.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_shared.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_Shared
diff --git a/lib/sisu/v6/xhtml_table.rb b/lib/sisu/develop/xhtml_table.rb
index 23514c23..df5a2822 100644
--- a/lib/sisu/v6/xhtml_table.rb
+++ b/lib/sisu/develop/xhtml_table.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_table.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_table.rb;hb=HEAD>
 
 =end
 module SiSU_XHTML_Table
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/develop/xml_docbook5.rb
index 9b395fe6..bfdfed7c 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/develop/xml_docbook5.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_docbook_book.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_docbook_book.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Docbook_Book
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/develop/xml_dom.rb
index cac033a7..60d57854 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/develop/xml_dom.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_dom.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_dom.rb;hb=HEAD>
 
 =end
 module SiSU_XML_DOM
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/develop/xml_fictionbook2.rb
index 7f9d9fde..45f5b74a 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/develop/xml_fictionbook2.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_fictionbook.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_fictionbook.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Fictionbook
diff --git a/lib/sisu/v5/xml_format.rb b/lib/sisu/develop/xml_format.rb
index 3b27984c..80610911 100644
--- a/lib/sisu/v5/xml_format.rb
+++ b/lib/sisu/develop/xml_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_format.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Format
diff --git a/lib/sisu/v6/xml_md_oai_pmh_dc.rb b/lib/sisu/develop/xml_md_oai_pmh_dc.rb
index 1b6d9466..6d366f2d 100644
--- a/lib/sisu/v6/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/develop/xml_md_oai_pmh_dc.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_md_oai_pmh_dc.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_md_oai_pmh_dc.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Metadata
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/develop/xml_odf_odt.rb
index 1de905d3..de1dde96 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/develop/xml_odf_odt.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/odf.rb;hb=HEAD>
 
 =end
 module SiSU_XML_ODF_ODT
diff --git a/lib/sisu/v6/xml_odf_odt_format.rb b/lib/sisu/develop/xml_odf_odt_format.rb
index 57fb4fac..4de504a0 100644
--- a/lib/sisu/v6/xml_odf_odt_format.rb
+++ b/lib/sisu/develop/xml_odf_odt_format.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/odf_format.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/odf_format.rb;hb=HEAD>
 
 =end
 module SiSU_XML_ODF_ODT_Format
diff --git a/lib/sisu/v6/xml_parts.rb b/lib/sisu/develop/xml_parts.rb
index 1a318f28..6974efa2 100644
--- a/lib/sisu/v6/xml_parts.rb
+++ b/lib/sisu/develop/xml_parts.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
 
 =end
 module SiSU_Parts_XML
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/develop/xml_sax.rb
index d7c62564..d922ca07 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/develop/xml_sax.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml.rb;hb=HEAD>
 
 =end
 module SiSU_XML_SAX
diff --git a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb b/lib/sisu/develop/xml_scaffold_structure_collapsed.rb
index e0ba1490..72708e45 100644
--- a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/develop/xml_scaffold_structure_collapsed.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_scaffold.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_scaffold.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Scaffold_Structure_Collapse
diff --git a/lib/sisu/v6/xml_scaffold_structure_sisu.rb b/lib/sisu/develop/xml_scaffold_structure_sisu.rb
index 5fe341a8..39c71d80 100644
--- a/lib/sisu/v6/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/develop/xml_scaffold_structure_sisu.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_scaffold.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_scaffold.rb;hb=HEAD>
 
 =end
 module SiSU_XML_Scaffold_Structure_Sisu
diff --git a/lib/sisu/v6/xml_shared.rb b/lib/sisu/develop/xml_shared.rb
index 2d264385..b24b2f7a 100644
--- a/lib/sisu/v6/xml_shared.rb
+++ b/lib/sisu/develop/xml_shared.rb
@@ -49,7 +49,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_shared.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_shared.rb;hb=HEAD>
 
 ** Ralph Amissah
   <ralph@amissah.com>
diff --git a/lib/sisu/v6/xml_tables.rb b/lib/sisu/develop/xml_tables.rb
index b22a28f5..998266c8 100644
--- a/lib/sisu/v6/xml_tables.rb
+++ b/lib/sisu/develop/xml_tables.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_tables.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_tables.rb;hb=HEAD>
 
 =end
 module SiSU_Tables
diff --git a/lib/sisu/v5/zap.rb b/lib/sisu/develop/zap.rb
index f3c8401f..50a6cd54 100644
--- a/lib/sisu/v5/zap.rb
+++ b/lib/sisu/develop/zap.rb
@@ -51,7 +51,7 @@
 
 ** Git
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/zap.rb;hb=HEAD>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/zap.rb;hb=HEAD>
 
 =end
 module SiSU_Zap
diff --git a/qi b/qi
index 3b4ba501..2d8d878b 100755
--- a/qi
+++ b/qi
@@ -38,7 +38,7 @@ require 'yaml'
 module SiSUconf
   class Configure < Thor
     class_option :verbose, :type => :boolean
-    desc 'setup --all --bin --lib --conf --data --alt',
+    desc 'setup --all --bin --lib --conf --data --alt --dryrun',
       'setup sisu'
     options \
       :all => :boolean,
@@ -49,7 +49,8 @@ module SiSUconf
       :share => :boolean,
       :man => :boolean,
       :vim => :boolean,
-      :alt => :boolean
+      :alt => :boolean,
+      :dryrun => :boolean
     def setup
       unless options.length >= 1 \
       and not (options[:bin] \
@@ -61,72 +62,73 @@ module SiSUconf
       or options[:vim])
         puts 'setup --all --bin --lib --conf --data --share --man --vim'
       end
+      act=(options[:dryrun]) ? (:dryrun) : (:action)
       if not options[:alt]
         if options[:all] \
         or options[:bin]
           exclude_files=['sisugem']
-          Install.setup_find_create('bin',Project_details.dir.bin,exclude_files) \
+          Install.setup_find_create('bin',Project_details.dir.bin,exclude_files,act)  \
             if File.directory?('bin')
         end
         if options[:all] \
         or options[:lib]
-          Install.setup_find_create('lib',Project_details.dir.lib) \
+          Install.setup_find_create('lib',Project_details.dir.lib,act) \
             if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_create('conf',Project_details.dir.conf) \
+          Install.setup_find_create('conf',Project_details.dir.conf,act) \
             if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_create('data',Project_details.dir.data) \
+          Install.setup_find_create('data',Project_details.dir.data,act) \
             if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_create('data/sisu',Project_details.dir.share) \
+          Install.setup_find_create('data/sisu',Project_details.dir.share,act) \
             if File.directory?('data/sisu')
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_create('man',Project_details.dir.man) \
+          Install.setup_find_create('man',Project_details.dir.man,act) \
             if File.directory?('man')
         end
         if options[:all] \
         or options[:vim]
-          Install.setup_find_create('data/vim',Project_details.dir.vim) \
+          Install.setup_find_create('data/vim',Project_details.dir.vim,act) \
             if File.directory?('data/vim')
         end
       else
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('bin',Project_details.dir.bin) \
+          Install.setup_find_cp_r('bin',Project_details.dir.bin,act) \
             if File.directory?('bin')
         end
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('lib',Project_details.dir.lib) \
+          Install.setup_find_cp_r('lib',Project_details.dir.lib,act) \
             if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_cp_r('conf',Project_details.dir.conf) \
+          Install.setup_find_cp_r('conf',Project_details.dir.conf,act) \
             if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_cp_r('data',Project_details.dir.data) \
+          Install.setup_find_cp_r('data',Project_details.dir.data,act) \
             if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_cp_r('data/sisu',Project_details.dir.share) \
+          Install.setup_find_cp_r('data/sisu',Project_details.dir.share,act) \
             if File.directory?('data/sisu') #
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_cp_r('man',Project_details.dir.man) \
+          Install.setup_find_cp_r('man',Project_details.dir.man,act) \
             if File.directory?('man')
         end
         #if options[:all] \
@@ -193,17 +195,26 @@ module SiSUconf
     desc 'pkg',
       'package maintenance tasks, of no general interest (maintainer specific for package maintainer\'s convenience)'
     options \
-      :update_version=> :boolean,
+      :open_version=> :boolean,
+      :version_and_tag_for_release=> :boolean,
       :tip => :boolean
     def pkg
       if options[:tip]
         Package.sequence
       end
-      if options[:update_version]
-        Version_info::Update.update_stable
-        Version_info::Update.update_unstable
-        puts "\n" + Version_info::Update.changelog_header_stable
-        puts "\n" + Version_info::Update.changelog_header_unstable
+      if options[:open_version]
+        Version_info::Update.update_stable(:pre_release)
+        Version_info::Update.update_unstable(:pre_release)
+        Version_info::Update.changelog_header_stable_pre_release
+        Version_info::Update.changelog_header_unstable_pre_release
+        Version_info::Update.changelog_header_commit(:pre_release)
+      end
+      if options[:version_and_tag_for_release]
+        Version_info::Update.update_stable(:release)
+        Version_info::Update.update_unstable(:release)
+        Version_info::Update.changelog_header_stable
+        Version_info::Update.changelog_header_unstable
+        Version_info::Update.changelog_header_commit_tag_upstream(:release)
       end
       if options.length == 0
         system("#{$called_as} help pkg")
diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb
index 331ed72e..80ccc8d8 100644
--- a/setup/qi_libs.rb
+++ b/setup/qi_libs.rb
@@ -138,7 +138,7 @@ module Utils
 end
 module Install
                                                            #%% using a directory and its mapping
-  def self.setup_find_create(dir_get,dir_put,exclude_files=[''])               #primary,
+  def self.setup_find_create(dir_get,dir_put,exclude_files=[''],act)               #primary,
     begin
       Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
         stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
@@ -146,13 +146,17 @@ module Install
         action=case
         when File.file?(f)
           unless f =~/#{exclude_files.inspect}/
-            cp(f,place)
-            Utils.chmod_file(place)
+            unless act==:dryrun
+              cp(f,place)
+              Utils.chmod_file(place)
+            end
             "->  #{dir_put}/"
           end
         when File.directory?(f)
-          FileUtils.mkpath(place) \
-            unless FileTest.directory?(place)
+          if not FileTest.directory?(place) \
+          and not act==:dryrun
+            FileUtils.mkpath(place)
+          end
           "./#{dir_get}/"
         else '?'
         end
@@ -162,18 +166,27 @@ module Install
       puts "\n\n[ are you root? required for install ]"
     end
   end
-  def self.setup_find_cp_r(dir_get,dir_put)                                    #secondary, using recursive copy
+  def self.setup_find_cp_r(dir_get,dir_put,act)                                    #secondary, using recursive copy
     begin
       Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
         stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
         place="#{dir_put}/#{stub}"
         case
         when File.file?(f)
-          cp_r(f,place)
-          Utils.chmod_util(place)
+          unless act==:dryrun
+            cp_r(f,place)
+            Utils.chmod_util(place)
+          else
+            puts "--> #{place}"
+          end
         when File.directory?(f)
-          mkdir(place) \
-            unless FileTest.directory?(place)
+          unless FileTest.directory?(place)
+            unless act==:dryrun
+              mkdir(place)
+            else
+              puts "mkdir -p #{place}"
+            end
+          end
         end
       end
     rescue
@@ -182,18 +195,21 @@ module Install
   end
 end
 module Version_info
-  def self.contents(vi)
+  def self.contents(vi,rel=:release)
+    release=if rel ==:pre_release then '_pre_rel'
+    else                               ''
+    end
     <<-WOK
 ---
 :project: #{vi[:project]}
-:version: #{vi[:version]}
+:version: #{vi[:version]}#{release}
 :date_stamp: #{vi[:date_stamp]}
 :date: "#{vi[:date]}"
     WOK
   end
   module Current
     def self.yml_file_path(version)
-      "data/sisu/#{version}/v/version.yml"
+      "data/sisu/version/#{version}.yml"
     end
     def self.settings(file)
       v="#{Dir.pwd}/#{file}"
@@ -202,6 +218,12 @@ module Version_info
       else ''
       end
     end
+    def self.changelog_file_stable
+      'data/doc/sisu/CHANGELOG_v5'
+    end
+    def self.changelog_file_unstable
+      'data/doc/sisu/CHANGELOG_v6'
+    end
     def self.file_stable
       yml_file_path(SiSU_version_dir_stable)
     end
@@ -209,10 +231,16 @@ module Version_info
       yml_file_path(SiSU_version_dir_unstable)
     end
     def self.setting_stable
-      settings(file_stable)
+      hsh=settings(file_stable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.setting_unstable
-      settings(file_unstable)
+      hsh=settings(file_unstable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.content_stable
       Version_info.contents(setting_stable)
@@ -236,11 +264,11 @@ module Version_info
     def self.setting_unstable
       settings(SiSU_version_next_unstable)
     end
-    def self.content_stable
-      Version_info.contents(setting_stable)
+    def self.content_stable(rel)
+      Version_info.contents(setting_stable,rel)
     end
-    def self.content_unstable
-      Version_info.contents(setting_unstable)
+    def self.content_unstable(rel)
+      Version_info.contents(setting_unstable,rel)
     end
   end
   module Update
@@ -250,7 +278,8 @@ module Version_info
 with:
   #{vi_hash_next.sort}
 
-#{vi_content_current} becoming:
+#{vi_content_current}
+becoming:
 #{vi_content_next}
 proceed? }
       resp=Utils.answer?(ans)
@@ -265,39 +294,168 @@ proceed? }
         end
       end
     end
-    def self.update_stable
+    def self.update_stable(rel=:release)
       version_info_update_commit(
         Version_info::Current.file_stable,
         Version_info::Current.setting_stable,
         Version_info::Current.content_stable,
         Version_info::Next.setting_stable,
-        Version_info::Next.content_stable
+        Version_info::Next.content_stable(rel),
       )
     end
-    def self.update_unstable
+    def self.update_unstable(rel=:release)
       version_info_update_commit(
         Version_info::Current.file_unstable,
         Version_info::Current.setting_unstable,
         Version_info::Current.content_unstable,
         Version_info::Next.setting_unstable,
-        Version_info::Next.content_unstable
+        Version_info::Next.content_unstable(rel),
       )
     end
     def self.changelog_header(vi)
+      vn=/([0-9]+\.[0-9]+\.[0-9]+)/.match(vi[:version])[1]
       <<-WOK
-** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
-http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
-  sisu_#{vi[:version]}.orig.tar.xz
-  sisu_#{vi[:version]}-1.dsc
+** #{vn}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vn}-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz
+  sisu_#{vn}.orig.tar.xz
+  sisu_#{vn}-1.dsc
       WOK
     end
+    def self.changelog_header_release(filename,ch,vi)
+      ans=%{update #{Project_details.name.downcase} changelog header, open version:
+
+  #{ch}
+proceed? }
+      resp=Utils.answer?(ans)
+      if resp
+        fn="#{Dir.pwd}/#{filename}"
+        if File.writable?(fn)
+          changelog_arr_current = IO.readlines(fn)
+          changelog_arr_next=[]
+          changelog_arr_current.each do |line|
+            changelog_arr_next <<=if line =~/^\*\* [0-9]+\.[0-9]+\.[0-9]+(?:_pre_rel)?\.orig\.tar\.xz \(Open commit window: [0-9]{4}-[0-9]{2}-[0-9]{2}; Pre-Release\)\)$/
+              "** #{vi[:version]}.orig.tar.xz " \
+              + "(#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})\n"
+            else line
+            end
+          end
+          if changelog_arr_current.length == changelog_arr_next.length
+            changelog_file=File.new(fn,'w+')
+            changelog_arr_next.flatten.each do |line|
+              changelog_file << line
+            end
+            changelog_file.close
+          else puts "expected changelog arrays to have same length, in: #{changelog_arr_current.length}, out: #{changelog_arr_next.length}"
+          end
+        else
+          puts %{*WARN* is the file or directory writable? could not create #{filename}}
+        end
+      end
+    end
+    def self.changelog_header_stable_filename
+      Version_info::Current.changelog_file_stable
+    end
+    def self.changelog_header_unstable_filename
+      Version_info::Current.changelog_file_unstable
+    end
     def self.changelog_header_stable
-      changelog_header(Version_info::Current.setting_stable)
+      ch=changelog_header(Version_info::Current.setting_stable)
+      changelog_header_release(
+        changelog_header_stable_filename,
+        ch,
+        Version_info::Current.setting_stable
+      )
     end
     def self.changelog_header_unstable
-      changelog_header(Version_info::Current.setting_unstable)
+      ch=changelog_header(Version_info::Current.setting_unstable)
+      changelog_header_release(
+        changelog_header_unstable_filename,
+        ch,
+        Version_info::Current.setting_unstable
+      )
+    end
+    def self.changelog_header_pre_release(vi)
+      vn=/([0-9]+\.[0-9]+\.[0-9]+)/.match(vi[:version])[1]
+      <<-WOK
+** #{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release))
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vn}-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz
+  sisu_#{vn}.orig.tar.xz
+  sisu_#{vn}-1.dsc
+      WOK
+    end
+    def self.changelog_header_pre_release_write(filename,ch)
+      ans=%{update #{Project_details.name.downcase} changelog header, open version:
+
+  #{ch}
+proceed? }
+      resp=Utils.answer?(ans)
+      if resp
+        fn="#{Dir.pwd}/#{filename}"
+        if File.writable?(fn)
+          changelog_arr_current = IO.readlines(fn)
+          changelog_arr_next=[]
+          changelog_arr_current.each do |line|
+            changelog_arr_next <<=if line =~/^--- HEAD ---$/
+              line << ("\n" + ch)
+            else line
+            end
+          end
+          if changelog_arr_current.length == changelog_arr_next.length
+            changelog_file=File.new(fn,'w+')
+            changelog_arr_next.flatten.each do |line|
+              changelog_file << line
+            end
+            changelog_file.close
+          else puts "expected changelog arrays to have same length, in: #{changelog_arr_current.length}, out: #{changelog_arr_next.length}"
+          end
+        else
+          puts %{*WARN* is the file or directory writable? could not create #{filename}}
+        end
+      end
+    end
+    def self.changelog_header_stable_pre_release
+      ch=changelog_header_pre_release(Version_info::Current.setting_stable)
+      changelog_header_pre_release_write(changelog_header_stable_filename,ch)
+    end
+    def self.changelog_header_unstable_pre_release
+      ch=changelog_header_pre_release(Version_info::Current.setting_unstable)
+      changelog_header_pre_release_write(changelog_header_unstable_filename,ch)
+    end
+    def self.commit_changelog(rel=:release,msg)
+      system(%{
+        git commit -a -m"#{msg}"
+        git commit --amend
+      })
+    end
+    def self.tag_upstream
+      system(%{
+        git tag -a sisu_#{SiSU_version_next_stable} -m"SiSU #{SiSU_version_next_stable}"
+      })
+    end
+    def self.changelog_header_commit(rel=:release)
+      msg=(rel == :pre_release) \
+      ? "version & changelog, open commit window"
+      : "version & changelog, tag for release"
+      ans=%{commit #{msg}:\n\nproceed? }
+      resp=Utils.answer?(ans)
+      if resp
+        commit_changelog(rel,msg)
+      end
+    end
+    def self.changelog_header_commit_tag_upstream(rel=:release)
+      msg=(rel == :pre_release) \
+      ? "version & changelog, open commit window"
+      : "version & changelog, tag for release"
+      ans=%{commit #{msg}:\n\nproceed? }
+      resp=Utils.answer?(ans)
+      if resp
+        commit_changelog(rel,msg)
+        tag_upstream
+      end
     end
   end
   self
@@ -359,7 +517,7 @@ module Gemspecs
     puts <<-WOK
 --
 name:       #{vi[:project].downcase}
-version:    #{vi[:version]}
+version:    #{vi[:version_number]}
 date:       #{vi[:date]}
 summary:    #{vi[:project]}
     WOK
@@ -368,14 +526,14 @@ summary:    #{vi[:project]}
     <<-WOK
 Gem::Specification.new do |s|
   s.name           = '#{vi[:project].downcase}'
-  s.version        = '#{vi[:version]}'
+  s.version        = '#{vi[:version_number]}'
   s.date           = '#{vi[:date]}'
   s.summary        = '#{vi[:project]}'
   s.description    = '#{Project_details.name} gem'
   s.authors        = ["Ralph Amissah"]
   s.email          = 'ralph.amissah@gmail.com'
   s.files          = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] +
-                     Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] +
+                     Dir['data/#{Project_details.name.downcase}/version/#{version}.yml'] +
                      Dir['data/#{Project_details.name.downcase}/image/*'] +
                      Dir['bin/#{Project_details.name.downcase}gem'] +
                      Dir['bin/#{Project_details.name.downcase}']
@@ -406,12 +564,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_stable[:version]
+      + Version_info::Current.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_unstable[:version]
+      + Version_info::Current.setting_unstable[:version_number]
     end
     def self.info_stable
       Gemspecs.info(Version_info::Current.setting_stable)
@@ -462,12 +620,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_stable[:version]
+      + Version_info::Next.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_unstable[:version]
+      + Version_info::Next.setting_unstable[:version_number]
     end
     def self.setting_stable
       Gemspecs.contents(
@@ -504,18 +662,17 @@ end
 module Package
   def self.sequence
     puts <<-WOK
-  --update-version  # update package version
+  --open-version                # update package version
+  --version-and-tag-for-release # git tags upstream version
   # not included:
-  # --tag             # git tags upstream version
-  # --merge           # git merge upstream tag into debian/sid
-  # --dch             # dch create and edit
-  # --dch-commit      # dch commit
-  # --build           # git-buildpackage
-  # --git_push        # git push changes
-  # --dput            # dput package
-  # --reprepro_update # reprepro update
-  # --reprepro_push   # reprepro rsync changes
+  # --merge                     # git merge upstream tag into debian/sid
+  # --dch                       # dch create and edit
+  # --dch-commit                # dch commit
+  # --build                     # git-buildpackage
+  # --git_push                  # git push changes
+  # --dput                      # dput package
+  # --reprepro_update           # reprepro update
+  # --reprepro_push             # reprepro rsync changes
     WOK
   end
 end
-
diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb
index 982625e0..126811c8 100644
--- a/setup/qi_libs_base.rb
+++ b/setup/qi_libs_base.rb
@@ -142,7 +142,7 @@ module Version_info
   end
   module Current
     def self.yml_file_path(version)
-      "data/sisu/#{version}/v/version.yml"
+      "data/sisu/version/#{version}.yml"
     end
     def self.settings(file)
       v="#{Dir.pwd}/#{file}"
diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb
index 9dc55bf7..b999704b 100644
--- a/setup/rbuild_libs.rb
+++ b/setup/rbuild_libs.rb
@@ -192,7 +192,7 @@ module Version_info
   end
   module Current
     def self.yml_file_path(version)
-      "data/sisu/#{version}/v/version.yml"
+      "data/sisu/version/#{version}.yml"
     end
     def self.settings(file)
       v="#{Dir.pwd}/#{file}"
@@ -208,10 +208,16 @@ module Version_info
       yml_file_path(SiSU_version_dir_unstable)
     end
     def self.setting_stable
-      settings(file_stable)
+      hsh=settings(file_stable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.setting_unstable
-      settings(file_unstable)
+      hsh=settings(file_unstable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.content_stable
       Version_info.contents(setting_stable)
@@ -373,7 +379,7 @@ module Gemspecs
     puts <<-WOK
 --
 name:       #{vi[:project].downcase}
-version:    #{vi[:version]}
+version:    #{vi[:version_number]}
 date:       #{vi[:date]}
 summary:    #{vi[:project]}
     WOK
@@ -382,14 +388,14 @@ summary:    #{vi[:project]}
     <<-WOK
 Gem::Specification.new do |s|
   s.name           = '#{vi[:project].downcase}'
-  s.version        = '#{vi[:version]}'
+  s.version        = '#{vi[:version_number]}'
   s.date           = '#{vi[:date]}'
   s.summary        = '#{vi[:project]}'
   s.description    = '#{Project_details.name} gem'
   s.authors        = ["Ralph Amissah"]
   s.email          = 'ralph.amissah@gmail.com'
   s.files          = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] +
-                     Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] +
+                     Dir['data/#{Project_details.name.downcase}/#{version}/version.yml'] +
                      Dir['data/#{Project_details.name.downcase}/image/*'] +
                      Dir['bin/#{Project_details.name.downcase}gem'] +
                      Dir['bin/#{Project_details.name.downcase}']
@@ -420,12 +426,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_stable[:version]
+      + Version_info::Current.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_unstable[:version]
+      + Version_info::Current.setting_unstable[:version_number]
     end
     def self.info_stable
       Gemspecs.info(Version_info::Current.setting_stable)
@@ -476,12 +482,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_stable[:version]
+      + Version_info::Next.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_unstable[:version]
+      + Version_info::Next.setting_unstable[:version_number]
     end
     def self.setting_stable
       Gemspecs.contents(
@@ -515,4 +521,3 @@ end
     end
   end
 end
-
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index 572a8819..38216303 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -3,10 +3,8 @@ module SiSUversion
   SiSU_version_next_stable           = '5.8.0'  #% set version stable current
   SiSU_version_next_unstable         = '6.4.0'  #% set version unstable dev
   #% qi quick install file
-  SiSU_version_generic_next_stable   = '5.4.x'
-  SiSU_version_generic_next_unstable = '6.0.x'
-  SiSU_version_dir_stable            = 'v5'
-  SiSU_version_dir_unstable          = 'v6'
+  SiSU_version_dir_stable            = 'current'
+  SiSU_version_dir_unstable          = 'develop'
 end
 module Dev
   GPGpubKey                          = '1BB4B289'