Merge commit 'be92fd0eaf5d6918eec3a5cb7348dfde359107c3' into debian/sid

2 files changed, 60 insertions, 12 deletions

diff --git a/data/doc/manuals_generated/sisu_manual/index.html b/data/doc/manuals_generated/sisu_manual/index.html
index 3717afd7..739512cf 100644
--- a/data/doc/manuals_generated/sisu_manual/index.html
+++ b/data/doc/manuals_generated/sisu_manual/index.html
@@ -49,7 +49,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 <input type="text" name="s1" size="24" maxlength="255" />
 <br />
 <input type="submit" name="ignore" value="search" />
-<input type="hidden" name="db" value="SiSU_sisu" />
+<input type="hidden" name="db" value="SiSU_sisu_manual" />
 <input type="radio" name="view" value="index" checked="checked" /> idx
 <input type="radio" name="view" value="text" /> txt
 </form>
@@ -62,6 +62,11 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
   </a>
 </p>
 <p class="small">
+  <a href="./sisu_introduction/index.html" target="_top" >
+    SiSU introduction
+  </a>
+</p>
+<p class="small">
   <a href="./sisu_markup/index.html" target="_top" >
     SiSU markup
   </a>
@@ -76,16 +81,6 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
     SiSU configuration
   </a>
 </p>
-<p class="small">
-  <a href="./sisu_webrick/webrick.html" target="_top" >
-    SiSU webrick
-  </a>
-</p>
-<p class="small">
-  <a href="./sisu_syntax_highlighting/1.html" target="_top" >
-    SiSU syntax highlighting
-  </a>
-</p>
 <p class="tiny">
   ---
 </p>
@@ -94,6 +89,13 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
     SiSU help
   </a>
 </p>
+<p class="small">
+  <a href="./sisu_help_sources/index.html" target="_top" >
+    SiSU help sources
+  </a>
+</p>
+<p class="tiny">
+  ---
 </p>
 <p class="small">
   <a href="./sisu_faq/index.html" target="_top" >
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
index 70601ea0..739512cf 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
@@ -49,7 +49,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 <input type="text" name="s1" size="24" maxlength="255" />
 <br />
 <input type="submit" name="ignore" value="search" />
-<input type="hidden" name="db" value="SiSU_sisu" />
+<input type="hidden" name="db" value="SiSU_sisu_manual" />
 <input type="radio" name="view" value="index" checked="checked" /> idx
 <input type="radio" name="view" value="text" /> txt
 </form>
@@ -57,6 +57,16 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 </div>
 <div id="column_left">
 <p class="small">
+  <a href="./sisu_manual/index.html" target="_top" >
+    SiSU manual (composite document)
+  </a>
+</p>
+<p class="small">
+  <a href="./sisu_introduction/index.html" target="_top" >
+    SiSU introduction
+  </a>
+</p>
+<p class="small">
   <a href="./sisu_markup/index.html" target="_top" >
     SiSU markup
   </a>
@@ -66,6 +76,42 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
     SiSU commands
   </a>
 </p>
+<p class="small">
+  <a href="./sisu_configuration/index.html" target="_top" >
+    SiSU configuration
+  </a>
+</p>
+<p class="tiny">
+  ---
+</p>
+<p class="small">
+  <a href="./sisu_help/index.html" target="_top" >
+    SiSU help
+  </a>
+</p>
+<p class="small">
+  <a href="./sisu_help_sources/index.html" target="_top" >
+    SiSU help sources
+  </a>
+</p>
+<p class="tiny">
+  ---
+</p>
+<p class="small">
+  <a href="./sisu_faq/index.html" target="_top" >
+    SiSU faq
+  </a>
+</p>
+<p class="small">
+  <a href="./sisu_howto/index.html" target="_top" >
+    SiSU howto
+  </a>
+</p>
+<p class="small">
+  <a href="./sisu_quickstart/index.html" target="_top" >
+    SiSU quickstart
+  </a>
+</p>
 <p class="tiny">
   ---
 </p>