Merge tag 'sisu_5.3.2' into debian/sid

SiSU 5.3.2

9 files changed, 63 insertions, 9 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 15e4ce0d..d9dc1349 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,21 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.3.2.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.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.2-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.2.orig.tar.xz
+  sisu_5.3.2.orig.tar.xz
+  sisu_5.3.2-1.dsc
+
+* ao, html book index linking, follow --strict option
+
+* utils, code markers & messages, notes/warning/errors, fix
+
+* 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 4454c3e1..2057fadc 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,21 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.0.2.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.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.2-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.2.orig.tar.xz
+  sisu_6.0.2.orig.tar.xz
+  sisu_6.0.2-1.dsc
+
+* ao, html book index linking, follow --strict option
+
+* utils, code markers & messages, notes/warning/errors, fix
+
+* 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'
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index f5c89bbf..e3f29dbc 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.3.1
+:version: 5.3.2
 :date_stamp: 2014w05/3
 :date: "2014-02-05"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 109b2123..0f55d28e 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.0.1
+:version: 6.0.2
 :date_stamp: 2014w05/3
 :date: "2014-02-05"