Merge tag 'sisu_7.0.0' into debian/sid

SiSU 7.0.0

3 files changed, 8 insertions, 19 deletions

diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index ee8890c9..6ea499b2 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -657,13 +657,6 @@ version information
 .B -v [filename/wildcard]
 see --verbose
 .TP
-.B --v5 [filename/wildcard]
-invokes the sisu v5 document parser/generator. You may run sisu5 instead. This
-is the current default and is normally omitted.
-.TP
-.B --v6 [filename/wildcard]
-invokes the sisu v6 document parser/generator. You may run sisu6 instead.
-.TP
 .B --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
@@ -1112,8 +1105,6 @@ to this one:
      synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ]
      . sisu [-Ddcv] [instruction]
      . sisu [-CcFLSVvW]
-     . sisu --v5 [operations]
-     . sisu --v6 [operations]
 
 @links:
   { SiSU Homepage }http://www.sisudoc.org/
@@ -2645,9 +2636,9 @@ Configure substitution in _sisu/sisu_document_make
 The current
 .B Debian
 is
-.B Wheezy
-the next debian will be
 .B Jessie
+the next debian will be
+.B Stretch
 
 .BR
 Configure substitution in _sisu/sisu_document_make
@@ -2816,19 +2807,19 @@ resource configuration is determined by looking at the following files if they
 exist:
 
 .BR
-  ./_sisu/v5/sisurc.yml
+  ./_sisu/v7/sisurc.yml
 
 .BR
   ./_sisu/sisurc.yml
 
 .BR
-  ~/.sisu/v5/sisurc.yml
+  ~/.sisu/v7/sisurc.yml
 
 .BR
   ~/.sisu/sisurc.yml
 
 .BR
-  /etc/sisu/v5/sisurc.yml
+  /etc/sisu/v7/sisurc.yml
 
 .BR
   /etc/sisu/sisurc.yml
@@ -2860,19 +2851,19 @@ the @make header may be set by placing them in a file sisu_document_make.
 The search order is as for resource configuration:
 
 .BR
-  ./_sisu/v5/sisu_document_make
+  ./_sisu/v7/sisu_document_make
 
 .BR
   ./_sisu/sisu_document_make
 
 .BR
-  ~/.sisu/v5/sisu_document_make
+  ~/.sisu/v7/sisu_document_make
 
 .BR
   ~/.sisu/sisu_document_make
 
 .BR
-  /etc/sisu/v5/sisu_document_make
+  /etc/sisu/v7/sisu_document_make
 
 .BR
   /etc/sisu/sisu_document_make
diff --git a/man/man1/sisu5.1 b/man/man1/sisu5.1
deleted file mode 120000
index 09708b31..00000000
--- a/man/man1/sisu5.1
+++ /dev/null
@@ -1 +0,0 @@
-sisu.1
\ No newline at end of file
diff --git a/man/man1/sisu6.1 b/man/man1/sisu6.1
deleted file mode 120000
index 09708b31..00000000
--- a/man/man1/sisu6.1
+++ /dev/null
@@ -1 +0,0 @@
-sisu.1
\ No newline at end of file