markup samples, manual, headers: links and other details

1 files changed, 19 insertions, 20 deletions

diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst
index 44a5a590..76a594ac 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst
@@ -1,9 +1,10 @@
-% SiSU 3.0
+% SiSU 2.0
 
 @title: SiSU
  :subtitle: FAQ - Frequently Asked/Answered Questions
 
-@creator: :author: Amissah, Ralph
+@creator:
+ :author: Amissah, Ralph
 
 @classify:
  :type: information
@@ -12,7 +13,8 @@
 
 % used_by: manual SiSU.ssm
 
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights:
+ :copyright: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
 @date:
  :published: 2008-03-12
@@ -28,16 +30,16 @@
  :bold: /Gnu|Debian|Ruby|SiSU/
 
 @links:
- { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
- { Book Samples and Markup Examples }../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 Homepage }http://www.sisudoc.org/
+ { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
+ { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.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/
+ { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
+ { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
+ { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+ { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+ { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
 
 :A~? @title @creator
 
@@ -205,17 +207,14 @@ None. In the early days of its release a Mac friend built and run the ruby code
 
 It should however be possible, much of the output relies on plain ruby, and the system commands to latex etc. could be made appropriate for the underlying OS.
 
-2~ Where is version 1.0?
+2~ Where is version 1?
 
-Most of SiSU is mature and stable.
-Version 1.0 will be based on the current markup, (more likely with optional additions rather than significant changes) and directory structure.
-At this point (semantic tagging apart) it is largely a matter of choice as to when the version change is made.
+Version 1 was finally released on December 21, 2009, and largely to make a version 1 branch available as version 2 was in the pipeline with an imminent release. Most of SiSU was mature and stable long before the release of version 1.
 
-The feature set for html,~{ html w3c compliance has been largely met. }~ LaTeX/pdf and opendocument is in place.
-XML, and plaintext are in order.
+2~ What is the difference between version 1 and 2?
 
-html and LaTeX/pdf may be regarded as reference copy outputs
+Input and output of version 1 and 2 are largely the same with the following significant exceptions. On the input side, document headers, that is metadata and processing instructions have changed in version 2. On the output side, version 2 was introduced with EPUB documents as a possible output, and over time is likely to be developed further.
 
-With regard to the populating of sql databases (postgresql and sqlite), there is a bit to be done.
+Version 2 introduces a new processing layer, which relies more on the programming language Ruby's objects (and regular expressions), than version 1 does which relies on regular expressions. The thinking behind version 1 use of regular expressions was that it made it more straightforward to switch languages for processing, as many languages support regular expressions; the thinking behind version 2 was version 1 was more complicated than it need be, and since Ruby was the language used, why not make programming more straightforward, as it would be easier to develop further.
 
-We are still almost there.
+Version 1 was removed with the introduction of the version 3 development branch