documentation minor update, add epub, modify some dir paths

13 files changed, 167 insertions, 77 deletions

diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm
index 2f8392f1..230c247c 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -26,7 +26,7 @@
  :breaks: new=C; break=1
  :skin: skin_sisu_manual
  :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search; synopsis=sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ] . sisu [-Ddcv] [instruction] . sisu [-CcFLSVvW] . sisu --v2 [operations] . sisu --v1 [operations]
+ :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search; synopsis=sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard] . sisu [-Ddcv] [instruction] [filename/wildcard] . sisu [-CcFLSVvW] . sisu --v2 [operations] . sisu --v1 [operations]
 
 @links:
  { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
@@ -44,6 +44,8 @@
 
 :B~ What is SiSU?
 
+% << sisu_synopsis.ssi
+
 << sisu_introduction.sst
 
 % :B~? SiSU Commands
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst
index d60a1cc8..9e4417ea 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst
@@ -45,21 +45,9 @@
 
 1~commands Commands Summary
 
-2~ Synopsis
-
-SiSU - Structured information, Serialized Units - a document publishing system
-
-sisu [ -abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9 ] [ filename/ wildcard ]
-
-sisu [ -Ddcv ] [ instruction ]
-
-sisu [ -CcFLSVvW ]
-
-Note: commands should be issued from within the directory that contains the marked up files, cd to markup directory.
-
 2~ Description
 
-SiSU SiSU is a document publishing system, that from a simple single marked-up document, produces multiple of output formats including: plaintext, html, LaTeX, pdf, xhtml, XML, info, and SQL (PostgreSQL and SQLite), which share numbered text objects ("object citation numbering") and the same document structure information. For more see: http://www.jus.uio.no/sisu
+SiSU SiSU is a document publishing system, that from a simple single marked-up document, produces multiple of output formats including: plaintext, html, xhtml, XML, epub, odt (odf text), LaTeX, pdf, info, and SQL (PostgreSQL and SQLite), which share numbered text objects ("object citation numbering") and the same document structure information. For more see: http://www.jus.uio.no/sisu
 
 % 2~ Summary of man page
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst
index 5cd8c602..fe3b5c46 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst
@@ -58,15 +58,15 @@ SiSU is a flexible document preparation, generation publishing and search system
 
 SiSU ("SiSU information Structuring Universe" or "Structured information, Serialized Units"),~{ also chosen for the meaning of the Finnish term "sisu". }~ is a Unix command line oriented framework for document structuring, publishing and search. Featuring minimalistic markup, multiple standard outputs, a common citation system, and granular search.
 
-Using markup applied to a document, SiSU can produce plain text, HTML, XHTML, XML, OpenDocument, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity (e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
+Using markup applied to a document, SiSU can produce plain text, HTML, XHTML, XML, OpenDocument, EPUB, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity (e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
 
-SiSU is the data/information structuring and transforming tool, that has resulted from work on one of the oldest law web projects. It makes possible the one time, simple human readable markup of documents, that SiSU can then publish in various forms, suitable for paper~{ pdf via LaTeX or lout }~, web~{ currently html (two forms of html presentation one based on css the other on tables), and /PHP/; potentially structured XML }~ and relational database~{ any SQL - currently PostgreSQL and /sqlite/ (for portability, testing and development) }~ presentations, retaining common data-structure and meta-information across the output/presentation formats. Several requirements of legal and scholarly publication on the web have been addressed, including the age old need to be able to reliably cite/pinpoint text within a document, to easily make footnotes/endnotes, to allow for semantic document meta-tagging, and to keep required markup to a minimum. These and other features of interest are listed and described below. A few points are worth making early (and will be repeated a number of times):
+SiSU is the data/information structuring and transforming tool, that has resulted from work on one of the oldest law web projects. It makes possible the one time, simple human readable markup of documents, that SiSU can then publish in various forms, suitable for paper~{ pdf via LaTeX }~, web~{ currently html (two forms of html presentation one based on css the other on tables), and /PHP/; potentially structured XML }~ and relational database~{ any SQL - currently PostgreSQL and /sqlite/ (for portability, testing and development) }~ presentations, retaining common data-structure and meta-information across the output/presentation formats. Several requirements of legal and scholarly publication on the web have been addressed, including the age old need to be able to reliably cite/pinpoint text within a document, to easily make footnotes/endnotes, to allow for semantic document meta-tagging, and to keep required markup to a minimum. These and other features of interest are listed and described below. A few points are worth making early (and will be repeated a number of times):
 
 _1 (i) The SiSU document generator was the first to place material on the web with a system that makes possible citation across different document types, with paragraph, or rather object citation numbering~{ previously called "text object numbering" }~ a text positioning system, available for the pinpointing of text, 1997, a simple idea from which much benefit, and SiSU remains today, to the best of my knowledge, the only multiple format e-book/ electronic-document system on the web that gives you this possibility (including for relational databases).
 
 _1 (ii) Markup is done once for the multiple formats produced.
 
-_1 (iii) Markup is simple, and human readable (with a little practice), in almost all cases there is less and simpler markup required than basic html. In any event the markup required is very much simpler than the html, LaTeX, [lout], structured XML, ODF (OpenDocument), PostgreSQL or SQLite feed etc. that you can have SiSU generate for you.
+_1 (iii) Markup is simple, and human readable (with a little practice), in almost all cases there is less and simpler markup required than basic html. In any event the markup required is very much simpler than the html, EPUB, LaTeX, [lout], structured XML, ODF (OpenDocument), PostgreSQL or SQLite feed etc. that you can have SiSU generate for you.
 
 _1 (iv) SiSU is a batch processor, dealing with as many files as you need to generate at a time.
 
@@ -76,11 +76,11 @@ SiSU Sabaki~{ SiSU Sabaki, release version. Pre-release version SiSU Scribe, and
 
 SiSU was born of the need to find a way, with minimal effort, and for as wide a range of document types as possible, to produce high quality publishing output in a variety of document formats. As such it was necessary to find a simple document representation that would work across a large number of document types, and the most convenient way(s) to produce acceptable output formats. The project leading to this program was started in 1993 (together with the trade law project now known as Lex Mercatoria) as an investigation of how to effectively/efficiently place documents on the web. The unified document handling, together with features such as paragraph numbering, endnote handling and tables... appeared in 1996/97. SiSU was originally written in Perl,~{ http://www.perl.org/ }~ and converted to Ruby,~{ http://www.ruby-lang.org/en/ }~ in 2000, one of the most impressive programming languages in existence! In its current form it has been written to run on the Gnu/Linux platform, and in particular on Debian,~{ http://www.debian.org/ }~ taking advantage of many of the wonderful projects that are available there.
 
-SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), XML (in this case, structural representation), ODF (OpenDocument [experimental]), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
+SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), EPUB, XML (in this case, structural representation), ODF (OpenDocument [experimental]), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
 
 From markup that is simpler and more sparse than html you get:
 
-_* far greater output possibilities, including html, XML, ODF (OpenDocument), LaTeX (pdf), and SQL;
+_* far greater output possibilities, including html, EPUB, XML, ODF (OpenDocument), LaTeX (pdf), and SQL;
 
 _* the advantages implicit in the very different output possibilities;
 
@@ -88,7 +88,7 @@ _* a common citation system (for all outputs - including the relational database
 
 For more see the short summary of features provided below.
 
-SiSU processes files with minimal tagging to produce various document outputs including html, LaTeX or lout (which is converted to pdf) and if required loads the structured information into an SQL database (PostgreSQL and SQLite have been used for this). SiSU produces an intermediate processing format.~{ This proved to be the easiest way to develop syntax, changes could be made, or alternatives provided for the markup syntax whilst the intermediate markup syntax was largely held constant. There is actually an optional second intermediate markup format in YAML http://www.yaml.org/ }~
+SiSU processes files with minimal tagging to produce various document outputs including html, EPUB, ODF, LaTeX (which is converted to pdf) and if required loads the structured information into an SQL database (PostgreSQL and SQLite have been used for this). SiSU produces an intermediate processing format.~{ This proved to be the easiest way to develop syntax, changes could be made, or alternatives provided for the markup syntax whilst the intermediate markup syntax was largely held constant. There is actually an optional second intermediate markup format in YAML http://www.yaml.org/ }~
 
 SiSU is used in constructing Lex Mercatoria http://lexmercatoria.org/ or http://www.jus.uio.no/lm/ (one of the oldest law web sites), and considerable thought went into producing output that would be suitable for legal and academic writings (that do not have formulae) given the limitations of html, and publication in a wide variety of "formats", in particular in relation to the convenient and accurate citation of text. However, the construction of Lex Mercatoria uses only a fraction of the features available from SiSU today, /vis/ generation of flat file structures, rather than in addition the building of ("granular") SQL database content, (at an object level with relevant relational tables, and other outputs also available).
 
@@ -109,10 +109,10 @@ notes:
 * markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions.
 
 !_ (iii)
-(a) multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; (structured) XML; ODF (Open Document text)l; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content). (b) takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))
+(a) multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; EPUB; (structured) XML; ODF (Open Document text)l; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content). (b) takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))
 
 !_ (iv)
-outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, XML, sqlite, postgresql), this numbering system can be used to reference content.
+outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, EPUB, XML, Opendocument, sqlite, postgresql), this numbering system can be used to reference content.
 
 !_ (v)
 SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperesteier].
@@ -147,7 +147,7 @@ possible to pre-process, which permits: the easy creation of standard form docum
 there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added.
 
 !_ (xv)
-there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added: (a) modular, (thanks in no small part to Ruby) another output format required, write another module.... (b) easy to update output formats (eg html, XHTML, LaTeX/PDF produced can be updated in program and run against whole document set), (c) easy to add, modify, or have alternative syntax rules for input, should you need to,
+there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added: (a) modular, (thanks in no small part to Ruby) another output format required, write another module.... (b) easy to update output formats (eg html, XHTML, EPUB, LaTeX/PDF produced can be updated in program and run against whole document set), (c) easy to add, modify, or have alternative syntax rules for input, should you need to,
 
 !_ (xvi)
 scalability, dependent on your file-system (ext3, Reiserfs, XFS, whatever) and on the relational database used (currently Postgresql and SQLite), and your hardware,
@@ -168,7 +168,7 @@ remote operations: (a) run SiSU on a remote server, (having prepared sisu markup
 document source may be bundled together (automatically) with associated documents (multiple language versions or master document with inclusions) and images and sent as a zip file called a sisupod, if shared on the net these too may be processed locally to produce the desired document outputs, these may be downloaded, shared as email attachments, or processed by running sisu against them, either using a url or the filename.
 
 !_ (xxii)
-for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
+for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, EPUB, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
 
 as a developers tool it is flexible and extensible
 
@@ -176,7 +176,7 @@ SiSU was developed in relation to legal documents, and is strong across a wide v
 
 SiSU has been developed and has been in use for several years. Requirements to cover a wide range of documents within its use domain have been explored.
 
-Some modules are more mature than others, the most mature being Html and LaTeX / pdf. PostgreSQL and search functions are useable and together with /ocn/ unique (to the best of my knowledge). The XML output document set is "well formed" but largely proof of concept.
+Some modules are more mature than others, the most mature being html and LaTeX / pdf. PostgreSQL and search functions are useable and together with /ocn/ unique (to the best of my knowledge). The XML output document set is "well formed" but largely proof of concept.
 
 2~ How it works
 
@@ -184,7 +184,7 @@ SiSU markup is fairly minimalistic, it consists of: a (largely optional) documen
 
 2~ Simple markup
 
-SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), XML (in this case, structural representation), ODF (OpenDocument), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
+SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), EPUB, XML (in this case, structural representation), ODF (OpenDocument), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
 
 3~ Sparse markup requirement, try to get the most out of markup
 
@@ -270,7 +270,7 @@ The object citation number markers contain additional numbering information with
 
 An advantage is that the numbering remains the same regardless of document structure.
 
-Text object ("paragraph") numbering is the same for all output versions of the same document, vis html, pdf, pgsql, yaml etc.
+Text object ("paragraph") numbering is the same for all output versions of the same document, vis html, epub, pdf, pgsql, etc.
 
 In the relational database, as individual text objects of a document stored (and indexed) together with object numbers, and all versions of the document have the same numbering, the results of searches may be tailored just to provide the location of the search result in all available document formats.
 
@@ -431,6 +431,10 @@ _* {~^ *w3m* }http://w3m.sourceforge.net/
 
 The html tables output is rendered more accurately across a wider variety set and older versions of browsers (than the html css output).
 
+3~ EPUB
+
+SiSU generates EPUB documents.
+
 3~ XML
 
 SiSU generates well formed XML, and multiple versions. An XML SAX version with a flat/shallow structure, and XML DOM version with a deeper (embedded) structure. There is also a released working xhtml module. Examples of SAX and DOM versions are provided within this document.
@@ -478,7 +482,7 @@ This is a larger scale project, (with little development on the front end largel
 {~^ Sample search frontend }http://search.sisudoc.org
 A small database and sample query front-end (search from) that makes use of the citation system, _{object citation numbering}_ to demonstrates functionality.~{ (which could be extended further with current back-end). As regards scaling of the database, it is as scalable as the database (here Postgresql) and hardware allow. }~
 
-SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, XML, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
+SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, EPUB, XML, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
 
 (further work needs to be done on the sample search form, which is rudimentary and only passes simple booleans correctly at present to the SQL engine)
 
@@ -507,7 +511,7 @@ Expand those same searches, showing the matching text in each document:
 Note you may set results either for documents matched and object number locations within each matched document meeting the search criteria; or display the names of the documents matched along with the objects (paragraphs) that meet the search criteria.~{ of this feature when demonstrated to an IBM software innovations evaluator in 2004 he said to paraphrase: this could be of interest to us. We have large document management systems, you can search hundreds of thousands of documents and we can tell you which documents meet your search criteria, but there is no way we can tell you without opening each document where within each your matches are found. }~
 
 !_ OCN index mode,
-(object citation number) the numbers displayed are relevant (and may be used to reference the match) in any sisu generated rendition of the text~{ OCN are provided for HTML, XML, pdf ... though currently omitted in plain-text and opendocument format output }~ the links provided are to the locations of matches within the html generated by SiSU.
+(object citation number) the numbers displayed are relevant (and may be used to reference the match) in any sisu generated rendition of the text~{ OCN are provided for HTML, XML, EPUB, pdf ... though currently omitted in plain-text and opendocument format output }~ the links provided are to the locations of matches within the html generated by SiSU.
 
 !_ Paragraph mode,
 you may alternatively display the text of each paragraph in which the match was made, again the object/paragraph numbers are relevant to any SiSU generated/published text.
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
index 12e75603..edd4699e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
@@ -87,7 +87,7 @@ _1 man sisu_webrick
 
 2~ sisu generated output - links to html
 
-Note SiSU documentation is prepared in SiSU and output is available in multiple formats including amongst others html, pdf, and odf which may be also be accessed via the html pages~{ named index.html or more extensively through sisu_manifest.html }~
+Note SiSU documentation is prepared in SiSU and output is available in multiple formats including amongst others html, pdf, odf and epub, which may be also be accessed via the html pages~{ named index.html or more extensively through sisu_manifest.html }~
 
 3~ www.sisudoc.org
 
@@ -147,21 +147,21 @@ _1 http://sisudoc.org/sisu/sisu_webrick/index.html
 
 3~ locally installed
 
-file:///usr/share/doc/sisu/html/sisu.1.html
+file:///usr/share/doc/sisu/v2/html/sisu.1.html
 
-file:///usr/share/doc/sisu/html/sisu_help.1.html
+file:///usr/share/doc/sisu/v2/html/sisu_help.1.html
 
-file:///usr/share/doc/sisu/html/sisu_help_sources.1.html
+file:///usr/share/doc/sisu/v2/html/sisu_help_sources.1.html
 
-_1 /usr/share/doc/sisu/html/sisu.1.html
+_1 /usr/share/doc/sisu/v2/html/sisu.1.html
 
-_1 /usr/share/doc/sisu/html/sisu_pdf.7.html
+_1 /usr/share/doc/sisu/v2/html/sisu_pdf.7.html
 
-_1 /usr/share/doc/sisu/html/sisu_postgresql.7.html
+_1 /usr/share/doc/sisu/v2/html/sisu_postgresql.7.html
 
-_1 /usr/share/doc/sisu/html/sisu_sqlite.7.html
+_1 /usr/share/doc/sisu/v2/html/sisu_sqlite.7.html
 
-_1 /usr/share/doc/sisu/html/sisu_webrick.1.html
+_1 /usr/share/doc/sisu/v2/html/sisu_webrick.1.html
 
 3~ www.jus.uio.no/sisu
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst
index 991244dc..597dfbc3 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst
@@ -139,7 +139,7 @@ aptitude install sisu-sqlite
 
 ideally copy the sisu-examples directory to your home directory (because the directory in which you run this example should be writable)
 
-cp -rv /usr/share/sisu-examples/sample/document_samples_sisu_markup ~/.
+cp -rv /usr/share/doc/sisu-markup-samples/v2/samples /.
 
 !_ (3) use sisu to create an sqlite database
 
@@ -180,7 +180,7 @@ sisu -F webrick
 
 the string should be provided as output from the previous command
 
-sudo cp -vi /usr/share/sisu-examples/sample/document_samples_sisu_markup/sisu_sqlite.cgi /usr/lib/cgi-bin
+sudo cp -vi /usr/share/doc/sisu-markup-samples/v2/samples/sisu_sqlite.cgi /usr/lib/cgi-bin
 
 sudo chmod -v 755 /usr/lib/cgi-bin/sisu_sqlite.cgi
 
@@ -301,7 +301,7 @@ _1 data/sisu-examples/sample/document_samples_sisu_markup/
 
 or the same once source is installed (or sisu-examples) under:
 
-_1 /usr/share/sisu-examples/sample/document_samples_sisu_markup/
+_1 /usr/share/doc/sisu-markup-samples/v2/samples
 
 Some notes are contained within the man page, *{man sisu}* and within sisu help via the commands *{sisu help markup}* and *{sisu help headers}*
 
@@ -572,7 +572,7 @@ and on installation under:
 
 _1 /etc/sisu/skin/doc/
 
-_1 /usr/share/sisu-examples/sample/document_samples_sisu_markup/_sisu/skin/doc
+_1 /usr/share/doc/sisu-markup-samples/v2/samples/_sisu/skin/doc
 
 The following paths are searched:
 
@@ -630,7 +630,7 @@ Homepage: http://www.jus.uio.no/sisu
 
 SiSU is lightweight markup based document creation and publishing framework that is controlled from the command line. Prepare documents for SiSU using your text editor of choice, then use SiSU to generate various output document formats.
 
-With minimal preparation of a plain-text (UTF-8) file using its native markup-syntax, SiSU produces: plain-text, HTML, XHTML, XML, ODF:ODT (Opendocument), LaTeX, PDF, and populates an SQL database (PostgreSQL or SQLite) in paragraph sized chunks so that document searches are done at this "atomic" level of granularity.
+With minimal preparation of a plain-text (UTF-8) file using its native markup-syntax, SiSU produces: plain-text, HTML, XHTML, EPUB, XML, ODF:ODT (Opendocument), LaTeX, PDF, and populates an SQL database (PostgreSQL or SQLite) in paragraph sized chunks so that document searches are done at this "atomic" level of granularity.
 
 Outputs share a common citation numbering system, and any semantic meta-data provided about the document.
 
@@ -874,17 +874,16 @@ Description: documents - structuring, publishing in multiple formats and search
  structuring, publishing and search framework for document collections.
  .
  With minimal preparation of a plain-text, (UTF-8) file, using its native
- markup syntax in your text editor of choice, SiSU can generate various
- document formats (most of which share a common object numbering system for
- locating content), including plain text, HTML, XHTML, XML, OpenDocument text
- (ODF:ODT), LaTeX, PDF files, and populate an SQL database with objects
- (roughly paragraph-sized chunks) so searches may be performed and matches
- returned with that degree of granularity: your search criteria is met by these
- documents and at these locations within each document. Object numbering is
- particularly suitable for "published" works (finalized texts as opposed to
- works that are frequently changed or updated) for which it provides a fixed
- means of reference of content. Document outputs also share semantic meta-data
- provided.
+markup syntax in your text editor of choice, SiSU can generate various document
+formats (most of which share a common object numbering system for locating
+content), including plain text, HTML, XHTML, EPUB, XML, OpenDocument text
+(ODF:ODT), LaTeX, PDF files, and populate an SQL database with objects (roughly
+paragraph-sized chunks) so searches may be performed and matches returned with
+that degree of granularity: your search criteria is met by these documents and
+at these locations within each document. Object numbering is particularly
+suitable for "published" works (finalized texts as opposed to works that are
+frequently changed or updated) for which it provides a fixed means of reference
+of content. Document outputs also share semantic meta-data provided.
  .
  SiSU also provides concordance files, document content certificates and
  manifests of generated output.
@@ -1014,7 +1013,7 @@ the first document).
 
 After installation of sisu-complete, move to the document samples directory
 
-_1 cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
+_1 cd /usr/share/doc/sisu/v2/sisu_markup_samples/samples
 
 and run
 
@@ -1169,7 +1168,7 @@ _1 ./data/doc/sisu/sisu_markup_samples/dfsg
 
 These are installed on the system usually at:
 
-_1 /usr/share/doc/sisu/sisu_markup_samples/dfsg
+_1 /usr/share/doc/sisu/v2/sisu_markup_samples/samples
 
 More markup samples are available in the package sisu-markup-samples
 
@@ -1187,7 +1186,7 @@ _1 ./data/sisu/conf/syntax
 
 usually installed to:
 
-_1 /usr/share/sisu/conf/syntax
+_1 /usr/share/sisu/v2/conf/syntax
 
 2~ License
 
@@ -1231,7 +1230,7 @@ _1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
 
 After installation of sisu-complete, move to the document samples directory,
 
-_1 cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
+_1 cd /usr/share/doc/sisu/v2/sisu_markup_samples/samples
 
 [this is not where you would normally work but provides sample documents for
 testing, you may prefer instead to copy the contents of that directory to a local
@@ -1303,7 +1302,7 @@ _1 mkdir ~/sisu_test
 
 _1 cd ~/sisu_test
 
-_1 cp -a /usr/share/doc/sisu/sisu_markup_samples/dfsg/* ~/sisu_test/.
+_1 cp -a /usr/share/doc/sisu/v2/sisu_markup_samples/samples/* ~/sisu_test/.
 
 !_ Tip:
 the markup syntax examples may be of interest
@@ -1349,7 +1348,7 @@ Package: sisu
 
 SiSU is a lightweight markup based, command line oriented, document structuring, publishing and search framework for document collections.
 
-With minimal preparation of a plain-text, (UTF-8) file, using its native markup syntax in your text editor of choice, SiSU can generate various document formats (most of which share a common object numbering system for locating content), including plain text, HTML, XHTML, XML, OpenDocument text (ODF:ODT), LaTeX, PDF files, and populate an SQL database with objects (roughly paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity: your search criteria is met by these documents and at these locations within each document. Object numbering is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content. Document outputs also share semantic meta-data provided.
+With minimal preparation of a plain-text, (UTF-8) file, using its native markup syntax in your text editor of choice, SiSU can generate various document formats (most of which share a common object numbering system for locating content), including plain text, HTML, XHTML, XML, OpenDocument text (ODF:ODT), EPUB, LaTeX, PDF files, and populate an SQL database with objects (roughly paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity: your search criteria is met by these documents and at these locations within each document. Object numbering is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content. Document outputs also share semantic meta-data provided.
 
 SiSU also provides concordance files, document content certificates and manifests of generated output.
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst
index bd4af2ae..e2df51d0 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst
@@ -48,17 +48,17 @@
 
 SiSU is a framework for document structuring, publishing (in multiple open standard formats) and search, comprising of: (a) a lightweight document structure and presentation markup syntax; and (b) an accompanying engine for generating standard document format outputs from documents prepared in sisu markup syntax, which is able to produce multiple standard outputs (including the population of sql databases) that (can) share a common numbering system for the citation of text within a document.
 
-SiSU is developed under an open source, software libre license (GPL3). Its use case for development is to cope with medium to large document sets with evolving markup related technologies, which should be prepared once, and for which you want multiple output formats that can be updated and a common mechanism for cross-output-format citation, and search.
+SiSU is developed under an open source, software libre license (GPL3). Its use case for development is work with medium to large document sets and cope with evolving document formats/ representation technologies. Documents are prepared once, and generated as need be to update the technical presentation or add additional output formats. Various output formats (including search related output) share a common mechanism for cross-output-format citation.
 
-SiSU both defines a markup syntax and provides an engine that produces open standards format outputs from documents prepared with SiSU markup. From a single lightly prepared document sisu custom builds several standard output formats which share a common (text object) numbering system for citation of content within a document (that also has implications for search). The sisu engine works with an abstraction of the document's structure and content from which it is possible to generate different forms of representation of the document. Significantly SiSU markup is more sparse than html and outputs which include html, LaTeX, landscape and portrait pdfs, Open Document Format (ODF), all of which can be added to and updated. SiSU is also able to populate SQL type databases at an object level, which means that searches can be made with that degree of granularity.
+SiSU both defines a markup syntax and provides an engine that produces open standards format outputs from documents prepared with SiSU markup. From a single lightly prepared document sisu custom builds several standard output formats which share a common (text object) numbering system for citation of content within a document (that also has implications for search). The sisu engine works with an abstraction of the document's structure and content from which it is possible to generate different forms of representation of the document. Significantly SiSU markup is more sparse than html and outputs which include html, EPUB, LaTeX, landscape and portrait pdfs, Open Document Format (ODF), all of which can be added to and updated. SiSU is also able to populate SQL type databases at an object level, which means that searches can be made with that degree of granularity.
 
-Source document preparation and output generation is a two step process: (i) document source is prepared, that is, marked up in sisu markup syntax and (ii) the desired output subsequently generated by running the sisu engine against document source. Output representations if updated (in the sisu engine) can be generated by re-running the engine against the prepared source. Using SiSU markup applied to a document, SiSU custom builds (to take advantage of the strengths of different ways of representing documents) various standard open output formats including plain text, HTML, XHTML, XML, OpenDocument, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity ( e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
+Source document preparation and output generation is a two step process: (i) document source is prepared, that is, marked up in sisu markup syntax and (ii) the desired output subsequently generated by running the sisu engine against document source. Output representations if updated (in the sisu engine) can be generated by re-running the engine against the prepared source. Using SiSU markup applied to a document, SiSU custom builds (to take advantage of the strengths of different ways of representing documents) various standard open output formats including plain text, HTML, XHTML, XML, EPUB, OpenDocument, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity ( e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
 
-In preparing a SiSU document you optionally provide semantic information related to the document in a document header, and in marking up the substantive text provide information on the structure of the document, primarily indicating heading levels and footnotes. You also provide information on basic text attributes where used. The rest is automatic, sisu from this information custom builds~{ i.e. the html, pdf, odf outputs are each built individually and optimised for that form of presentation, rather than for example the html being a saved version of the odf, or the pdf being a saved version of the html. }~ the different forms of output requested.
+In preparing a SiSU document you optionally provide semantic information related to the document in a document header, and in marking up the substantive text provide information on the structure of the document, primarily indicating heading levels and footnotes. You also provide information on basic text attributes where used. The rest is automatic, sisu from this information custom builds~{ i.e. the html, pdf, epub, odf outputs are each built individually and optimised for that form of presentation, rather than for example the html being a saved version of the odf, or the pdf being a saved version of the html. }~ the different forms of output requested.
 
-SiSU works with an abstraction of the document based on its structure which is comprised of its structure (or frame)~{ the different heading levels }~ and the objects~{ units of text, primarily paragraphs and headings, also any tables, poems, code-blocks }~ it contains, which enables SiSU to represent the document in many different ways, and to take advantage of the strengths of different ways of presenting documents. The objects are numbered, and these numbers can be used to provide a common base for citing material within a document across the different output format types. This is significant as page numbers are not well suited to the digital age, in web publishing, changing a browser's default font or using a different browser means that text appears on different pages; and in publishing in different formats, html, landscape and portrait pdf etc. again page numbers are of no use to cite text in a manner that is relevant against the different output types. Dealing with documents at an object level together with object numbering also has implications for search.
+SiSU works with an abstraction of the document based on its structure which is comprised of its headings~{ the different heading levels }~ and objects~{ units of text, primarily paragraphs and headings, also any tables, poems, code-blocks }~, which enables SiSU to represent the document in many different ways, and to take advantage of the strengths of different ways of presenting documents. The objects are numbered, and these numbers can be used to provide a common basis for citing material within a document across the different output format types. This is significant as page numbers are not well suited to the digital age, in web publishing, changing a browser's default font or using a different browser can mean that text will appear on a different page; and publishing in different formats, html, landscape and portrait pdf etc. again page numbers are not useful to cite text. Dealing with documents at an object level together with object numbering also has implications for search that SiSU is able to take advantage of.
 
-One of the challenges of maintaining documents is to keep them in a format that would allow users to use them without depending on a proprietary software popular at the time. Consider the ease of dealing with legacy proprietary formats today and what guarantee you have that old proprietary formats will remain (or can be read without proprietary software/equipment) in 15 years time, or the way the way in which html has evolved over its relatively short span of existence. SiSU provides the flexibility of outputing documents in multiple non-proprietary open formats including html, pdf~{ Specification submitted by Adobe to ISO to become a full open ISO specification <br> http://www.linux-watch.com/news/NS7542722606.html }~ and the ISO standard ODF.~{ ISO/IEC 26300:2006 }~ Whilst SiSU relies on software, the markup is uncomplicated and minimalistic which guarantees that future engines can be written to run against it. It is also easily converted to other formats, which means documents prepared in SiSU can be migrated to other document formats. Further security is provided by the fact that the software itself, SiSU is available under GPL3 a licence that guarantees that the source code will always be open, and free as in libre which means that that code base can be used, updated and further developed as required under the terms of its license. Another challenge is to keep up with a moving target. SiSU permits new forms of output to be added as they become important, (Open Document Format text was added in 2006 when it became an ISO standard for office applications and the archival of documents), and existing output to be updated (html has evolved and the related module has been updated repeatedly over the years, presumably when the World Wide Web Consortium (w3c) finalises html 5 which is currently under development, the html module will again be updated allowing all existing documents to be regenerated as html 5).
+One of the challenges of maintaining documents is to keep them in a format that allows use of them independently of proprietary platforms. Consider issues related to dealing with legacy proprietary formats today and what guarantee you have that old proprietary formats will remain (or can be read without proprietary software/equipment) in 15 years time, or the way the way in which html has evolved over its relatively short span of existence. SiSU provides the flexibility of producing documents in multiple non-proprietary open formats including html, pdf~{ Specification submitted by Adobe to ISO to become a full open ISO specification <br> http://www.linux-watch.com/news/NS7542722606.html }~ ODF,~{ ISO standard ISO/IEC 26300:2006 }~ and EPUB.~{ An open standard format for e-books }~ Whilst SiSU relies on software, the markup is uncomplicated and minimalistic which guarantees that future engines can be written to run against it. It is also easily converted to other formats, which means documents prepared in SiSU can be migrated to other document formats. Further security is provided by the fact that the software itself, SiSU is available under GPL3 a licence that guarantees that the source code will always be open, and free as in libre, which means that that code base can be used, updated and further developed as required under the terms of its license. Another challenge is to keep up with a moving target. SiSU permits new forms of output to be added as they become important, (Open Document Format text was added in 2006 when it became an ISO standard for office applications and the archival of documents), EPUB was introduced in 2009; and allows the technical representations existing output to be updated (html has evolved and the related module has been updated repeatedly over the years, presumably when the World Wide Web Consortium (w3c) finalises html 5 which is currently under development, the html module will again be updated allowing all existing documents to be regenerated as html 5).
 
 The document formats are written to the file-system and available for indexing by independent indexing tools, whether off the web like Google and Yahoo or on the site like Lucene and Hyperestraier.
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
index 5b6ac4aa..c155e027 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -436,7 +436,7 @@ _# numbered list numbered list indented a., b., c., d., etc.
 
 2~ Footnotes / Endnotes
 
-Footnotes and endnotes not distinguished in markup. They are automatically numbered. Depending on the output file format (html, odf, pdf etc.), the document output selected will have either footnotes or endnotes.
+Footnotes and endnotes not distinguished in markup. They are automatically numbered. Depending on the output file format (html, EPUB, odf, pdf etc.), the document output selected will have either footnotes or endnotes.
 
 !_ markup example:
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
index fcf35855..ea995c36 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
@@ -50,7 +50,7 @@
 This table gives an indication of the features that are available
 for various forms of output of SiSU.
 
-!_ sisu-0.72.0 on 2009-10-28
+!_ sisu-2.0.0 on 2010-03-06
 
 {table~h 28}
 feature                   |txt|ltx/pdf|HTML|EPUB|XML/s|XML/d|ODF|SQLite|pgSQL
@@ -81,6 +81,37 @@ auto-heading numbers      | * | *     | *  | *  | *   | *   | * | *    | *
 minor list numbering      | * | *     | *  | *  | *   | *   | * | *    | *
 special characters        | . | .     | .  | .  |     |     |   |      |
 
+!_ sisu-1.0.0 on 2009-10-28
+
+{table~h 28}
+feature                   |txt|ltx/pdf|HTML|XML/s|XML/d|ODF|SQLite|pgSQL
+headings                  | * | *     | *  | *   | *   | * | *    | *
+footnotes                 | * | *     | *  | *   | *   | * | *    | *
+bold, underscore, italics | . | *     | *  | *   | *   | * | *    | *
+strikethrough             | . | *     | *  | *   | *   | * |      |
+superscript, subscript    | . | *     | *  | *   | *   | * |      |
+extended ascii set (utf-8)| * | *     | *  | *   | *   | * |      | *
+indents                   | * | *     | *  | *   | *   | * |      |
+bullets                   | . | *     | *  | *   | *   | . |      |
+groups                    |   |       |    |     |     |   |      |
+* tables                  |   | *     | *  | .   | .   | . | .    | .
+* poem                    | * | *     | *  | .   | .   | * | .    | .
+* code                    | * | *     | *  | .   | .   | * | .    | .
+url                       | * | *     | *  | *   | *   | * | .    | .
+links                     | * | *     | *  | *   | *   | * | .    | .
+images                    | - | *     | *  | T   | T   | * | T    | T
+image caption             | - | *     | *  |     |     |   |      |
+table of contents         |   | *     | *  | *   | *   | . |      |
+page header/footer?       | - | *     | *  | *   | *   | t |      |
+line break                | * | *     | *  | *   | *   | * |      |
+page break                |   | *     |    |     |     | * |      |
+segments                  |   |       | *  |     |     |   |      |
+skins                     | * | *     | *  | *   | *   |   |      |
+ocn                       | . | *     | *  | *   | *   | -?| *    | *
+auto-heading numbers      | * | *     | *  | *   | *   | * | *    | *
+minor list numbering      | * | *     | *  | *   | *   | * | *    | *
+special characters        | . | .     | .  |     |     |   |      |
+
 !_ sisu-0.36.6 on 2006-01-23
 
 {table~h 28; 8; 8; 8; 8; 8; 8; 8; 8; 8;}
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
index 1467bd47..a31c0f9f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
@@ -126,7 +126,7 @@ _* Unpack the source
 
 Two alternative modes of installation from source are provided, setup.rb (by Minero Aoki) and a rant(by Stefan Lang) built install file, in either case: the first steps are the same, download and unpack the source file:
 
-For basic use SiSU is only dependent on the programming language in which it is written Ruby, and SiSU will be able to generate html, various XMLs, including ODF (and will also produce LaTeX). Dependencies required for further actions, though it relies on the installation of additional dependencies which the source tarball does not take care of, for things like using a database (postgresql or sqlite)~{ There is nothing to stop MySQL support being added in future. }~ or converting LaTeX to pdf.
+For basic use SiSU is only dependent on the programming language in which it is written Ruby, and SiSU will be able to generate html, EPUB, various XMLs, including ODF (and will also produce LaTeX). Dependencies required for further actions, though it relies on the installation of additional dependencies which the source tarball does not take care of, for things like using a database (postgresql or sqlite)~{ There is nothing to stop MySQL support being added in future. }~ or converting LaTeX to pdf.
 
 !_ setup.rb
 
@@ -193,7 +193,7 @@ change directory to the appropriate one:
 
 cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
 
-3~ basic text, plaintext, html, XML, ODF
+3~ basic text, plaintext, html, XML, ODF, EPUB
 
 Having moved to the directory that contains the markup samples (see instructions above if necessary), choose a file and run sisu against it
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
index 982a6c54..e93f1e2b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
@@ -51,7 +51,7 @@
 {~^ Sample search frontend }http://search.sisudoc.org
 A small database and sample query front-end (search from) that makes use of the citation system, _{object citation numbering}_ to demonstrates functionality.~{ (which could be extended further with current back-end). As regards scaling of the database, it is as scalable as the database (here Postgresql) and hardware allow. }~
 
-SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, XML, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
+SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, XML, EPUB, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
 
 Note you may set results either for documents matched and object number locations within each matched document meeting the search criteria; or display the names of the documents matched along with the objects (paragraphs) that meet the search criteria.~{ of this feature when demonstrated to an IBM software innovations evaluator in 2004 he said to paraphrase: this could be of interest to us. We have large document management systems, you can search hundreds of thousands of documents and we can tell you which documents meet your search criteria, but there is no way we can tell you without opening each document where within each your matches are found. }~
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
index 72ec2370..0009352e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
@@ -51,7 +51,7 @@ _* sparse/minimal markup (clean utf-8 source texts). Documents are prepared in a
 
 _* markup is easily readable/parsable by the human eye, (basic markup is simpler and more sparse than the most basic HTML), [this may also be converted to XML representations of the same input/source document].
 
-_* markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions. SiSU markup is primarily an abstraction of document structure and document metadata to permit taking advantage of the basic strengths of existing alternative practical standard ways of representing documents [be that browser viewing, paper publication, sql search etc.] (html, xml, odf, latex, pdf, sql)
+_* markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions. SiSU markup is primarily an abstraction of document structure and document metadata to permit taking advantage of the basic strengths of existing alternative practical standard ways of representing documents [be that browser viewing, paper publication, sql search etc.] (html, epub, xml, odf, latex, pdf, sql)
 
 _* for output produces reasonably elegant output of established industry and institutionally accepted open standard formats.[3] takes advantage of the different strengths of various standard formats for representing documents, amongst the output formats currently supported are:
 
@@ -59,6 +59,8 @@ _1* html - both as a single scrollable text and a segmented document
 
 _1* xhtml
 
+_1* epub
+
 _1* XML - both in sax and dom style xml structures for further development as required
 
 _1* ODF - open document format, the iso standard for document storage
@@ -71,11 +73,11 @@ _1* sql - population of an sql database, (at the same object level that is used
 
 Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content). (b) takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))
 
-_* ensuring content can be cited in a meaningful way regardless of selected output format. Online publishing (and publishing in multiple document formats) lacks a useful way of citing text internally within documents (important to academics generally and to lawyers) as page numbers are meaningless across browsers and formats. sisu seeks to provide a common way of pinpoint the text within a document, (which can be utilized for citation and by search engines). The outputs share a common numbering system that is meaningful (to man and machine) across all digital outputs whether paper, screen, or database oriented, (pdf, HTML, xml, sqlite, postgresql), this numbering system can be used to reference content.
+_* ensuring content can be cited in a meaningful way regardless of selected output format. Online publishing (and publishing in multiple document formats) lacks a useful way of citing text internally within documents (important to academics generally and to lawyers) as page numbers are meaningless across browsers and formats. sisu seeks to provide a common way of pinpoint the text within a document, (which can be utilized for citation and by search engines). The outputs share a common numbering system that is meaningful (to man and machine) across all digital outputs whether paper, screen, or database oriented, (pdf, HTML, EPUB, xml, sqlite, postgresql), this numbering system can be used to reference content.
 
 _* Granular search within documents. SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperestraier].
 
-_* long term maintainability of document collections in a world of changing formats, having a very sparsely marked-up source document base. there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added. e.g. addition of odf (open document text) module in 2006 and in future html5 output sometime in future, without modification of existing prepared texts
+_* long term maintainability of document collections in a world of changing formats, having a very sparsely marked-up source document base. there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added. e.g. addition of odf (open document text) module in 2006, epub in 2009 and in future html5 output sometime in future, without modification of existing prepared texts
 
 _* SQL search aside, documents are generated as required and static once generated.
 
@@ -87,7 +89,7 @@ _* document source may be bundled together (automatically) with associated docum
 
 _* generated document outputs may automatically be posted to remote sites.
 
-_* for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, HTML, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to pdf, a latex processor like tetex or texlive.
+_* for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, HTML, EPUB, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to pdf, a latex processor like tetex or texlive.
 
 _* as a developers tool it is flexible and extensible
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst
index dfc5c4a6..9cff0ed7 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst
@@ -92,11 +92,11 @@ A site skin, modifies the program default skin.
 
 With SiSU installed sample skins may be found in:
 
-_1 /etc/sisu/skin/doc and /usr/share/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc
+_1 /etc/sisu/skin/doc and /usr/share/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc
 
 (or equivalent directory) and if sisu-markup-samples is installed also under:
 
-_1 /usr/share/doc/sisu/sisu_markup_samples/non-free/_sisu/skin/doc
+_1 /usr/share/doc/sisu-markup-samples/v2/samples/_sisu/skin/doc
 
 Samples of list.yml and promo.yml (which are used to create the right column list) may be found in:
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_synopsis.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_synopsis.ssi
new file mode 100644
index 00000000..909cb2c2
--- /dev/null
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_synopsis.ssi
@@ -0,0 +1,64 @@
+% SiSU 2.0
+
+@title: SiSU
+ :subtitle: Commands
+
+@creator: :author: Amissah, Ralph
+
+@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+
+@classify:
+ :type: information
+ :topic_register: electronic documents:SiSU:document:commands;SiSU:manual:commands;electronic documents:SiSU:manual:commands;SiSU:document:commands;SiSU:document:commands
+ :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
+
+% used_by: sisu_manual SiSU.ssm
+
+@date:
+ :created: 2002-08-28
+ :issued: 2002-08-28
+ :available: 2002-08-28
+ :published: 2007-09-16
+ :modified: 2009-12-16
+
+@make:
+ :num_top: 1
+ :breaks: new=C; break=1
+ :skin: skin_sisu_manual
+ :bold: /Gnu|Debian|Ruby|SiSU/
+
+@links:
+ { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
+ { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
+ { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+ { SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
+ { SiSU @ Ruby Application Archive }http://raa.ruby-lang.org/project/sisu/
+ { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+ { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
+ { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+ { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
+ { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
+
+:A~? @title @creator
+
+:B~? SiSU Commands
+
+1~ Synopsis
+
+SiSU - Structured information, Serialized Units - a document publishing system
+
+sisu [ -abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9 ] [ filename/ wildcard ]
+
+sisu [ -Ddcv ] [ instruction ]
+
+sisu [ -CcFLSVvW ]
+
+Note: commands should be issued from within the directory that contains the marked up files, cd to markup directory.
+
+sisu is at version 2, to use sisu version 1
+
+sisu --v1 [and options/operations as above]
+
+for settings see sisu --help env
+
+sisu [ filename/ wildcard] == sisu -0 [filename/wildcard]