Merge branch 'upstream' into debian/sid

1 files changed, 46 insertions, 13 deletions

diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index e8d68e2d..fc8f3a77 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-07-21" "0.68.0" "SiSU"
+.TH "sisu" "1" "2008-12-14" "0.70.1" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -858,9 +858,8 @@ sisu\-markup\-samples is installed also under:
 .BR
 
 .BR
-Headers consist of semantic meta\-data about a document, which can be used by
-any output module of the program; and may in addition include extra processing
-instructions.
+Headers contain either: semantic meta\-data about a document, which can be used
+by any output module of the program, or; processing instructions.
 
 .BR
 Note: the first line of a document may include information on the markup
@@ -882,30 +881,64 @@ This current document has a header similar to this one (without the comments):
 
 .nf
   % SiSU 0.57
+.BR
   @title: SiSU
+.BR
   @subtitle: Markup
-  @creator: Ralph Amissah
+.BR
+  @creator: Amissah, Ralph
+.BR
+  % note formatting rules on author / creator field, \"Surname, Other names\", if more than one author separate by semi\-colon (if name is of an institution just write name or the name contains a comma enclose in quotation marks)
+.BR
   @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+.BR
   @type: information
+.BR
   @subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
+.BR
+  @topic_register: text markup language; application:text processing;output:html|xml|latex|pdf|sql
+.BR
+  % note formatting for topic_register topic levels are separated by a colon, a semi\-colon separates main topics
+.BR
+  @date: 2007\-09\-16
+.BR
+  % original publication date unless the substantive text is updated/modified, then date of update
+.BR
   @date.created: 2002\-08\-28
+.BR
   @date.issued: 2002\-08\-28
+.BR
   @date.available: 2002\-08\-28
+.BR
   @date.modified: 2007\-09\-16
-  @date: 2007\-09\-16
+.BR
   @level: new=C; break=1; num_top=1
+.BR
   % comment: in this @level header num_top=1 starts automatic heading numbering at heading level 1 (numbering continues 3 levels down); the new and break instructions are used by the LaTeX/pdf and odf output to determine where to put page breaks (that are not used by html output or say sql database population).
+.BR
   @skin: skin_sisu_manual
+.BR
   % skins modify the appearance of a document and are placed in a sub\-directory under \./_sisu/skin ~/.sisu/skin or /etc/sisu/skin. A skin may affect single documents that request them, all documents in a directory, or be site\-wide. (A document is affected by a single skin)
+.BR
   @bold: /Gnu|Debian|Ruby|SiSU/
+.BR
   @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
+.BR
   { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
+.BR
   { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+.BR
   { SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
+.BR
   { SiSU @ Ruby Application Archive }http://raa.ruby\-lang.org/project/sisu/
+.BR
   { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+.BR
   { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
+.BR
   { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+.BR
+.BR
 .fi
 
 .SH
@@ -1556,14 +1589,14 @@ about SiSU <http://www.jus.uio.no/sisu/> [^13] markup
 
 
 .nf
-     \ [ tux.png ]
+  { tux.png 64x80 }image
 .BR
   % various url linked images
 .BR
-     \ [ tux.png ]
+  {tux.png 64x80 \"a better way\" }http://www.jus.uio.no/sisu/
 .BR
 .BR
-     \ [ GnuDebianLinuxRubyBetterWay.png ]
+  {GnuDebianLinuxRubyBetterWay.png 100x101 \"Way Better \- with Gnu/Linux, Debian and Ruby\" }http://www.jus.uio.no/sisu/
 .BR
 .BR
   {~^ ruby_logo.png \"Ruby\" }http://www.ruby\-lang.org/en/
@@ -1581,7 +1614,7 @@ about SiSU <http://www.jus.uio.no/sisu/> [^13] markup
 tux.png 64x80 \"Gnu/Linux \- a better way\" <http://www.jus.uio.no/sisu/>
 
 .BR
-[ \ ruby_logo \ (png \ missing) \ ] \ [^14]
+[ \ ruby_logo \ (png \ missing) \ ] [^14]
 
 .BR
 GnuDebianLinuxRubyBetterWay.png 100x101 \"Way Better \- with Gnu/Linux, Debian
@@ -5033,10 +5066,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.68.0 of 2008w29/1 (2008-07-21)
+* Generated by: SiSU 0.70.0 of 2008w48/3 (2008-12-03)
 .TP
-* Ruby version: ruby 1.8.7 (2008-06-20 patchlevel 22) [i486-linux]
+* Ruby version: ruby 1.8.7 (2008-08-11 patchlevel 72) [i486-linux]
 .TP
-* Last Generated on: Mon Jul 21 02:54:35 -0400 2008
+* Last Generated on: Tue Dec 09 12:24:07 -0500 2008
 .TP
 * SiSU http://www.jus.uio.no/sisu