config: Update paths to support ftp.rtems.org storage

- Update to add 5 branch and 5.1 release

2 files changed, 125 insertions, 113 deletions

diff --git a/docs/docs.rtems.org/configuration.ini b/docs/docs.rtems.org/configuration.ini
index 0aace29..d203e74 100644
--- a/docs/docs.rtems.org/configuration.ini
+++ b/docs/docs.rtems.org/configuration.ini
@@ -3,41 +3,43 @@
 ;
 
 [latest]
-release = 4.11.3
+release = 5.1
 
 [branches]
 master = master
+5 = 5
 4.11 = 4.11
 
 [releases]
-4.11.3     = rtems-docs-4.11.3
-4.11.2     = rtems-docs-4.11.2
-4.11.1     = rtems-docs-4.11.1
-4.11.0     = rtems-docs-4.11.0
-4.10.2     = rtemsdocs-4.10.2
-4.10.1     = rtemsdocs-4.10.1
-4.10.0     = rtemsdocs-4.10.0
-4.9.6      = rtemsdocs-4.9.6
-4.9.5      = rtemsdocs-4.9.5
-4.9.4      = rtemsdocs-4.9.4
-4.9.3      = rtemsdocs-4.9.3
-4.9.2      = rtemsdocs-4.9.2
-4.9.1      = rtemsdocs-4.9.1
-4.9.0      = rtemsdocs-4.9.0
-4.8.1      = rtemsdocs-4.8.1
-4.8.0      = rtemsdocs-4.8.0
-4.7.3      = rtemsdoc-4.7.3
-4.7.2      = rtemsdocs-4.7.2
-4.7.1      = rtemsdocs-4.7.1
-4.7.0      = rtemsdocs-4.7.0
-4.6.6      = rtemsdocs-4.6.6
-4.6.5      = rtemsdocs-4.6.5
-4.6.4      = rtemsdocs-4.6.4
-4.6.2      = rtemsdocs-4.6.2
-4.6.1      = rtemsdocs-4.6.1
-4.6.0      = rtemsdocs-4.6.0
-4.5.0      = 4.5.0
-4.0.0      = 4.0.0
+5.1        = rtems-5.1
+4.11.3     = rtems-4.11.3
+4.11.2     = rtems-4.11.2
+4.11.1     = rtems-4.11.1
+4.11.0     = rtems-4.11.0
+4.10.2     = rtems-4.10.2
+4.10.1     = rtems-4.10.1
+4.10.0     = rtems-4.10.0
+4.9.6      = rtems-4.9.6
+4.9.5      = rtems-4.9.5
+4.9.4      = rtems-4.9.4
+4.9.3      = rtems-4.9.3
+4.9.2      = rtems-4.9.2
+4.9.1      = rtems-4.9.1
+4.9.0      = rtems-4.9.0
+4.8.1      = rtems-4.8.1
+4.8.0      = rtems-4.8.0
+4.7.3      = rtems-4.7.3
+4.7.2      = rtems-4.7.2
+4.7.1      = rtems-4.7.1
+4.7.0      = rtems-4.7.0
+4.6.6      = rtems-4.6.6
+4.6.5      = rtems-4.6.5
+4.6.4      = rtems-4.6.4
+4.6.2      = rtems-4.6.2
+4.6.1      = rtems-4.6.1
+4.6.0      = rtems-4.6.0
+4.5.0      = rtems-4.5.0
+4.0.0      = rtems-4.0.0
 
 [titles]
 FAQ            = "RTEMS FAQ"
@@ -70,6 +72,16 @@ started        = "Getting Started with RTEMS for C/C++ Users"
 started_ada    = "Getting Started with GNAT/RTEMS"
 
 ;
+; RTEMS 5
+;
+[5-template]
+legacy = no
+doxygen = yes
+
+[rtems-docs-5.1]
+template = doxygen-no-legacy-template
+
+;
 ; RTEMS 4.11
 ;
 [doxygen-no-legacy-template]
@@ -114,67 +126,67 @@ manuals = started,
           filesystem,
           relnotes
 
-[rtemsdocs-4.10.0]
+[rtems-4.10.0]
 template = 4.10-4.9-template
-html = rtemsdocs-4.10.0/share/rtems/html
-pdf = rtemsdocs-4.10.0/share/rtems/pdf
+html = rtems-4.10.0/html
+pdf = rtems-4.10.0
 date = 8th Feburary 2011
 
-[rtemsdocs-4.10.1]
+[rtems-4.10.1]
 template = 4.10-4.9-template
-html = rtemsdocs-4.10.1/share/rtems/html
-pdf = rtemsdocs-4.10.1/share/rtems/pdf
+html = rtems-4.10.1/html
+pdf = rtems-4.10.1
 date = 21st July 2011
 
-[rtemsdocs-4.10.2]
+[rtems-4.10.2]
 template = 4.10-4.9-template
-html = rtemsdocs-4.10.2/share/rtems/html
-pdf = rtemsdocs-4.10.2/share/rtems/pdf
+html = rtems-4.10.2/html
+pdf = rtems-4.10.2
 date = 14th December 2011
 
 ;
 ; RTEMS 4.9
 ;
-[rtemsdocs-4.9.0]
+[rtems-4.9.0]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.0/share/rtems/html
-pdf = rtemsdocs-4.9.0/share/rtems/pdf
+html = rtems-4.9.0/html
+pdf = rtems-4.9.0
 date = 24th September 2009
 
-[rtemsdocs-4.9.1]
+[rtems-4.9.1]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.1/share/rtems/html
-pdf = rtemsdocs-4.9.1/share/rtems/pdf
+html = rtems-4.9.1/html
+pdf = rtems-4.9.1
 date = 12th December 2008
 
-[rtemsdocs-4.9.2]
+[rtems-4.9.2]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.2/share/rtems/html
-pdf = rtemsdocs-4.9.2/share/rtems/pdf
+html = rtems-4.9.2/html
+pdf = rtems-4.9.2
 date = 12th March 2009
 
-[rtemsdocs-4.9.3]
+[rtems-4.9.3]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.3/share/rtems/html
-pdf = rtemsdocs-4.9.3/share/rtems/pdf
+html = rtems-4.9.3/html
+pdf = rtems-4.9.3
 date = 13th November 2009
 
-[rtemsdocs-4.9.4]
+[rtems-4.9.4]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.4/share/rtems/html
-pdf = rtemsdocs-4.9.4/share/rtems/pdf
+html = rtems-4.9.4/html
+pdf = rtems-4.9.4
 date = 18th March 2010
 
-[rtemsdocs-4.9.5]
+[rtems-4.9.5]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.5/share/rtems/html
-pdf = rtemsdocs-4.9.5/share/rtems/pdf
+html = rtems-4.9.5/html
+pdf = rtems-4.9.5
 date = 9th Feburary 2011
 
-[rtemsdocs-4.9.6]
+[rtems-4.9.6]
 template = 4.10-4.9-template
-html = rtemsdocs-4.9.6/share/rtems/html
-pdf = rtemsdocs-4.9.6/share/rtems/pdf
+html = rtems-4.9.6/html
+pdf = rtems-4.9.6
 date = 24th July 2011
 
 ;
@@ -198,22 +210,22 @@ manuals = started,
           filesystem,
           relnotes
 
-[rtemsdocs-4.8.0]
+[rtems-4.8.0]
 template = 4.8-template
-html = rtemsdocs-4.8.0/share/rtems/html
-pdf = rtemsdocs-4.8.0/share/rtems/pdf
+html = rtems-4.8.0/html
+pdf = rtems-4.8.0
 date = 14th Feburary 2008
 
-[rtemsdocs-4.8.1]
+[rtems-4.8.1]
 template = 4.8-template
-html = rtemsdocs-4.8.1/share/rtems/html
-pdf = rtemsdocs-4.8.1/share/rtems/pdf
+html = rtems-4.8.1/html
+pdf = rtems-4.8.1
 date = 13th August 2008
 
-[rtemsdocs-4.8.2]
+[rtems-4.8.2]
 template = 4.8-template
-html = rtemsdocs-4.8.1/share/rtems/html
-pdf = rtemsdocs-4.8.1/share/rtems/pdf
+html = rtems-4.8.1/html
+pdf = rtems-4.8.1
 date = 19th March 2010
 
 ;
@@ -239,34 +251,34 @@ manuals = started,
           filesystem,
           relnotes
 
-[rtemsdocs-4.7.0]
+[rtems-4.7.0]
 template = 4.7-template
-html = rtemsdocs-4.7.0/share/rtems/html
-pdf = rtemsdocs-4.7.0/share/rtems/pdf
+html = rtems-4.7.0/html
+pdf = rtems-4.7.0
 date = 5th March 2007
 
-[rtemsdocs-4.7.1]
+[rtems-4.7.1]
 template = 4.7-template
-html = rtemsdocs-4.7.1/share/rtems/html
-pdf = rtemsdocs-4.7.1/share/rtems/pdf
+html = rtems-4.7.1/html
+pdf = rtems-4.7.1
 date = 13th April 2007
 
-[rtemsdocs-4.7.2]
+[rtems-4.7.2]
 template = 4.7-template
-html = rtemsdocs-4.7.2/share/rtems/html
-pdf = rtemsdocs-4.7.2/share/rtems/pdf
+html = rtems-4.7.2/html
+pdf = rtems-4.7.2
 date = 15th Feburary 2008
 
-;[rtemsdocs-4.7.99.2]
+;[rtems-4.7.99.2]
 ;template = 4.7-template
-;html = rtemsdocs-4.7.99.2/share/rtems/html
-;pdf = rtemsdocs-4.7.99.2/share/rtems/pdf
+;html = rtems-4.7.99.2/html
+;pdf = rtems-4.7.99.2/
 ;date =
 
 [rtemsdoc-4.7.3]
 template = 4.7-template
-html = rtemsdoc-4.7.3/share/rtems/html
-pdf = rtemsdoc-4.7.3/share/rtems/pdf
+html = rtems-4.7.3/html
+pdf = rtems-4.7.3
 date = 8th August 2008
 
 ;
@@ -300,55 +312,55 @@ supplements = i386,
 	      mips64orion,
               hppa1_1
 
-[rtemsdocs-4.6.0]
+[rtems-4.6.0]
 template = 4.6-template
-html = rtemsdocs-4.6.0/share/rtems/html
-pdf = rtemsdocs-4.6.0/share/rtems/pdf
+html = rtems-4.6.0/html
+pdf = rtems-4.6.0
 date = 31st Janurary 2004
 
-;[rtemsdocs-4.6.0pre5]
+;[rtems-4.6.0pre5]
 ;template = 4.6-template
-;html = rtemsdocs-4.6.0pre5/share/rtems/html
-;pdf = rtemsdocs-4.6.0pre5/share/rtems/pdf
+;html = rtems-4.6.0pre5/html
+;pdf = rtems-4.6.0pre5/
 ;date =
 
-[rtemsdocs-4.6.1]
+[rtems-4.6.1]
 template = 4.6-template
-html = rtemsdocs-4.6.1/share/rtems/html
-pdf = rtemsdocs-4.6.1/share/rtems/pdf
+html = rtems-4.6.1/html
+pdf = rtems-4.6.1
 date = 9th April 2004
 
-[rtemsdocs-4.6.2]
+[rtems-4.6.2]
 template = 4.6-template
-html = rtemsdocs-4.6.2/share/rtems/html
-pdf = rtemsdocs-4.6.2/share/rtems/pdf
+html = rtems-4.6.2/html
+pdf = rtems-4.6.2
 date = 19th October 2004
 
 ;
 ; I cannot find this release and so will remove it.
 ;
-;[rtemsdocs-4.6.99.3]
+;[rtems-4.6.99.3]
 ;template = 4.6-template
-;html = rtemsdocs-4.6.99.3/share/rtems/html
-;pdf = rtemsdocs-4.6.99,3/share/rtems/pdf
+;html = rtems-4.6.99.3/html
+;pdf = rtems-4.6.99,3/
 ;date =
 
-[rtemsdocs-4.6.4]
+[rtems-4.6.4]
 template = 4.6-template
-html = rtemsdocs-4.6.4/share/rtems/html
-pdf = rtemsdocs-4.6.4/share/rtems/pdf
+html = rtems-4.6.4/html
+pdf = rtems-4.6.4
 date = 2nd September 2005
 
-[rtemsdocs-4.6.5]
+[rtems-4.6.5]
 template = 4.6-template
-html = rtemsdocs-4.6.5/share/rtems/html
-pdf = rtemsdocs-4.6.5/share/rtems/pdf
+html = rtems-4.6.5/html
+pdf = rtems-4.6.5
 date = 7th October 2005
 
-[rtemsdocs-4.6.6]
+[rtems-4.6.6]
 template = 4.6-template
-html = rtemsdocs-4.6.6/share/rtems/html
-pdf = rtemsdocs-4.6.6/share/rtems/pdf
+html = rtems-4.6.6/html
+pdf = rtems-4.6.6
 date = 25th April 2006
 
 ;
@@ -381,10 +393,10 @@ supplements = i386,
               hppa1_1,
               sh
 
-[4.5.0]
+[rtems-4.5.0]
 template = 4.5-template
-html = 4.5.0/rtemsdoc-4.5.0/share/rtemsdoc/html
-pdf = 4.5.0/rtemsdoc-4.5.0/share/rtemsdoc/pdf
+html = rtems-4.5.0/html
+pdf = rtems-4.5.0
 date = 30th October 2000
 
 ;[4.5.1-pre3]
@@ -395,7 +407,7 @@ date = 30th October 2000
 ;
 ; RTEMS 4.0
 ;
-[4.0.0]
+[rtems-4.0.0]
 legacy = yes
 manuals = c_user,
 	  started,
@@ -403,6 +415,6 @@ manuals = c_user,
           develenv,
       	  posix_users,
 	  networking
-html = 4.0.0/doc
-pdf = 4.0.0/docs
+html = rtems-4.0.0/html
+pdf = rtems-4.0.0
 date = 27th May 1998
diff --git a/docs/docs.rtems.org/configuration.py b/docs/docs.rtems.org/configuration.py
index 13f6bae..f390401 100644
--- a/docs/docs.rtems.org/configuration.py
+++ b/docs/docs.rtems.org/configuration.py
@@ -227,7 +227,7 @@ class configuration:
                     html = rel['html'] + '/' + m + '/index.html'
                 else:
                     html = rel['html'] + '/' + m + '.html'
-                pdf = rel['pdf'] + '/' + m + '.pdf'
+                pdf = rel['pdf'] + '/' + m + '-' + r + '.pdf'
                 legacy = rel['legacy']
                 doc = self._xml_create_doc(cat, m, legacy, name, html, pdf)
                 root.appendChild(doc)