From e6909107eae88d9a193896ddeef8f92013c907e6 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 13 Jan 2017 15:02:55 +1100
Subject: Fix branches and 4.10.2 paths.

The 4.10.2 has an index.html to doc unlink earlier releases.
---
 docs.rtems.org/cat-main.html     |  2 +-
 docs.rtems.org/configuration.ini | 24 ++++++++----------------
 docs.rtems.org/configuration.py  | 10 ++++++++--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/docs.rtems.org/cat-main.html b/docs.rtems.org/cat-main.html
index 852ab35..5ddc26f 100644
--- a/docs.rtems.org/cat-main.html
+++ b/docs.rtems.org/cat-main.html
@@ -64,6 +64,6 @@
    </div>
    <!-- Load the catalogues and generate the content -->
    <script type="text/javascript" src="static/rtems/js/catalogue.js"></script>
-   <script> loadCatalogue("master/catalogue.xml", "master", "master", false); </script>
+   <script> loadCatalogue("branches/master/catalogue.xml", "branches/master", "master", false); </script>
 @LATEST_RELEASE_SCRIPT@
    <!-- catalogues-bottom -->
diff --git a/docs.rtems.org/configuration.ini b/docs.rtems.org/configuration.ini
index f2951bb..da78d22 100644
--- a/docs.rtems.org/configuration.ini
+++ b/docs.rtems.org/configuration.ini
@@ -63,6 +63,7 @@ relnotes    = "RTEMS Release Notes"
 rgdb_specs  = "RTEMS Remote Debugger Server Specifications"
 rtems_gdb   = "RTEMS/GDB User's Guide"
 sh          = "RTEMS Hitachi SH Applications Supplement"
+shell       = "RTEMS Shell"
 sparc       = "RTEMS SPARC Applications Supplement"
 started     = "Getting Started with RTEMS for C/C++ Users"
 started_ada = "Getting Started with GNAT/RTEMS"
@@ -72,31 +73,22 @@ started_ada = "Getting Started with GNAT/RTEMS"
 ;
 [4.10-template]
 legacy = yes
-manuals = FAQ,
-          started,
+index_per_doc = Yes
+manuals = started,
 	  c_user,
           posix_users,
           itron,
           networking,
+	  shell,
+          started_ada,
           ada_user,
-          develenv,
-          rtems_gdb,
-          rgdb_specs,
           bsp_howto,
+	  cpu_supplement,
+          develenv,
           porting,
-          filesystem,
           posix1003_1,
+          filesystem,
           relnotes
-supplements = i386,
-              i960,
-              m68k,
-	      mips,
-              powerpc,
-              sh,
-              sparc,
-	      c4x,
-	      mips64orion,
-              hppa1_1
 
 [rtemsdocs-4.10.0]
 template = 4.10-template
diff --git a/docs.rtems.org/configuration.py b/docs.rtems.org/configuration.py
index b7b19e5..58407e3 100644
--- a/docs.rtems.org/configuration.py
+++ b/docs.rtems.org/configuration.py
@@ -152,6 +152,9 @@ class configuration:
             rel['legacy'] = self._get_item(template, 'legacy', False)
             if rel['legacy'] is None:
                 rel['legacy'] = self._get_item(label, 'legacy', False)
+            rel['index_per_doc'] = self._get_item(template, 'index_per_doc', False)
+            if rel['index_per_doc'] is None:
+                rel['index_per_doc'] = self._get_item(label, 'index_per_doc', False)
             rel['html'] = self._get_item(label, 'html')
             rel['pdf'] = self._get_item(label, 'pdf')
             for d in rel['manuals'] + rel['supplements']:
@@ -183,7 +186,10 @@ class configuration:
             root.appendChild(heading)
 
             for m in rel['manuals']:
-                html = rel['html'] + '/' + m + '.html'
+                if 'index_per_doc' in rel:
+                    html = rel['html'] + '/' + m + '/index.html'
+                else:
+                    html = rel['html'] + '/' + m + '.html'
                 pdf = rel['pdf'] + '/' + m + '.pdf'
                 legacy = rel['legacy']
                 doc = self._xml_create_doc(cat, m, legacy, name, html, pdf)
@@ -204,7 +210,7 @@ class configuration:
             path = branch[1]
             tag = _branch_tag(branch)
             return \
-                '<script> loadCatalogue("%s/catalogue.xml", "%s", "%s", false); </script>\n' \
+                '<script> loadCatalogue("branches/%s/catalogue.xml", "branches/%s", "%s", false); </script>\n' \
                 % (path, path, tag)
 
         def _release_tag(release):
-- 
cgit v1.2.3