small update and fix

4 files changed, 25 insertions, 22 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 78b3acac..b8007a36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.60.0.orig.tar.gz (2007-09-29:39/6)
+%% sisu_0.60.0.orig.tar.gz (2007-09-30:39/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   sisu_0.60.0.orig.tar.gz
   sisu_0.60.0-1.dsc
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 9dc35163..78b3acac 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -3,7 +3,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.60.0.orig.tar.gz (2007-09-26:39/3)
+%% sisu_0.60.0.orig.tar.gz (2007-09-29:39/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   sisu_0.60.0.orig.tar.gz
   sisu_0.60.0-1.dsc
@@ -29,13 +29,34 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
 
   * sysenv, sisurc.yml allow use of relative output paths, expand to absolute
 
+  * param, behavior for reading headers changed to take in multi-lines, affects
+    regex matching, watch
+
+  * vim syntax highlighting for sisu markup, change to take account of
+    possibility of multi-line headers
+
   * html segmented, bugfix: footnotes for headings levels :A,:B and :C
     correctly placed in first segment when batch-processing files/output
 
   * help, (hub), minor reorganisation and a change in info returned, most
     significantly the response for typing 'sisu' without options
 
-  * sysenv, syslink issue, additional check
+  * sysenv, syslink issue, additional check made
+
+  * sisu markup header, @man: accepting manpage parameters for: man_section,
+    man_name and man_synopsis
+
+  * man-pages, refinements to generation
+
+  * NOTE you may be better off doing any diffs between 0.60 and 0.58 branch
+    than against 0.59 which includes a lot of generated within the package
+    documentation, 0.60 adds source only. [Am tempted to remove 0.59 completely
+    from git history as it increases the size of the scm repository by so
+    much...]
+
+  * debian, 0.60 sorts issues with 0.59 branch, 0.60 should be debian ready but
+    is all dressed up and not uploadable anywhere before 2007-10-02 when back
+    online
 
 %% sisu_0.59.1.orig.tar.gz (2007-09-25:39/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
index 739512cf..b2e44e48 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
@@ -97,24 +97,6 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 <p class="tiny">
   ---
 </p>
-<p class="small">
-  <a href="./sisu_faq/index.html" target="_top" >
-    SiSU faq
-  </a>
-</p>
-<p class="small">
-  <a href="./sisu_howto/index.html" target="_top" >
-    SiSU howto
-  </a>
-</p>
-<p class="small">
-  <a href="./sisu_quickstart/index.html" target="_top" >
-    SiSU quickstart
-  </a>
-</p>
-<p class="tiny">
-  ---
-</p>
 <p class="tiny">
   online
 </p>
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index c54594ca..376b79e3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
@@ -23,7 +23,7 @@
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 webserv:
-  url_root:     'http://sisudoc.org' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu
+  url_root:     'http://sisudoc.org' #without dir stub
   path:         '../../../../../../sisu-doc/doc/manuals_generated'
   #url_root:     'http://www.jus.uio.no/sisu' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu
   #path:         '/var/www' # [absolute or relative path]