Merge branch 'upstream' into debian/sid

1 files changed, 25 insertions, 40 deletions

diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 03d2cad5..982b2adb 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-12-16" "0.70.2" "SiSU"
+.TH "sisu" "1" "2009-12-21" "1.0.0" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -630,10 +630,10 @@ The manual can be generated from source, found respectively, either within the
 tarball or installed locally at:
 
 .BR
-  ./data/doc/sisu/sisu_markup_samples/sisu_manual/
+  ./data/doc/sisu/v1/sisu_markup_samples/sisu_manual/
 
 .BR
-  /usr/share/doc/sisu/sisu_markup_samples/sisu_manual/
+  /usr/share/doc/sisu/v1/sisu_markup_samples/sisu_manual/
 
 .BR
 move to the respective directory and type e.g.:
@@ -667,22 +667,22 @@ the sisu manual, the sources files for which are located within the
 tarball at:
 
 .BR
-  ./data/doc/sisu/sisu_manual/
+  ./data/doc/sisu/v1/sisu_markup_samples/sisu_manual/
 
 .BR
 Once installed, directory equivalent to:
 
 .BR
-  /usr/share/doc/sisu/sisu_manual/
+  /usr/share/doc/sisu/v1/sisu_manual/
 
 .BR
 Available man pages are converted back to html using man2html:
 
 .BR
-  /usr/share/doc/sisu/html/
+  /usr/share/doc/sisu/v1/html/
 
 .BR
-  ./data/doc/sisu/html/
+  ./data/doc/sisu/v1/html/
 
 .BR
 An online version of the sisu man page is available here:
@@ -749,13 +749,7 @@ For lists of alternative help sources, see:
 .B man2html
 
 .BR
-  /usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html
-
-.BR
-.B sisu generated html
-
-.BR
-  /usr/share/doc/sisu/html/sisu_help_sources/index.html
+  /usr/share/doc/sisu/v1/html/sisu.1.html
 
 .BR
   <http://sisudoc.org/sisu/sisu_help_sources/index.html>
@@ -859,9 +853,9 @@ an alternative presentation of markup syntax:
 With
 .B SiSU
 installed sample skins may be found in:
-/usr/share/doc/sisu/sisu_markup_samples/dfsg (or equivalent directory) and if
+/usr/share/doc/sisu/v1/sisu_markup_samples/dfsg (or equivalent directory) and if
 sisu\-markup\-samples is installed also under:
-/usr/share/doc/sisu/sisu_markup_samples/non\-free
+/usr/share/doc/sisu/v1/sisu_markup_samples/non\-free
 
 .SH
 8. MARKUP OF HEADERS
@@ -2995,20 +2989,20 @@ installed sample skins may be found in:
 
 .BR
   /etc/sisu/skin/doc and
-  /usr/share/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc
+  /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc
 
 .BR
 (or equivalent directory) and if sisu\-markup\-samples is installed also under:
 
 .BR
-  /usr/share/doc/sisu/sisu_markup_samples/non\-free/_sisu/skin/doc
+  /usr/share/doc/sisu/v1/sisu_markup_samples/non\-free/_sisu/skin/doc
 
 .BR
 Samples of list.yml and promo.yml (which are used to create the right column
 list) may be found in:
 
 .BR
-  /usr/share/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml (or equivalent
+  /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml (or equivalent
   directory)
 
 .SH
@@ -3569,15 +3563,6 @@ See the documentation for hyperestraier:
   man estcmd
 
 .BR
-on sisu_hyperestraier:
-
-.BR
-  man sisu_hyperestraier
-
-.BR
-  /usr/share/doc/sisu/sisu_markup/sisu_hyperestraier/index.html
-
-.BR
 NOTE: the examples that follow assume that sisu output is placed in the
 directory /home/ralph/sisu_www
 
@@ -4132,7 +4117,7 @@ or
 change directory to the appropriate one:
 
 .BR
-cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
+cd /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg
 
 .SH
 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF
@@ -4275,10 +4260,10 @@ home site.
 The directory:
 
 .BR
-  \./data/sisu/conf/editor\-syntax\-etc/
+  \./data/sisu/v1/conf/editor\-syntax\-etc/
 
 .BR
-  /usr/share/sisu/conf/editor\-syntax\-etc
+  /usr/share/sisu/v1/conf/editor\-syntax\-etc
 
 .BR
 contains rudimentary sisu syntax highlighting files for:
@@ -4410,7 +4395,7 @@ comments: assumes dark background; no display line\-wrap
   to file ~/.emacs add the following 2 lines:
 
 .BR
-    (add\-to\-list \'load\-path \"/usr/share/sisu\-examples/config/syntax_hi\")
+    (add\-to\-list \'load\-path \"/usr/share/sisu/v1/conf/editor\-syntax\-etc/emacs\")
 
 .BR
     (require \'sisu\-mode.el)
@@ -4791,28 +4776,28 @@ pdf, and odf which may be also be accessed via the html pages[^28]
 34.3.1 LOCALLY INSTALLED
 
 .BR
-<file:///usr/share/doc/sisu/html/sisu.1.html>
+<file:///usr/share/doc/sisu/v1/html/sisu.1.html>
 
 .BR
-<file:///usr/share/doc/sisu/html/sisu_help.1.html>
+<file:///usr/share/doc/sisu/v1/html/sisu_help.1.html>
 
 .BR
-<file:///usr/share/doc/sisu/html/sisu_help_sources.1.html>
+<file:///usr/share/doc/sisu/v1/html/sisu_help_sources.1.html>
 
 .BR
-  /usr/share/doc/sisu/html/sisu.1.html
+  /usr/share/doc/sisu/html/v1/sisu.1.html
 
 .BR
-  /usr/share/doc/sisu/html/sisu_pdf.7.html
+  /usr/share/doc/sisu/html/v1/sisu_pdf.7.html
 
 .BR
-  /usr/share/doc/sisu/html/sisu_postgresql.7.html
+  /usr/share/doc/sisu/html/v1/sisu_postgresql.7.html
 
 .BR
-  /usr/share/doc/sisu/html/sisu_sqlite.7.html
+  /usr/share/doc/sisu/html/v1/sisu_sqlite.7.html
 
 .BR
-  /usr/share/doc/sisu/html/sisu_webrick.1.html
+  /usr/share/doc/sisu/html/v1/sisu_webrick.1.html
 
 .SH
 34.3.2 WWW.JUS.UIO.NO/SISU