JWS-109 & JWS-116 Moved the docs (source and html built) to a new location that is...
authorFábio Madeira <fmmarquesmadeira@dundee.ac.uk>
Fri, 21 Apr 2017 14:51:46 +0000 (15:51 +0100)
committerFábio Madeira <fmmarquesmadeira@dundee.ac.uk>
Fri, 21 Apr 2017 15:00:34 +0000 (16:00 +0100)
131 files changed:
docs/v_2_2_0/Makefile [moved from docs/Makefile with 100% similarity]
docs/v_2_2_0/README.txt [moved from docs/README.txt with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/__init__.py [moved from docs/_themes/sphinx_rtd_theme/__init__.py with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/breadcrumbs.html [moved from docs/_themes/sphinx_rtd_theme/breadcrumbs.html with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/footer.html [moved from docs/_themes/sphinx_rtd_theme/footer.html with 98% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/layout.html [moved from docs/_themes/sphinx_rtd_theme/layout.html with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/layout_old.html [moved from docs/_themes/sphinx_rtd_theme/layout_old.html with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/search.html [moved from docs/_themes/sphinx_rtd_theme/search.html with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/searchbox.html [moved from docs/_themes/sphinx_rtd_theme/searchbox.html with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css [moved from docs/_themes/sphinx_rtd_theme/static/css/badge_only.css with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css.map [moved from docs/_themes/sphinx_rtd_theme/static/css/badge_only.css.map with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css [moved from docs/_themes/sphinx_rtd_theme/static/css/theme.css with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css.map [moved from docs/_themes/sphinx_rtd_theme/static/css/theme.css.map with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot [moved from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg [moved from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf [moved from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff [moved from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 [moved from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/modernizr.min.js [moved from docs/_themes/sphinx_rtd_theme/static/js/modernizr.min.js with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/theme.js [moved from docs/_themes/sphinx_rtd_theme/static/js/theme.js with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/theme.conf [moved from docs/_themes/sphinx_rtd_theme/theme.conf with 100% similarity]
docs/v_2_2_0/_themes/sphinx_rtd_theme/versions.html [moved from docs/_themes/sphinx_rtd_theme/versions.html with 100% similarity]
docs/v_2_2_0/advanced.rst [moved from docs/advanced.rst with 99% similarity]
docs/v_2_2_0/changelog.rst [moved from docs/changelog.rst with 96% similarity]
docs/v_2_2_0/citations.rst [moved from docs/citations.rst with 100% similarity]
docs/v_2_2_0/client.rst [moved from docs/client.rst with 100% similarity]
docs/v_2_2_0/conf.py [moved from docs/conf.py with 97% similarity]
docs/v_2_2_0/develop.rst [moved from docs/develop.rst with 99% similarity]
docs/v_2_2_0/generate_manual.sh [moved from docs/generate_manual.sh with 81% similarity]
docs/v_2_2_0/getting_started.rst [moved from docs/getting_started.rst with 100% similarity]
docs/v_2_2_0/included_tools.rst [moved from docs/included_tools.rst with 100% similarity]
docs/v_2_2_0/index.rst [moved from docs/index.rst with 96% similarity]
docs/v_2_2_0/make.bat [moved from docs/make.bat with 100% similarity]
docs/v_2_2_0/stats.rst [moved from docs/stats.rst with 97% similarity]
docs/v_2_2_0/va.rst [moved from docs/va.rst with 97% similarity]
docs/v_2_2_0/war.rst [moved from docs/war.rst with 100% similarity]
website/docs/v_2_2_0/_images/VMware_booted.png [moved from website/docs/_images/VMware_booted.png with 100% similarity]
website/docs/v_2_2_0/_images/VMware_cpu.png [moved from website/docs/_images/VMware_cpu.png with 100% similarity]
website/docs/v_2_2_0/_images/folder-small.png [moved from website/docs/_images/folder-small.png with 100% similarity]
website/docs/v_2_2_0/_images/usage_statistics_details.gif [moved from website/docs/_images/usage_statistics_details.gif with 100% similarity]
website/docs/v_2_2_0/_images/usage_statistics_job_details.gif [moved from website/docs/_images/usage_statistics_job_details.gif with 100% similarity]
website/docs/v_2_2_0/_images/usage_statistics_main.gif [moved from website/docs/_images/usage_statistics_main.gif with 100% similarity]
website/docs/v_2_2_0/_images/usage_statistics_month.gif [moved from website/docs/_images/usage_statistics_month.gif with 100% similarity]
website/docs/v_2_2_0/_images/vm_welcome_screen.png [moved from website/docs/_images/vm_welcome_screen.png with 100% similarity]
website/docs/v_2_2_0/_images/ws-structure.png [moved from website/docs/_images/ws-structure.png with 100% similarity]
website/docs/v_2_2_0/_sources/advanced.rst.txt [moved from website/docs/_sources/advanced.rst.txt with 99% similarity]
website/docs/v_2_2_0/_sources/changelog.rst.txt [moved from website/docs/_sources/changelog.rst.txt with 96% similarity]
website/docs/v_2_2_0/_sources/citations.rst.txt [moved from website/docs/_sources/citations.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/client.rst.txt [moved from website/docs/_sources/client.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/develop.rst.txt [moved from website/docs/_sources/develop.rst.txt with 99% similarity]
website/docs/v_2_2_0/_sources/getting_started.rst.txt [moved from website/docs/_sources/getting_started.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/included_tools.rst.txt [moved from website/docs/_sources/included_tools.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/index.rst.txt [moved from website/docs/_sources/index.rst.txt with 96% similarity]
website/docs/v_2_2_0/_sources/man/advanced.rst.txt [moved from website/docs/_sources/man/advanced.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/changelog.rst.txt [moved from website/docs/_sources/man/changelog.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/citations.rst.txt [moved from website/docs/_sources/man/citations.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/client.rst.txt [moved from website/docs/_sources/man/client.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/develop.rst.txt [moved from website/docs/_sources/man/develop.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/getting_started.rst.txt [moved from website/docs/_sources/man/getting_started.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/included_tools.rst.txt [moved from website/docs/_sources/man/included_tools.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/va.rst.txt [moved from website/docs/_sources/man/va.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/man/war.rst.txt [moved from website/docs/_sources/man/war.rst.txt with 100% similarity]
website/docs/v_2_2_0/_sources/stats.rst.txt [moved from website/docs/_sources/stats.rst.txt with 97% similarity]
website/docs/v_2_2_0/_sources/va.rst.txt [moved from website/docs/_sources/va.rst.txt with 97% similarity]
website/docs/v_2_2_0/_sources/war.rst.txt [moved from website/docs/_sources/war.rst.txt with 100% similarity]
website/docs/v_2_2_0/_static/ajax-loader.gif [moved from website/docs/_static/ajax-loader.gif with 100% similarity]
website/docs/v_2_2_0/_static/basic.css [moved from website/docs/_static/basic.css with 100% similarity]
website/docs/v_2_2_0/_static/comment-bright.png [moved from website/docs/_static/comment-bright.png with 100% similarity]
website/docs/v_2_2_0/_static/comment-close.png [moved from website/docs/_static/comment-close.png with 100% similarity]
website/docs/v_2_2_0/_static/comment.png [moved from website/docs/_static/comment.png with 100% similarity]
website/docs/v_2_2_0/_static/css/badge_only.css [moved from website/docs/_static/css/badge_only.css with 100% similarity]
website/docs/v_2_2_0/_static/css/badge_only.css.map [moved from website/docs/_static/css/badge_only.css.map with 100% similarity]
website/docs/v_2_2_0/_static/css/theme.css [moved from website/docs/_static/css/theme.css with 100% similarity]
website/docs/v_2_2_0/_static/css/theme.css.map [moved from website/docs/_static/css/theme.css.map with 100% similarity]
website/docs/v_2_2_0/_static/doctools.js [moved from website/docs/_static/doctools.js with 100% similarity]
website/docs/v_2_2_0/_static/down-pressed.png [moved from website/docs/_static/down-pressed.png with 100% similarity]
website/docs/v_2_2_0/_static/down.png [moved from website/docs/_static/down.png with 100% similarity]
website/docs/v_2_2_0/_static/file.png [moved from website/docs/_static/file.png with 100% similarity]
website/docs/v_2_2_0/_static/fonts/FontAwesome.otf [moved from website/docs/_static/fonts/FontAwesome.otf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/Inconsolata-Bold.ttf [moved from website/docs/_static/fonts/Inconsolata-Bold.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/Inconsolata-Regular.ttf [moved from website/docs/_static/fonts/Inconsolata-Regular.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/Lato-Bold.ttf [moved from website/docs/_static/fonts/Lato-Bold.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/Lato-Regular.ttf [moved from website/docs/_static/fonts/Lato-Regular.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/RobotoSlab-Bold.ttf [moved from website/docs/_static/fonts/RobotoSlab-Bold.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/RobotoSlab-Regular.ttf [moved from website/docs/_static/fonts/RobotoSlab-Regular.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.eot [moved from website/docs/_static/fonts/fontawesome-webfont.eot with 100% similarity]
website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.svg [moved from website/docs/_static/fonts/fontawesome-webfont.svg with 100% similarity]
website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.ttf [moved from website/docs/_static/fonts/fontawesome-webfont.ttf with 100% similarity]
website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff [moved from website/docs/_static/fonts/fontawesome-webfont.woff with 100% similarity]
website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff2 [moved from website/docs/_static/fonts/fontawesome-webfont.woff2 with 100% similarity]
website/docs/v_2_2_0/_static/jquery-3.1.0.js [moved from website/docs/_static/jquery-3.1.0.js with 100% similarity]
website/docs/v_2_2_0/_static/jquery.js [moved from website/docs/_static/jquery.js with 100% similarity]
website/docs/v_2_2_0/_static/js/modernizr.min.js [moved from website/docs/_static/js/modernizr.min.js with 100% similarity]
website/docs/v_2_2_0/_static/js/theme.js [moved from website/docs/_static/js/theme.js with 100% similarity]
website/docs/v_2_2_0/_static/minus.png [moved from website/docs/_static/minus.png with 100% similarity]
website/docs/v_2_2_0/_static/plus.png [moved from website/docs/_static/plus.png with 100% similarity]
website/docs/v_2_2_0/_static/pygments.css [moved from website/docs/_static/pygments.css with 100% similarity]
website/docs/v_2_2_0/_static/searchtools.js [moved from website/docs/_static/searchtools.js with 100% similarity]
website/docs/v_2_2_0/_static/underscore-1.3.1.js [moved from website/docs/_static/underscore-1.3.1.js with 100% similarity]
website/docs/v_2_2_0/_static/underscore.js [moved from website/docs/_static/underscore.js with 100% similarity]
website/docs/v_2_2_0/_static/up-pressed.png [moved from website/docs/_static/up-pressed.png with 100% similarity]
website/docs/v_2_2_0/_static/up.png [moved from website/docs/_static/up.png with 100% similarity]
website/docs/v_2_2_0/_static/websupport.js [moved from website/docs/_static/websupport.js with 100% similarity]
website/docs/v_2_2_0/advanced.html [moved from website/docs/advanced.html with 99% similarity]
website/docs/v_2_2_0/changelog.html [moved from website/docs/changelog.html with 98% similarity]
website/docs/v_2_2_0/citations.html [moved from website/docs/citations.html with 99% similarity]
website/docs/v_2_2_0/client.html [moved from website/docs/client.html with 99% similarity]
website/docs/v_2_2_0/develop.html [moved from website/docs/develop.html with 98% similarity]
website/docs/v_2_2_0/genindex.html [moved from website/docs/genindex.html with 99% similarity]
website/docs/v_2_2_0/getting_started.html [moved from website/docs/getting_started.html with 99% similarity]
website/docs/v_2_2_0/included_tools.html [moved from website/docs/included_tools.html with 99% similarity]
website/docs/v_2_2_0/index.html [moved from website/docs/index.html with 99% similarity]
website/docs/v_2_2_0/jabaws_manual.pdf [moved from website/docs/jabaws_manual.pdf with 92% similarity]
website/docs/v_2_2_0/objects.inv [moved from website/docs/objects.inv with 100% similarity]
website/docs/v_2_2_0/search.html [moved from website/docs/search.html with 99% similarity]
website/docs/v_2_2_0/searchindex.js [moved from website/docs/searchindex.js with 100% similarity]
website/docs/v_2_2_0/stats.html [moved from website/docs/stats.html with 99% similarity]
website/docs/v_2_2_0/va.html [moved from website/docs/va.html with 99% similarity]
website/docs/v_2_2_0/war.html [moved from website/docs/war.html with 99% similarity]
website/download.jsp
website/getting_started.jsp
website/index.jsp
website/template_footer.jsp
website/template_header.jsp

similarity index 100%
rename from docs/Makefile
rename to docs/v_2_2_0/Makefile
similarity index 100%
rename from docs/README.txt
rename to docs/v_2_2_0/README.txt
similarity index 98%
rename from docs/_themes/sphinx_rtd_theme/footer.html
rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/footer.html
index af71c74..ddba32b 100755 (executable)
@@ -13,7 +13,7 @@
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
     {%- if show_copyright %}
       {%- if hasdoc('copyright') %}
         {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
similarity index 99%
rename from docs/advanced.rst
rename to docs/v_2_2_0/advanced.rst
index 38a4185..e636c8a 100644 (file)
@@ -463,8 +463,8 @@ JABAWS War File Content
 
 .. links
 .. _war file content table: advanced.html#jabaws_war_file_content
-.. _dm_javadoc: http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html
-.. _full_javadoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
+.. _dm_javadoc: ../dm_javadoc/index.html
+.. _full_javadoc: ../full_javadoc/index.html
 .. _prog_docs: http://www.compbio.dundee.ac.uk/jabaws/prog_docs/
 .. _test JABAWS: advanced.html#testing-the-jabaws-server
 .. _deploying on Tomcat tips: war.html
similarity index 96%
rename from docs/changelog.rst
rename to docs/v_2_2_0/changelog.rst
index d4016fc..f5f4d93 100644 (file)
@@ -59,7 +59,7 @@ JABAWS 2.0.1 includes several bug fixes and minor updates for JABAWS Version 2.0
 * Disembl returned swapped strings for HOTLOOPS and REM465
 * Jronn failed to process jobs with more than 3 sequences
 * JABAWS could not deal with FASTA records with '>' symbols in the record identificator
-* Change of parameter description for AAcon: parameters have been replaced with options for calculation methods. This allows a user to get several AAcon's conservation scores in one call
+* Change of parameter description for AACon: parameters have been replaced with options for calculation methods. This allows a user to get several AACon's conservation scores in one call
 * JABAWS never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer than a period defined in Engine.properties
 * Default web security has been incompatible with Tomcat 7.0.31 and newer
 * Documentation has been updated
similarity index 100%
rename from docs/client.rst
rename to docs/v_2_2_0/client.rst
similarity index 97%
rename from docs/conf.py
rename to docs/v_2_2_0/conf.py
index 41268cb..678f03a 100644 (file)
@@ -130,7 +130,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'JABAWS.tex', 'JABAWS Documentation',
-     'Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton', 'manual'),
+     'Peter Troshin, et al.', 'manual'),
 ]
 
 
similarity index 99%
rename from docs/develop.rst
rename to docs/v_2_2_0/develop.rst
index 538923c..4c7db93 100644 (file)
@@ -61,7 +61,7 @@ Structure of the project
 The code structure
 ------------------
 
-.. image:: ../website/static/img/ws-structure.png
+.. image:: ../../website/static/img/ws-structure.png
   :height: 414
   :width: 282
   :scale: 95 %
@@ -615,15 +615,15 @@ If you made any changes to the data model and would like to generate a complete
 
 
 
-.. |folder| image:: ../website/static/img/folder-small.png
+.. |folder| image:: ../../website/static/img/folder-small.png
    :align: middle
    :width: 15
 
 
 .. links
 .. _Git-tracker: https://source.jalview.org/crucible/changelog/jabaws
-.. _Data Model JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html
-.. _Complete JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
+.. _Data Model JavaDoc: ../dm_javadoc/index.html
+.. _Complete JavaDoc: ../full_javadoc/index.html
 .. _JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
 .. _Test Results: http://www.compbio.dundee.ac.uk/user/www-jws2/tests/index.html
 .. _TestNG: http://testng.org/doc/index.html
similarity index 81%
rename from docs/generate_manual.sh
rename to docs/v_2_2_0/generate_manual.sh
index 2d0297f..1effbb4 100755 (executable)
@@ -4,12 +4,12 @@
 rm -rf _build
 # generating the html pages
 make html
-mkdir ../website/docs
-cp -r _build/html/* ../website/docs/
+mkdir ../website/docs/v_2_2_0/
+cp -r _build/html/* ../../website/docs/v_2_2_0/
 # extra for testing
 #mkdir ../../jabaws-2.2-dev/docs
 #cp -r _build/html/* ../../jabaws-2.2-dev/docs/
-# rm -rf _build
+rm -rf _build
 
 # # generating the pdf
 # make latex
@@ -20,7 +20,8 @@ cp -r _build/html/* ../website/docs/
 # # Some of the links might not work properly in the pdf version...
 # # \end{sphinxadmonition}
 # cp _build/latex/JABAWS.pdf ../../jabaws-2.2-dev/docs/jabaws_manual.pdf
-# cp _build/latex/JABAWS.pdf ../website/docs/jabaws_manual.pdf
+# cp _build/latex/JABAWS.pdf ../../website/docs/v_2_2_0/jabaws_manual.pdf
+# rm -rf _build
 
 # for multiple versions of this manual we need to implement some solution
 # like this one https://robpol86.github.io/sphinxcontrib-versioning/index.html
similarity index 96%
rename from docs/index.rst
rename to docs/v_2_2_0/index.rst
index e0a0729..67dc7b0 100644 (file)
@@ -11,7 +11,7 @@ Read on these documentation pages or go back to the `JABAWS homepage`_!
 JABAWS documentation is also available in *pdf*. `Download it here`_!
 
 
-.. _JABAWS homepage: ../
+.. _JABAWS homepage: ../../
 
 
 .. toctree::
similarity index 100%
rename from docs/make.bat
rename to docs/v_2_2_0/make.bat
similarity index 97%
rename from docs/stats.rst
rename to docs/v_2_2_0/stats.rst
index 7e5ac8c..412731f 100644 (file)
@@ -7,7 +7,7 @@ If you are using JABAWS VA (Virtual Appliance) then the username is *jabaws* and
 
 If you have deployed a JABAWS WAR file, then please see the `configuring privileged access`_ for Tomcat web application server section for further details.
 
-.. image:: ../website/static/img/usage_statistics_main.gif
+.. image:: ../../website/static/img/usage_statistics_main.gif
    :height: 318
    :width: 608
    :scale: 100 %
@@ -34,7 +34,7 @@ Detailed View
 
 Detailed execution statistics for each month is available for authenticated users only.
 
-.. image:: ../website/static/img/usage_statistics_month.gif
+.. image:: ../../website/static/img/usage_statistics_month.gif
    :height: 902
    :width: 670
    :scale: 100 %
@@ -62,7 +62,7 @@ Job List
 
 Please note that if you deployed JABAWS WAR, in order to be able to navigate to the job directory from this view, the application server may need to be configured. Please see the `Configuring JABAWS execution statistics`_ section for further details.
 
-.. image:: ../website/static/img/usage_statistics_details.gif
+.. image:: ../../website/static/img/usage_statistics_details.gif
    :height: 198
    :width: 917
    :scale: 100 %
@@ -88,7 +88,7 @@ Columns:
 Job Directory Contents
 ----------------------
 
-.. image:: ../website/static/img/usage_statistics_job_details.gif
+.. image:: ../../website/static/img/usage_statistics_job_details.gif
    :height: 420
    :width: 716
    :scale: 90 %
similarity index 97%
rename from docs/va.rst
rename to docs/v_2_2_0/va.rst
index d9e7de2..b5f3de4 100644 (file)
@@ -36,7 +36,7 @@ Usage
 By default, the JABAWS virtual appliance is configured with 512M of memory and 1 CPU, but you are free to change these settings. If you have more than one CPU or CPU core on your computer you can make them available for the JABAWS virtual machine by editing virtual machine settings. Please bear in mind that more CPU power will not make a single calculation go faster, but it will enable the VM to do calculations in parallel. Similarly, you can add more memory to the virtual machine. More memory lets your VM deal with larger tasks, e.g. work with large alignments.
 
 
-.. image:: ../website/static/img/VMware_cpu.png
+.. image:: ../../website/static/img/VMware_cpu.png
    :height: 267
    :width: 708
    :scale: 95 %
@@ -103,7 +103,7 @@ After booting the JABAWS VM, you should see similar screen, however, the IP addr
 
 .. _Jalview help pages: http://www.jalview.org/help/html/webServices/JABAWS.html
 
-.. image:: ../website/static/img/vm_welcome_screen.png
+.. image:: ../../website/static/img/vm_welcome_screen.png
    :height: 461
    :width: 734
    :scale: 95 %
@@ -111,7 +111,7 @@ After booting the JABAWS VM, you should see similar screen, however, the IP addr
 
 If you click on Advanced Menu, you will see the configuration console, similar to the one below.
 
-.. image:: ../website/static/img/VMware_booted.png
+.. image:: ../../website/static/img/VMware_booted.png
   :height: 461
   :width: 735
   :scale: 95 %
similarity index 100%
rename from docs/war.rst
rename to docs/v_2_2_0/war.rst
similarity index 99%
rename from website/docs/_sources/advanced.rst.txt
rename to website/docs/v_2_2_0/_sources/advanced.rst.txt
index 38a4185..e636c8a 100644 (file)
@@ -463,8 +463,8 @@ JABAWS War File Content
 
 .. links
 .. _war file content table: advanced.html#jabaws_war_file_content
-.. _dm_javadoc: http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html
-.. _full_javadoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
+.. _dm_javadoc: ../dm_javadoc/index.html
+.. _full_javadoc: ../full_javadoc/index.html
 .. _prog_docs: http://www.compbio.dundee.ac.uk/jabaws/prog_docs/
 .. _test JABAWS: advanced.html#testing-the-jabaws-server
 .. _deploying on Tomcat tips: war.html
similarity index 96%
rename from website/docs/_sources/changelog.rst.txt
rename to website/docs/v_2_2_0/_sources/changelog.rst.txt
index d4016fc..f5f4d93 100644 (file)
@@ -59,7 +59,7 @@ JABAWS 2.0.1 includes several bug fixes and minor updates for JABAWS Version 2.0
 * Disembl returned swapped strings for HOTLOOPS and REM465
 * Jronn failed to process jobs with more than 3 sequences
 * JABAWS could not deal with FASTA records with '>' symbols in the record identificator
-* Change of parameter description for AAcon: parameters have been replaced with options for calculation methods. This allows a user to get several AAcon's conservation scores in one call
+* Change of parameter description for AACon: parameters have been replaced with options for calculation methods. This allows a user to get several AACon's conservation scores in one call
 * JABAWS never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer than a period defined in Engine.properties
 * Default web security has been incompatible with Tomcat 7.0.31 and newer
 * Documentation has been updated
similarity index 99%
rename from website/docs/_sources/develop.rst.txt
rename to website/docs/v_2_2_0/_sources/develop.rst.txt
index 538923c..4c7db93 100644 (file)
@@ -61,7 +61,7 @@ Structure of the project
 The code structure
 ------------------
 
-.. image:: ../website/static/img/ws-structure.png
+.. image:: ../../website/static/img/ws-structure.png
   :height: 414
   :width: 282
   :scale: 95 %
@@ -615,15 +615,15 @@ If you made any changes to the data model and would like to generate a complete
 
 
 
-.. |folder| image:: ../website/static/img/folder-small.png
+.. |folder| image:: ../../website/static/img/folder-small.png
    :align: middle
    :width: 15
 
 
 .. links
 .. _Git-tracker: https://source.jalview.org/crucible/changelog/jabaws
-.. _Data Model JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html
-.. _Complete JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
+.. _Data Model JavaDoc: ../dm_javadoc/index.html
+.. _Complete JavaDoc: ../full_javadoc/index.html
 .. _JavaDoc: http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html
 .. _Test Results: http://www.compbio.dundee.ac.uk/user/www-jws2/tests/index.html
 .. _TestNG: http://testng.org/doc/index.html
similarity index 96%
rename from website/docs/_sources/index.rst.txt
rename to website/docs/v_2_2_0/_sources/index.rst.txt
index e0a0729..67dc7b0 100644 (file)
@@ -11,7 +11,7 @@ Read on these documentation pages or go back to the `JABAWS homepage`_!
 JABAWS documentation is also available in *pdf*. `Download it here`_!
 
 
-.. _JABAWS homepage: ../
+.. _JABAWS homepage: ../../
 
 
 .. toctree::
similarity index 97%
rename from website/docs/_sources/stats.rst.txt
rename to website/docs/v_2_2_0/_sources/stats.rst.txt
index 7e5ac8c..412731f 100644 (file)
@@ -7,7 +7,7 @@ If you are using JABAWS VA (Virtual Appliance) then the username is *jabaws* and
 
 If you have deployed a JABAWS WAR file, then please see the `configuring privileged access`_ for Tomcat web application server section for further details.
 
-.. image:: ../website/static/img/usage_statistics_main.gif
+.. image:: ../../website/static/img/usage_statistics_main.gif
    :height: 318
    :width: 608
    :scale: 100 %
@@ -34,7 +34,7 @@ Detailed View
 
 Detailed execution statistics for each month is available for authenticated users only.
 
-.. image:: ../website/static/img/usage_statistics_month.gif
+.. image:: ../../website/static/img/usage_statistics_month.gif
    :height: 902
    :width: 670
    :scale: 100 %
@@ -62,7 +62,7 @@ Job List
 
 Please note that if you deployed JABAWS WAR, in order to be able to navigate to the job directory from this view, the application server may need to be configured. Please see the `Configuring JABAWS execution statistics`_ section for further details.
 
-.. image:: ../website/static/img/usage_statistics_details.gif
+.. image:: ../../website/static/img/usage_statistics_details.gif
    :height: 198
    :width: 917
    :scale: 100 %
@@ -88,7 +88,7 @@ Columns:
 Job Directory Contents
 ----------------------
 
-.. image:: ../website/static/img/usage_statistics_job_details.gif
+.. image:: ../../website/static/img/usage_statistics_job_details.gif
    :height: 420
    :width: 716
    :scale: 90 %
similarity index 97%
rename from website/docs/_sources/va.rst.txt
rename to website/docs/v_2_2_0/_sources/va.rst.txt
index d9e7de2..b5f3de4 100644 (file)
@@ -36,7 +36,7 @@ Usage
 By default, the JABAWS virtual appliance is configured with 512M of memory and 1 CPU, but you are free to change these settings. If you have more than one CPU or CPU core on your computer you can make them available for the JABAWS virtual machine by editing virtual machine settings. Please bear in mind that more CPU power will not make a single calculation go faster, but it will enable the VM to do calculations in parallel. Similarly, you can add more memory to the virtual machine. More memory lets your VM deal with larger tasks, e.g. work with large alignments.
 
 
-.. image:: ../website/static/img/VMware_cpu.png
+.. image:: ../../website/static/img/VMware_cpu.png
    :height: 267
    :width: 708
    :scale: 95 %
@@ -103,7 +103,7 @@ After booting the JABAWS VM, you should see similar screen, however, the IP addr
 
 .. _Jalview help pages: http://www.jalview.org/help/html/webServices/JABAWS.html
 
-.. image:: ../website/static/img/vm_welcome_screen.png
+.. image:: ../../website/static/img/vm_welcome_screen.png
    :height: 461
    :width: 734
    :scale: 95 %
@@ -111,7 +111,7 @@ After booting the JABAWS VM, you should see similar screen, however, the IP addr
 
 If you click on Advanced Menu, you will see the configuration console, similar to the one below.
 
-.. image:: ../website/static/img/VMware_booted.png
+.. image:: ../../website/static/img/VMware_booted.png
   :height: 461
   :width: 735
   :scale: 95 %
similarity index 99%
rename from website/docs/advanced.html
rename to website/docs/v_2_2_0/advanced.html
index 3cdb12a..c64a862 100644 (file)
@@ -540,10 +540,10 @@ After you have completed the editing your configuration may look like this:</p>
 <tr class="row-even"><td>/</td>
 <td>help pages, index.html is the starting page</td>
 </tr>
-<tr class="row-odd"><td><a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html">dm_javadoc</a></td>
+<tr class="row-odd"><td><a class="reference external" href="../dm_javadoc/index.html">dm_javadoc</a></td>
 <td>JavaDoc for the JABAWS Data Model</td>
 </tr>
-<tr class="row-even"><td><a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html">full_javadoc</a></td>
+<tr class="row-even"><td><a class="reference external" href="../full_javadoc/index.html">full_javadoc</a></td>
 <td>JavaDoc for the complete JABAWS</td>
 </tr>
 <tr class="row-odd"><td><a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/prog_docs/">prog_docs</a></td>
@@ -575,7 +575,7 @@ After you have completed the editing your configuration may look like this:</p>
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 98%
rename from website/docs/changelog.html
rename to website/docs/v_2_2_0/changelog.html
index 277cdad..89028b4 100644 (file)
 <li>Disembl returned swapped strings for HOTLOOPS and REM465</li>
 <li>Jronn failed to process jobs with more than 3 sequences</li>
 <li>JABAWS could not deal with FASTA records with &#8216;&gt;&#8217; symbols in the record identificator</li>
-<li>Change of parameter description for AAcon: parameters have been replaced with options for calculation methods. This allows a user to get several AAcon&#8217;s conservation scores in one call</li>
+<li>Change of parameter description for AACon: parameters have been replaced with options for calculation methods. This allows a user to get several AACon&#8217;s conservation scores in one call</li>
 <li>JABAWS never cleaned up job directories. Now JABAWS deletes the job directory if it exist longer than a period defined in Engine.properties</li>
 <li>Default web security has been incompatible with Tomcat 7.0.31 and newer</li>
 <li>Documentation has been updated</li>
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/citations.html
rename to website/docs/v_2_2_0/citations.html
index 0db9016..58b388e 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/client.html
rename to website/docs/v_2_2_0/client.html
index 4858aef..3fdffc3 100644 (file)
@@ -271,7 +271,7 @@ Please note that -r and -f options cannot be used together. Alignment is done wi
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 98%
rename from website/docs/develop.html
rename to website/docs/v_2_2_0/develop.html
index fb1d0f8..5d32d15 100644 (file)
 </div>
 <div class="section" id="the-api">
 <span id="jabaws-api"></span><h2>The API<a class="headerlink" href="#the-api" title="Permalink to this headline">¶</a></h2>
-<p><a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html">Data Model JavaDoc</a> - read this if your are coding against JABA Web Services</p>
-<p><a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/full_javadoc/index.html">Complete JavaDoc</a> - for developers who want to use JABAWS framework and use Engines and Executables directly</p>
+<p><a class="reference external" href="../dm_javadoc/index.html">Data Model JavaDoc</a> - read this if your are coding against JABA Web Services</p>
+<p><a class="reference external" href="../full_javadoc/index.html">Complete JavaDoc</a> - for developers who want to use JABAWS framework and use Engines and Executables directly</p>
 <hr class="docutils" />
 </div>
 <div class="section" id="structure-of-the-project">
@@ -337,7 +337,7 @@ JABAWS uses TestNG for testing. There is a TestNG plugin available for Eclipse w
 </tbody>
 </table>
 <p>Additional utility libraries that this client depend upon is the compbio-util-1.3.jar and compbio-annotation-1.0.jar.</p>
-<p>Please refer to a <a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html">Data Model JavaDoc</a> for a detailed description of each class and its methods.</p>
+<p>Please refer to a <a class="reference external" href="../dm_javadoc/index.html">Data Model JavaDoc</a> for a detailed description of each class and its methods.</p>
 <hr class="docutils" />
 </div>
 <div class="section" id="connecting-to-jabaws">
@@ -587,7 +587,7 @@ Methods and classes mentioned in the excerpt are available from the JABAWS clien
 <span class="o">}</span>
 </pre></div>
 </div>
-<p>For a more detailed description of all available types and their functions please refer to the <a class="reference external" href="http://www.compbio.dundee.ac.uk/jabaws/dm_javadoc/index.html">Data Model JavaDoc</a>.</p>
+<p>For a more detailed description of all available types and their functions please refer to the <a class="reference external" href="../dm_javadoc/index.html">Data Model JavaDoc</a>.</p>
 <hr class="docutils" />
 </div>
 </div>
@@ -695,7 +695,7 @@ Methods and classes mentioned in the excerpt are available from the JABAWS clien
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/genindex.html
rename to website/docs/v_2_2_0/genindex.html
index 0aeab05..d257af0 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/getting_started.html
rename to website/docs/v_2_2_0/getting_started.html
index 8dc1cb1..4fbe3c0 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/included_tools.html
rename to website/docs/v_2_2_0/included_tools.html
index 1de623b..d95061e 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/index.html
rename to website/docs/v_2_2_0/index.html
index 6fced19..2f76723 100644 (file)
             
   <div class="section" id="welcome-to-jabaws-s-documentation">
 <h1>Welcome to JABAWS&#8217;s documentation!<a class="headerlink" href="#welcome-to-jabaws-s-documentation" title="Permalink to this headline">¶</a></h1>
-<p>Read on these documentation pages or go back to the <a class="reference external" href="../">JABAWS homepage</a>!</p>
+<p>Read on these documentation pages or go back to the <a class="reference external" href="../../">JABAWS homepage</a>!</p>
 <p>JABAWS documentation is also available in <em>pdf</em>. <a class="reference external" href="./jabaws_manual.pdf">Download it here</a>!</p>
 <div class="toctree-wrapper compound">
 <p class="caption"><span class="caption-text">Contents:</span></p>
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 92%
rename from website/docs/jabaws_manual.pdf
rename to website/docs/v_2_2_0/jabaws_manual.pdf
index 0e23b76..08d4df9 100644 (file)
Binary files a/website/docs/jabaws_manual.pdf and b/website/docs/v_2_2_0/jabaws_manual.pdf differ
similarity index 99%
rename from website/docs/search.html
rename to website/docs/v_2_2_0/search.html
index c2141ce..2979a34 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/stats.html
rename to website/docs/v_2_2_0/stats.html
index 96abbb2..0e19253 100644 (file)
@@ -298,7 +298,7 @@ local.stat.maxruntime<span class="o">=</span><span class="m">6</span>
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/va.html
rename to website/docs/v_2_2_0/va.html
index 90b468f..2a2ddee 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
similarity index 99%
rename from website/docs/war.html
rename to website/docs/v_2_2_0/war.html
index 4f8d45e..b8b1e48 100644 (file)
   <hr/>
 
   <div role="contentinfo">
-    <p><a href="../">JABAWS 2.2</a>
+    <p><a href="../../">JABAWS 2.2</a>
         &copy; Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.
 
     </p>
index e700cc4..40e2d38 100644 (file)
@@ -21,7 +21,7 @@
                 <p class="justify">
                     Read the <a href="${pageContext.request.contextPath}/getting_started.jsp"><em>Getting Started</em></a>
                     guides to better decide which JABAWS distribution better suits your needs.
-                    Additional information is available in the <a href="${pageContext.request.contextPath}/docs/index.html">
+                    Additional information is available in the <a href="${pageContext.request.contextPath}/docs/v_2_2_0/index.html">
                     documentation pages</a>.
                 </p>
                 <br>
                 <ul>
                     <li>
                         <a href='${pageContext.request.contextPath}/archive/min-jabaws-client-2.2.0.jar'>
-                            <i class="fa fa-download" aria-hidden="true"></i>CLI jar file with binaries</a> (with log4j)</li>
+                            <i class="fa fa-download" aria-hidden="true"></i> CLI jar file with binaries</a> (with log4j)</li>
                     <li>
                         <a href='${pageContext.request.contextPath}/archive/min-jabaws-client-nolog-2.2.0.jar'>
-                            <i class="fa fa-download" aria-hidden="true"></i>CLI jar file with binaries</a> (without log4j)</li>
+                            <i class="fa fa-download" aria-hidden="true"></i> CLI jar file with binaries</a> (without log4j)</li>
                     <li>
                         <a href='${pageContext.request.contextPath}/archive/jabaws-client-src-2.2.0.jar'>
-                            <i class="fa fa-download" aria-hidden="true"></i>CLI client source</a></li>
+                            <i class="fa fa-download" aria-hidden="true"></i> CLI client source</a></li>
                 </ul>
                 <p class="justify">
                     The command line client displays help when executed without arguments,
                     more details is available from the JABAWS
-                    <a href="${pageContext.request.contextPath}/docs/client.html">document pages</a>.
+                    <a href="${pageContext.request.contextPath}/docs/v_2_2_0/client.html">document pages</a>.
                 </p>
                 <p class="text-right">
                     <a href="#">Back to top <i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                         (includes source and precompiled Linux x86 and Windows binaries)</li>
                 </ul>
                 <p class="justify">
-                    Please check the JABAWS <a href="${pageContext.request.contextPath}/docs/war.html">document pages</a>
+                    Please check the JABAWS <a href="${pageContext.request.contextPath}/docs/v_2_2_0/war.html">document pages</a>
                     for further instructions.
                 </p>
                 <p class="text-right">
                             <i class="fa fa-download" aria-hidden="true"></i> JABAWS Virtual Appliance</a></li>
                 </ul>
                 <p class="justify">
-                    Please check the JABAWS <a href="${pageContext.request.contextPath}/docs/va.html">document pages</a>
+                    Please check the JABAWS <a href="${pageContext.request.contextPath}/docs/v_2_2_0/va.html">document pages</a>
                     for further instructions.
                 </p>
                 <p class="text-right">
index 19978f3..df22a01 100644 (file)
@@ -20,7 +20,7 @@
             <div class="panel-body">
                 <p class="justify">
                     Choose the JABAWS distribution that better suits your needs and read the <em>Getting Started</em> guides below.
-                    Detailed information is available in the <a href="${pageContext.request.contextPath}/docs/index.html">
+                    Detailed information is available in the <a href="${pageContext.request.contextPath}/docs/v_2_2_0/index.html">
                     documentation pages</a>.
                 </p>
                 <br>
@@ -94,7 +94,7 @@
                     It allows anyone who wants to connect to the JABAWS web-services running at the
                     University of Dundee's Public Server, or to run a local private JABAWS server from their own software.
                     You can read more about how to use JABAWS command line (CLI) client given in the
-                    <a href="docs/client.html">documentation pages</a>,
+                    <a href="docs/v_2_2_0/client.html">documentation pages</a>,
                     but a brief instructions are given below:
                 </p>
                 <ol>
                     The JABA Web Services are WS-I compliant. This means that you can access them from any
                     language that has libraries or functions for consuming interoperable SOAP web services.
                     More information on how to develop software that access JABAWS services is provided in the
-                    <a href="docs/develop.html#accessing-jabaws-from-your-program">documentation pages</a>.
+                    <a href="docs/v_2_2_0/develop.html#accessing-jabaws-from-your-program">documentation pages</a>.
                     <!-- TODO Provide list of libraries for different languages -->
                 </p>
                 <p class="text-right">
                     The JABAWS Web Application aRchive (WAR) is for anyone who wants to run JABAWS for their group, lab or organization,
                     or wants to enable their local JABAWS server to use the cluster or perform very large tasks.
                     Complete documentation is provided in the
-                    <a href="docs/war.html">documentation pages</a>, but brief instructions are given below:
+                    <a href="docs/v_2_2_0/war.html">documentation pages</a>, but brief instructions are given below:
                 </p>
                 <ol>
                     <li>Download the <a href="${pageContext.request.contextPath}/download.jsp#war">JABAWS WAR file</a></li>
                 <p class="justify">
                     The Virtual Appliance (VA) package allows you to run a JABAWS server installed on TurnKey Linux as a
                     virtual machine on your laptop or desktop computer. A complete guide
-                    to the JABAWS VA is given in the <a href="${pageContext.request.contextPath}/docs/va.html">documentation pages</a>,
+                    to the JABAWS VA is given in the <a href="${pageContext.request.contextPath}/docs/v_2_2_0/va.html">documentation pages</a>,
                     but for the impatient, brief instructions are given below:
                 </p>
 
index c80ffb3..9e40bf8 100644 (file)
                 <p class="justify">
                     You can access our public JABAWS web services with <a href="http://www.jalview.org/">Jalview</a>,
                     <a href="${pageContext.request.contextPath}/getting_started.jsp#client">JABAWS CLI</a>, or
-                    <a href="${pageContext.request.contextPath}/docs/develop.html#accessing-jabaws-from-your-program">with your own program</a>.
+                    <a href="${pageContext.request.contextPath}/docs/v_2_2_0/develop.html#accessing-jabaws-from-your-program">with your own program</a>.
                     The latest versions of Jalview (version 2.9 or later) are fully compatible
                     with JABAWS 2.2 and are configured to use the public JABAWS server by default.
                 </p>
index 631460f..e3781ef 100644 (file)
         <div class="col-md-4">
             <ul class="list-unstyled">
                 <li>
-                    <strong><a href="${pageContext.request.contextPath}/docs/index.html">Documentation</a></strong>
+                    <strong><a href="${pageContext.request.contextPath}/docs/v_2_2_0/index.html">Documentation</a></strong>
                     <ul>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/getting_started.html">Getting Started</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/getting_started.html">Getting Started</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/included_tools.html">Included Tools</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/included_tools.html">Included Tools</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/client.html">Command Line Client (CLI)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/client.html">Command Line Client (CLI)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/war.html">Web Application Archive (WAR)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/war.html">Web Application Archive (WAR)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/va.html">Virtual Appliance (VA)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/va.html">Virtual Appliance (VA)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/advanced.html">Advanced Usage</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/advanced.html">Advanced Usage</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/develop.html">For Developers</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/develop.html">For Developers</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/changelog.html">Changelog</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/changelog.html">Changelog</a>
                         </li>
                     </ul>
                 </li>
@@ -93,7 +93,7 @@
     </div>
     <hr>
     <p class="text-right"><small>
-        Site Last updated: 12 April 2017. This site was built using the <a href="http://getbootstrap.com">Bootstrap framework.</a>
+        Site Last updated: 21 April 2017. This site was built using the <a href="http://getbootstrap.com">Bootstrap framework.</a>
     </small></p>
 </div>
 
index a447d8f..831284b 100644 (file)
 
                     <ul class="dropdown-menu">
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/getting_started.html">Getting Started</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/getting_started.html">Getting Started</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/included_tools.html">Included Tools</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/included_tools.html">Included Tools</a>
                         </li>
                         <li class="divider"></li>
                        <li>
-                            <a href="${pageContext.request.contextPath}/docs/client.html">Command Line Client (CLI)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/client.html">Command Line Client (CLI)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/war.html">Web Application Archive (WAR)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/war.html">Web Application Archive (WAR)</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/va.html">Virtual Appliance (VA)</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/va.html">Virtual Appliance (VA)</a>
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/advanced.html">Advanced Usage</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/advanced.html">Advanced Usage</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/develop.html">For Developers</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/develop.html">For Developers</a>
                         </li>
                         <li class="divider"></li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/changelog.html">Changelog</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/changelog.html">Changelog</a>
                         </li>
                         <li>
-                            <a href="${pageContext.request.contextPath}/docs/stats.html">Usage Statistics</a>
+                            <a href="${pageContext.request.contextPath}/docs/v_2_2_0/stats.html">Usage Statistics</a>
                         </li>
                         <li class="divider"></li>
                         <li>