documentation, reflect absence of version directory branches

16 files changed, 77 insertions, 89 deletions

diff --git a/data/doc/sisu/CHANGELOG_v1 b/data/doc/sisu/CHANGELOG_v1
index 009334f8..72d25b68 100644
--- a/data/doc/sisu/CHANGELOG_v1
+++ b/data/doc/sisu/CHANGELOG_v1
@@ -1,4 +1,7 @@
-%% SiSU version 1
+SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
+* SiSU version 1
 
 v1 branch is legacy: v2 branch supersedes & replaces it
 v1 sisu pretty mature in operation and syntax
@@ -12,10 +15,10 @@ v1 branch removed from sisu 3.0 available in sisu =< 2.7
   * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
   * CHANGELOG CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
 
-Reverse Chronological:
-
 * Legacy Branch, Reference
 
+Reverse Chronological:
+
 ** 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
   http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
   sisu_1.0.3.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 5f4cb6ee..af1ce93f 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -1,4 +1,7 @@
-%% SiSU version 2
+SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
+* SiSU version 2
 
 v2 branch is legacy: v3 branch supersedes & replaces it
 v2 branch supersedes & replaces v1 branch
@@ -7,13 +10,13 @@ v2 introduces new processing middle layer (document abstraction);
    epub output introduced
 v2 branch removed from sisu 4.0; it is available in sisu =< 3.3.2
 
-* homepage at: <http://www.jus.uio.no/sisu>
-* <http://www.jus.uio.no/sisu/SiSU/download>
-* <http://www.jus.uio.no/sisu/SiSU/changelog>
-* <http://sisudoc.org/sisu/sisu_manual>
-* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
-* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+  * homepage at: <http://www.jus.uio.no/sisu>
+  * <http://www.jus.uio.no/sisu/SiSU/download>
+  * <http://www.jus.uio.no/sisu/SiSU/changelog>
+  * <http://sisudoc.org/sisu/sisu_manual>
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+  * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
 * Legacy Branch, Reference
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 4ef95814..f44c1b37 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -1,3 +1,6 @@
+SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
 * SiSU version 3
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v3;hb=HEAD>
@@ -8,13 +11,13 @@ v3 branch supersedes & replaces v2 branch
 v2 introduces alternative (configurable) output structures
 v1 branch is removed; it is available in sisu =< 2.7
 
-* homepage at: <http://www.jus.uio.no/sisu>
-* <http://www.jus.uio.no/sisu/SiSU/download>
-* <http://www.jus.uio.no/sisu/SiSU/changelog>
-* <http://sisudoc.org/sisu/sisu_manual>
-* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
-* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+  * homepage at: <http://www.jus.uio.no/sisu>
+  * <http://www.jus.uio.no/sisu/SiSU/download>
+  * <http://www.jus.uio.no/sisu/SiSU/changelog>
+  * <http://sisudoc.org/sisu/sisu_manual>
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+  * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+  * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
 * Legacy Branch, Reference
 
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index f5a1b2be..2fda7b98 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -1,3 +1,6 @@
+SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
 * SiSU version 4
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v4;hb=HEAD>
@@ -23,7 +26,9 @@ v2 branch is removed; it is available in sisu =< 3.3.2
    * bin/sisu $0 make possible to run sisu command on/within project dir tree
    * bin/sisu $*, hub, make possible to specify dir path for markup files
 
-* Reverse Chronological:
+* Legacy Branch, Reference
+
+Reverse Chronological:
 
 ** 4.2.21.orig.tar.xz (2014-01-26:03/7)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.21
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index a6d552b9..ba01f4c4 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -1,4 +1,6 @@
 SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
 * SiSU version 5
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v5;hb=HEAD>
@@ -18,7 +20,9 @@ v2 branch is removed; it is available in sisu =< 3.3.2
   * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
   * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
-* Reverse Chronological:
+* Legacy Branch, Reference
+
+Reverse Chronological:
 
 --- HEAD --- [closed]
 
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 3b167c79..87b32032 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -1,4 +1,6 @@
 SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
 * SiSU version 6
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v6;hb=HEAD>
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index 8f235cf2..6fbc18c4 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -1,4 +1,6 @@
 SiSU CHANGELOG    -*- mode: org; -*-
+#+OPTIONS: ^:nil _:nil
+
 * SiSU version 7
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v7;hb=HEAD>
@@ -12,15 +14,13 @@ v4 branch removed; available in sisu < 4.2.20
 v3 branch removed; available in sisu < 4.1.0
 v2 branch removed; available in sisu =< 3.3.2
 
-  * homepage at: <http://www.jus.uio.no/sisu>
-  * <http://www.jus.uio.no/sisu/SiSU/download>
-  * <http://www.jus.uio.no/sisu/SiSU/changelog>
-  * <http://sisudoc.org/sisu/sisu_manual>
+  * homepage at: <http://www.sisudoc.org> <http://www.jus.uio.no/sisu>
   * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
   * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-  * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
-* Reverse Chronological:
+* Branch, Reference
+
+Reverse Chronological:
 
 --- HEAD ---
 
@@ -29,13 +29,13 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.0.0
 http://www.jus.uio.no/sisu/pkg/src/sisu_7.0.0.orig.tar.xz
   sisu_7.0.0.orig.tar.xz
 
-* v7 opened
-  * v5 branch closed (available <= 5.8.0)
-  * v6 development moved to stable closed (available <= 6.5.0)
-  * v7 development branch opened (using v6 HEAD)
-    lib/sisu/*, single libs directory (c&d gone) (7)
-* removed lib/sisu/{current,develop} dir branches
-  v7 (v5 & v6 retired)
-  * simplify dir structure, offer single sisu version per snapshot
-  * have enjoyed carrying stable and development versions v5 & v6
-    in a single tarball, may return to this structure
+  * v7 opened
+    * v5 branch closed (available <= 5.8.0)
+    * v6 development moved to stable closed (available <= 6.5.0)
+    * v7 development branch opened (using v6 HEAD)
+      lib/sisu/*, single libs directory (c&d gone) (7)
+  * removed lib/sisu/{current,develop} dir branches
+    v7 (v5 & v6 retired)
+    * simplify dir structure, offer single sisu version per snapshot
+    * have enjoyed carrying stable and development versions v5 & v6
+      in a single tarball, may return to this structure
diff --git a/data/doc/sisu/markup-samples/manual/README b/data/doc/sisu/markup-samples/manual/README
index dab91438..7d2481c7 100644
--- a/data/doc/sisu/markup-samples/manual/README
+++ b/data/doc/sisu/markup-samples/manual/README
@@ -1,5 +1,5 @@
-ruby ../../../../../bin/sisu6 --txt --no-ocn -v en/README.ssm
-ruby ../../../../../bin/sisu6 --txt --no-ocn -v --no-manifest --dump='../../../../../..' en/README.ssm
+ruby ../../../../../bin/sisu --txt --no-ocn -v en/README.ssm
+ruby ../../../../../bin/sisu --txt --no-ocn -v --no-manifest --dump='../../../../../..' en/README.ssm
 
-ruby ../../../../../bin/sisu6 --manpage -v en/sisu.ssm
-ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm
+ruby ../../../../../bin/sisu --manpage -v en/sisu.ssm
+ruby ../../../../../bin/sisu --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
index 080786e2..7c377f4c 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
@@ -3,7 +3,7 @@
  :breaks: new=C; break=1
  :bold: /Debian|Ruby|SiSU/
  :italics: /Linux|GPL|GPLv3|LaTeX|PostgreSQL|SQLite|SQL|Vim|ascii|plaintext|UTF-?8|HTML|XHTML|XML|EPUB|OpenDocument|ODF|ODT|PDF|pgSQL|TeXinfo|YAML|YML|OCN|object citation system|object citation numbering|granular search|Dublin Core/
- :substitute: /${sisu_stable}/,'7.0.0'  /${sisu_dev}/,'7.0.0' /${debian_stable}/,'*{Jessie}*' /${debian_testing}/,'*{Stretch}*'
+ :substitute: /${sisu_stable}/,'7.0.0' /${sisu_dev}/,'7.0.0' /${vn}/,'v7' /${debian_stable}/,'*{Jessie}*' /${debian_testing}/,'*{Stretch}*'
  :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
  :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
 
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
index 3bf24cad..6fd5912e 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
@@ -1,4 +1,4 @@
-% SiSU 5.0
+% SiSU 7.0
 
 @title: SiSU
  :subtitle: Commands
@@ -451,14 +451,6 @@ on its own, provides SiSU version information
 !_ -v [filename/wildcard] \\
 see --verbose
 
-!_ --v5 [filename/wildcard] \\
-invokes the sisu v5 document parser/generator. You may run sisu5 instead. This is the current default and is normally omitted.
-={ SiSU command:sisu5|sisu version 5|--v5 }
-
-!_ --v6 [filename/wildcard] \\
-invokes the sisu v6 document parser/generator. You may run sisu6 instead.
-={ SiSU command:sisu6|sisu version 6|--v6 }
-
 !_ --verbose [filename/wildcard] \\
 provides verbose output of what is being generated, where output is placed (and error messages if any), as with -u flag provides a url mapping of files created for each of the processing flag requests. Alias -v
 ={ SiSU command:verbose|--verbose|-v  (verbose) }
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi
index a4e5d3b1..e7e108ae 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi
@@ -35,15 +35,15 @@ The SiSU configuration file is a yaml file, which means indentation is significa
 
 SiSU resource configuration is determined by looking at the following files if they exist:
 
-_1 ./_sisu/v5/sisurc.yml
+_1 ./_sisu/${vn}/sisurc.yml
 
 _1 ./_sisu/sisurc.yml
 
-_1 ~/.sisu/v5/sisurc.yml
+_1 ~/.sisu/${vn}/sisurc.yml
 
 _1 ~/.sisu/sisurc.yml
 
-_1 /etc/sisu/v5/sisurc.yml
+_1 /etc/sisu/${vn}/sisurc.yml
 
 _1 /etc/sisu/sisurc.yml
 
@@ -62,15 +62,15 @@ Most sisu document headers relate to metadata, the exception is the @make: heade
 
 The search order is as for resource configuration:
 
-_1 ./_sisu/v5/sisu_document_make
+_1 ./_sisu/${vn}/sisu_document_make
 
 _1 ./_sisu/sisu_document_make
 
-_1 ~/.sisu/v5/sisu_document_make
+_1 ~/.sisu/${vn}/sisu_document_make
 
 _1 ~/.sisu/sisu_document_make
 
-_1 /etc/sisu/v5/sisu_document_make
+_1 /etc/sisu/${vn}/sisu_document_make
 
 _1 /etc/sisu/sisu_document_make
 
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst
index 6fffb29e..f40d5329 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst
@@ -235,27 +235,23 @@ _1 sisu -vR[and processing flags] [filename/wildcard]
 
 Sample provided, on untarring the source tarball:
 
-_1 conf/sisu/v5/sisurc.yml
-
-_1 conf/sisu/v6/sisurc.yml
+_1 conf/sisu/sisurc.yml
 
 and on installation under:
 
-_1 /etc/sisu/v5/sisurc.yml
-
-_1 /etc/sisu/v6/sisurc.yml
+_1 /etc/sisu/sisurc.yml
 
 The following paths are searched:
 
-_1 ./_sisu/v5/sisurc.yml or ./_sisu/v6/sisurc.yml
+_1 ./_sisu/${vn}/sisurc.yml
 
 _1 ./_sisu/sisurc.yml
 
-_1 ~/.sisu/v5/sisurc.yml or ~/.sisu/v6/sisurc.yml
+_1 ~/.sisu/${vn}/sisurc.yml
 
 _1 ~/.sisu/sisurc.yml
 
-_1 /etc/sisu/v5/sisurc.yml /etc/sisu/v6/sisurc.yml
+_1 /etc/sisu/${vn}/sisurc.yml
 
 _1 /etc/sisu/sisurc.yml
 
@@ -1112,11 +1108,11 @@ _1 http://www.jus.uio.no/sisu/SiSU/examples.html
 
 There is syntax support for some editors provided (together with a README file) in
 
-_1 ./data/sisu/v5/conf/editor-syntax-etc
+_1 ./data/sisu/${vn}/conf/editor-syntax-etc
 
 usually installed to:
 
-_1 /usr/share/sisu/v5/conf/editor-syntax-etc
+_1 /usr/share/sisu/${vn}/conf/editor-syntax-etc
 
 2~ License
 
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
index 97fdbd28..6f69abc3 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
@@ -61,13 +61,7 @@ _1 qi gem --create --build --install --unstable
 
 Provided you have ruby & rake, this can be done with the single command:
 
-_1 rake gem_create_build_install # (to build and install sisu v5 & sisu v6, alias gemcbi)
-
-separate gems are made/installed for sisu v5 & sisu v6 contained in source:
-
-_1 rake gem_create_build_install_stable # (to build and install sisu v5, alias gem5cbi)
-
-_1 rake gem_create_build_install_unstable # (to build and install sisu v6, alias gem6cbi)
+_1 rake gem_create_build_install # (to build and install, alias gemcbi)
 
 for individual steps (create, build, install) see rake options, rake -T
 to specify sisu version for sisu installed via gem
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
index 43c161d1..d94f9a7a 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
@@ -207,8 +207,6 @@ code{
      synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ]
      . sisu [-Ddcv] [instruction]
      . sisu [-CcFLSVvW]
-     . sisu --v5 [operations]
-     . sisu --v6 [operations]
 
 @links:
   { SiSU Homepage }http://www.sisudoc.org/
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi
index 81644d76..9ca2a260 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi
@@ -33,16 +33,4 @@ sisu [ -CcFLSVvW ]
 
 Note: commands should be issued from within the directory that contains the marked up files, cd to markup directory.
 
-sisu ships with version5 and version 6 (which is under development).
-
-sisu --v6 [and options/operations as above]
-
-or
-
-sisu6 [and options/operations as above]
-
-sisu version 1 has been discontinued.
-
-for settings see sisu --help env
-
 sisu [ filename/ wildcard] == sisu -0 [filename/wildcard]
diff --git a/data/doc/sisu/org/sisu.org b/data/doc/sisu/org/sisu.org
index fdcb3eaa..38dd3b31 100644
--- a/data/doc/sisu/org/sisu.org
+++ b/data/doc/sisu/org/sisu.org
@@ -1,5 +1,5 @@
-#+PRIORITIES: A F E
 #+OPTIONS: ^:nil _:nil
+#+PRIORITIES: A F E
 (emacs:evil mode gifts a "vim" of enticing "alternative" powers! ;)
 (vim, my _editor_ of choice also in the emacs environment :)