Merge branch 'upstream' into debian/sid

1 files changed, 23 insertions, 30 deletions

diff --git a/data/doc/sisu/v1/html/sisu.1.html b/data/doc/sisu/v1/html/sisu.1.html
index 301933b2..ea0c304e 100644
--- a/data/doc/sisu/v1/html/sisu.1.html
+++ b/data/doc/sisu/v1/html/sisu.1.html
@@ -591,9 +591,9 @@ available at:
  
 <p>  The manual can be generated from source, found respectively, either
 within the <b>SiSU</b> tarball or installed locally at: 
-<p>    ./data/doc/sisu/sisu_markup_samples/sisu_manual/<br>
+<p>    ./data/doc/sisu/v1/sisu_markup_samples/sisu_manual/<br>
  
-<p>    /usr/share/doc/sisu/sisu_markup_samples/sisu_manual/<br>
+<p>    /usr/share/doc/sisu/v1/sisu_markup_samples/sisu_manual/<br>
  
 <p>  move to the respective directory and type e.g.: 
 <p>    sisu sisu_manual.ssm<br>
@@ -610,15 +610,16 @@ should be available, try:
 <p>  Most <b>SiSU</b> man pages are generated directly from sisu documents that
 are used to prepare the sisu manual, the sources files for which are located
 within the <b>SiSU</b> tarball at: 
-<p>    ./data/doc/sisu/sisu_manual/<br>
+<p>    ./data/doc/sisu/v1/sisu_markup_samples/sisu_manual<br>
  
 <p>  Once installed, directory equivalent to: 
-<p>    /usr/share/doc/sisu/sisu_manual/<br>
+<p>    /usr/share/doc/sisu/v1/sisu_markup_samples/sisu_manual/<br>
+
  
 <p>  Available man pages are converted back to html using man2html: 
-<p>    /usr/share/doc/sisu/html/<br>
+<p>    /usr/share/doc/sisu/v1/html/<br>
  
-<p>    ./data/doc/sisu/html/<br>
+<p>    ./data/doc/sisu/v1/html/<br>
  
 <p>  An online version of the sisu man page is available here: 
 <p>  * various
@@ -659,10 +660,7 @@ see:
 <p>    man sisu_help_sources<br>
  
 <p>  <b>man2html</b> 
-<p>    /usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html<br>
- 
-<p>  <b>sisu generated html</b> 
-<p>    /usr/share/doc/sisu/html/sisu_help_sources/index.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu.1.html<br>
  
 <p>    &lt;<a href='http://sisudoc.org/sisu/sisu_help_sources/index.html'>http://sisudoc.org/sisu/sisu_help_sources/index.html</a>
 &gt;<br>
@@ -729,10 +727,10 @@ up files are available as html with syntax highlighting for viewing: &lt;<a href
 &gt;
 
 <p> 7.2.2 INSTALLED 
-<p>  With <b>SiSU</b> installed sample skins may be found in: /usr/share/doc/sisu/sisu_markup_samples/dfsg
+<p>  With <b>SiSU</b> installed sample skins may be found in: /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg
 (or equivalent directory) and if sisu-markup-samples is installed also under:
 
-<p>/usr/share/doc/sisu/sisu_markup_samples/non-free 
+<p>/usr/share/doc/sisu/v1/sisu_markup_samples/non-free 
 <p> 8. MARKUP OF HEADERS  
 <p>
  Headers contain either: semantic meta-data about a document, which can
@@ -1951,15 +1949,15 @@ and symbolic links as needed from the site, or dir directories as required.
 <p>  With <b>SiSU</b> installed sample skins may be found in: 
 <p>    /etc/sisu/skin/doc
 and<br>
-   /usr/share/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc<br>
+   /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc<br>
  
 <p>  (or equivalent directory) and if sisu-markup-samples is installed also
 under: 
-<p>    /usr/share/doc/sisu/sisu_markup_samples/non-free/_sisu/skin/doc<br>
+<p>    /usr/share/doc/sisu/v1/sisu_markup_samples/non-free/_sisu/skin/doc<br>
  
 <p>  Samples of list.yml and promo.yml (which are used to create the right
 column list) may be found in: 
-<p>    /usr/share/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml
+<p>    /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml
 (or equivalent<br>
    directory)<br>
  
@@ -2399,11 +2397,6 @@ a sample search form for use with the webrick server, which must be copied
  
 <p>    man estcmd<br>
  
-<p>  on sisu_hyperestraier: 
-<p>    man sisu_hyperestraier<br>
- 
-<p>    /usr/share/doc/sisu/sisu_markup/sisu_hyperestraier/index.html<br>
- 
 <p>  NOTE: the examples that follow assume that sisu output is placed in
 
 <p>the directory /home/ralph/sisu_www 
@@ -2745,7 +2738,7 @@ a number of markup sample files may be found either in the directory:
 <p>  or 
 <p>   
 <p>  change directory to the appropriate one: 
-<p>  cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
+<p>  cd /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg
 
 <p> 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF 
 <p>  Having moved to the directory
@@ -2832,7 +2825,7 @@ sisu home site.
 <p> 31. EDITOR FILES, SYNTAX HIGHLIGHTING  
 <p>  The directory:
 
-<p>    ./data/sisu/conf/editor-syntax-etc/<br>
+<p>    ./data/sisu/v1/conf/editor-syntax-etc/<br>
  
 <p>    /usr/share/sisu/conf/editor-syntax-etc<br>
  
@@ -3208,20 +3201,20 @@ html pages[^28]
  
 <p> 34.3 MAN2HTML 
 <p> 34.3.1 LOCALLY INSTALLED 
-<p>  &lt;file:///usr/share/doc/sisu/html/sisu.1.html&gt;
+<p>  &lt;file:///usr/share/doc/sisu/v1/html/sisu.1.html&gt;
 
-<p>  &lt;file:///usr/share/doc/sisu/html/sisu_help.1.html&gt; 
-<p>  &lt;file:///usr/share/doc/sisu/html/sisu_help_sources.1.html&gt;
+<p>  &lt;file:///usr/share/doc/sisu/v1/html/sisu_help.1.html&gt; 
+<p>  &lt;file:///usr/share/doc/sisu/v1/html/sisu_help_sources.1.html&gt;
 
-<p>    /usr/share/doc/sisu/html/sisu.1.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu.1.html<br>
  
-<p>    /usr/share/doc/sisu/html/sisu_pdf.7.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu_pdf.7.html<br>
  
-<p>    /usr/share/doc/sisu/html/sisu_postgresql.7.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu_postgresql.7.html<br>
  
-<p>    /usr/share/doc/sisu/html/sisu_sqlite.7.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu_sqlite.7.html<br>
  
-<p>    /usr/share/doc/sisu/html/sisu_webrick.1.html<br>
+<p>    /usr/share/doc/sisu/v1/html/sisu_webrick.1.html<br>
  
 <p> 34.3.2 WWW.JUS.UIO.NO/SISU 
 <p>  &lt;<a href='http://www.jus.uio.no/sisu/man/sisu.1.html'>http://www.jus.uio.no/sisu/man/sisu.1.html</a>