manual Rakefile, README & minor config adjustmentsisu_5.3.2

8 files changed, 50 insertions, 22 deletions

diff --git a/README b/README
index e0550c83..82bf5466 100644
--- a/README
+++ b/README
@@ -1552,21 +1552,21 @@ TREE
 
 */"Viral Spiral"/, David Bollier*
 
-"Viral Spiral", David Bollier [link: <http://niu/manual/en/manifest/viral_spiral.david_bollier.html>]
-      document manifest [link: <http://niu/manual/en/manifest/viral_spiral.david_bollier.html>]
-      html, segmented text [link: <http://niu/manual/en/html/viral_spiral.david_bollier/toc.html>]
-      html, scroll, document in one [link: <http://niu/manual/en/html/viral_spiral.david_bollier.html>]
-      epub [link: <http://niu/manual/en/epub/viral_spiral.david_bollier.epub>]
-      pdf, landscape [link: <http://niu/manual/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
-      pdf, portrait [link: <http://niu/manual/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
-      odf: odt, open document text [link: <http://niu/manual/en/odt/viral_spiral.david_bollier.odt>]
-      xhtml scroll [link: <http://niu/manual/en/xhtml/viral_spiral.david_bollier.xhtml>]
-      xml, sax [link: <http://niu/manual/en/xml_sax/viral_spiral.david_bollier.sax.xml>]
-      xml, dom [link: <http://niu/manual/en/xml_dom/viral_spiral.david_bollier.dom.xml>]
-      concordance [link: <http://niu/manual/en/html/viral_spiral.david_bollier/concordance.html>]
-      dcc, document content certificate (digests) [link: <http://niu/manual/en/digest/viral_spiral.david_bollier.hash_digest.txt>]
-      markup source text [link: <http://niu/manual/en/src/viral_spiral.david_bollier.sst>]
-      markup source (zipped) pod [link: <http://niu/manual/en/src/viral_spiral.david_bollier.sst.zip>]
+"Viral Spiral", David Bollier [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
+      document manifest [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
+      html, segmented text [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/viral_spiral.david_bollier.toc.html>]
+      html, scroll, document in one [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier.html>]
+      epub [link: <http://www.sisudoc.org/sisu/en/epub/viral_spiral.david_bollier.epub>]
+      pdf, landscape [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
+      pdf, portrait [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
+      odf: odt, open document text [link: <http://www.sisudoc.org/sisu/en/odt/viral_spiral.david_bollier.odt>]
+      xhtml scroll [link: <http://www.sisudoc.org/sisu/en/xhtml/viral_spiral.david_bollier.xhtml>]
+      xml, sax [link: <http://www.sisudoc.org/sisu/en/xml_sax/viral_spiral.david_bollier.sax.xml>]
+      xml, dom [link: <http://www.sisudoc.org/sisu/en/xml_dom/viral_spiral.david_bollier.dom.xml>]
+      concordance [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/concordance.html>]
+      dcc, document content certificate (digests) [link: <http://www.sisudoc.org/sisu/en/digest/viral_spiral.david_bollier.hash_digest.txt>]
+      markup source text [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst>]
+      markup source (zipped) pod [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst.zip>]
 
 GROUPED TEXT
 ............
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 925b03f2..d9dc1349 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -44,6 +44,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.2.orig.tar.xz
 
 * sysenv, concordance redirected paths, watch
 
+* manual Rakefile, README & minor config adjustment
+
 %% 5.3.1.orig.tar.xz (2014-02-05:05/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.1
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.1-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index de699c73..2057fadc 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -34,6 +34,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.2.orig.tar.xz
 
 * sysenv, concordance redirected paths, watch
 
+* manual Rakefile, README & minor config adjustment
+
 %% 6.0.1.orig.tar.xz (2014-02-05:05/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.1
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.1-1
diff --git a/data/doc/sisu/markup-samples/manual/README b/data/doc/sisu/markup-samples/manual/README
new file mode 100644
index 00000000..76b55552
--- /dev/null
+++ b/data/doc/sisu/markup-samples/manual/README
@@ -0,0 +1,5 @@
+ruby ../../../../../bin/sisu6 --txt -v en/README.ssm
+ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm
+
+ruby ../../../../../bin/sisu6 --manpage -v en/README.ssm
+ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm
diff --git a/data/doc/sisu/markup-samples/manual/Rakefile b/data/doc/sisu/markup-samples/manual/Rakefile
index 1d9b5414..e389856f 100644
--- a/data/doc/sisu/markup-samples/manual/Rakefile
+++ b/data/doc/sisu/markup-samples/manual/Rakefile
@@ -169,7 +169,7 @@ def notice
 #{project_details.name}
 #{project_details.rake_project}
 
-This rake file is to assist with having sisu markup files under po4a
+This rake file is primarily to assist with having sisu markup files under po4a
 translation management. It assumes that the source language files are placed
 under the sub-directory identifying the source language set, which is currently
 #{language.source}
@@ -190,6 +190,15 @@ For a more detailed and up to date task list use:
   end
   self
 end
+def generate
+  def readme
+    system(%{ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm})
+  end
+  def manpage
+    system(%{ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm})
+  end
+  self
+end
 def tasks
   system('rake -T')
 end
@@ -341,8 +350,8 @@ def distclean
 end
 
 #% task lists
-desc "runs make (see its description below)"
-task :default => [:make]
+desc "help"
+task :default => [:help]
 desc "assist with having sisu markup files managed by po4a
                    create configuration files, and language directories and
                    populate them with po4a pot & po files for translation and
@@ -369,6 +378,10 @@ and File.directory?(dir.po)
 else
   task :make! => [:build_]
 end
+desc "generate sisu manpage sisu.1"
+task :manpage => [:manpage_]
+desc "generate sisu README"
+task :readme => [:readme_]
 
 #% task actions
 task :project_help_ do
@@ -401,4 +414,10 @@ end
 task :notice_rebuild_ do
   notice.default(:rebuild)
 end
+task :manpage_ do
+  generate.manpage
+end
+task :readme_ do
+  generate.readme
+end
 __END__
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
index f12e3144..7f78f367 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
@@ -15,7 +15,7 @@
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
-#  url_root:     'http://www.your.url' #without dir stub
+#  url_root:     'http://www.your.url' #url to document root, without dir stub
 #  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  images:       '_sisu/image'
 #  man:          'man'
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
index 71faa3e0..26fff9a0 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
@@ -15,7 +15,7 @@
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 #webserv:
-#  url_root:     'http://www.your.url' #without dir stub
+#  url_root:     'http://www.your.url' #url to document root, without dir stub
 #  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  images:       '_sisu/image'
 #  man:          'man'
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
index ca1cf424..4ab568ca 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
@@ -14,8 +14,8 @@
 #  public:       '_sisu/image'
 #  #all:           'image'
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-#  url_root:     'http://www.your.url' #without dir stub
+webserv:
+  url_root:     'http://www.sisudoc.org' #url to document root, without dir stub
 #  path:         '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  images:       '_sisu/image'
 #  man:          'man'