v2, v3: help (markup): correct path to markup-samples

4 files changed, 11 insertions, 37 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index e27a57d2..330a1cbc 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -44,6 +44,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz
 
   * texpdf: url (regex) pattern match fix (/https?/)
 
+  * help (markup): correct path to markup-samples
+
 %% 2.8.1.orig.tar.gz (2011-03-05:09/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz
   sisu_2.8.1.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 17cd83a3..bd0cca64 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -49,6 +49,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
 
   * texpdf: url (regex) pattern match fix (/https?/)
 
+  * help (markup): correct path to markup-samples
+
 %% 3.0.2.orig.tar.gz (2011-03-05:09/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
diff --git a/lib/sisu/v2/help.rb b/lib/sisu/v2/help.rb
index b07ab6ed..85bb898c 100644
--- a/lib/sisu/v2/help.rb
+++ b/lib/sisu/v2/help.rb
@@ -7,7 +7,7 @@
 
  * Author: Ralph Amissah
 
- * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved.
+ * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -1426,7 +1426,7 @@ WOK
         sisu --help example
 
       sample marked up documents are provided in directory:
-        #{@cX.green}sisu-examples/sample/document_samples_sisu_markup/#{@cX.off}
+        #{@cX.green}/usr/share/doc/sisu/markup-samples#{@cX.off}
       and online
         #{@cX.green}www.jus.uio.no/sisu#{@cX.off}
 WOK
@@ -1672,22 +1672,7 @@ WOK
     def hyperestraier
       out_dir='(' + `ls #{@env.path.webserv}`.split("\n").join('|') + ')'
       print <<WOK
-   See the documentation for hyperestraier
-   #{@cX.blue}
-   http://hyperestraier.sourceforge.net/
-
-   file:///usr/share/doc/hyperestraier/index.html
-   #{@cX.off} #{@cX.orange}
-   man estcmd
-   #{@cX.off}
-
-   on sisu_hyperestraier:
-
-   #{@cX.blue}
-    man sisu_hyperestraier
-
-   /usr/share/doc/sisu/sisu_markup/sisu_hyperestraier/index.html
-   #{@cX.off}
+  Not tested recently, not up-to-date
 
   NOTE: The examples that follow assume that sisu output is placed in the directory
   /home/ralph/sisu_www
@@ -1784,7 +1769,7 @@ WOK
 
    SiSU, a framework for document structuring, publishing and search
 
-   Copyright (C) 1997 - 2010 Ralph Amissah
+   Copyright (C) 1997 - 2011 Ralph Amissah
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the Free
@@ -1831,7 +1816,7 @@ WOK
    *  Standard SiSU meta-markup syntax, and the
    *  Standard SiSU object citation numbering and system
 
-© Ralph Amissah 1997, current 2010.
+© Ralph Amissah 1997, current 2011.
 All Rights Reserved.
 
 Information on these may be obtained from:
diff --git a/lib/sisu/v3/help.rb b/lib/sisu/v3/help.rb
index a0d62644..477e93e9 100644
--- a/lib/sisu/v3/help.rb
+++ b/lib/sisu/v3/help.rb
@@ -1434,7 +1434,7 @@ WOK
         sisu --help example
 
       sample marked up documents are provided in directory:
-        #{@cX.green}sisu-examples/sample/document_samples_sisu_markup/#{@cX.off}
+        #{@cX.green}/usr/share/doc/sisu/markup-samples#{@cX.off}
       and online
         #{@cX.green}www.jus.uio.no/sisu#{@cX.off}
 WOK
@@ -1680,22 +1680,7 @@ WOK
     def hyperestraier
       out_dir='(' + `ls #{@env.path.webserv}`.split("\n").join('|') + ')'
       print <<WOK
-   See the documentation for hyperestraier
-   #{@cX.blue}
-   http://hyperestraier.sourceforge.net/
-
-   file:///usr/share/doc/hyperestraier/index.html
-   #{@cX.off} #{@cX.orange}
-   man estcmd
-   #{@cX.off}
-
-   on sisu_hyperestraier:
-
-   #{@cX.blue}
-    man sisu_hyperestraier
-
-   /usr/share/doc/sisu/sisu_markup/sisu_hyperestraier/index.html
-   #{@cX.off}
+  Not tested recently, not up-to-date
 
   NOTE: The examples that follow assume that sisu output is placed in the directory
   /home/ralph/sisu_www