From 2da44d18582e4d851e137573346a4916435c220b Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A1bio=20Madeira?= Date: Fri, 21 Apr 2017 15:51:46 +0100 Subject: [PATCH] JWS-109 & JWS-116 Moved the docs (source and html built) to a new location that is based on the version. --- docs/{ => v_2_2_0}/Makefile | 0 docs/{ => v_2_2_0}/README.txt | 0 .../_themes/sphinx_rtd_theme/__init__.py | 0 .../_themes/sphinx_rtd_theme/breadcrumbs.html | 0 .../_themes/sphinx_rtd_theme/footer.html | 2 +- .../_themes/sphinx_rtd_theme/layout.html | 0 .../_themes/sphinx_rtd_theme/layout_old.html | 0 .../_themes/sphinx_rtd_theme/search.html | 0 .../_themes/sphinx_rtd_theme/searchbox.html | 0 .../sphinx_rtd_theme/static/css/badge_only.css | 0 .../sphinx_rtd_theme/static/css/badge_only.css.map | 0 .../_themes/sphinx_rtd_theme/static/css/theme.css | 0 .../sphinx_rtd_theme/static/css/theme.css.map | 0 .../sphinx_rtd_theme/static/fonts/FontAwesome.otf | Bin 124988 -> 124988 bytes .../static/fonts/Inconsolata-Bold.ttf | Bin 109948 -> 109948 bytes .../static/fonts/Inconsolata-Regular.ttf | Bin 96964 -> 96964 bytes .../sphinx_rtd_theme/static/fonts/Lato-Bold.ttf | Bin 656544 -> 656544 bytes .../sphinx_rtd_theme/static/fonts/Lato-Regular.ttf | Bin 656568 -> 656568 bytes .../static/fonts/RobotoSlab-Bold.ttf | Bin 170616 -> 170616 bytes .../static/fonts/RobotoSlab-Regular.ttf | Bin 169064 -> 169064 bytes .../static/fonts/fontawesome-webfont.eot | Bin 76518 -> 76518 bytes .../static/fonts/fontawesome-webfont.svg | 0 .../static/fonts/fontawesome-webfont.ttf | Bin 152796 -> 152796 bytes .../static/fonts/fontawesome-webfont.woff | Bin 90412 -> 90412 bytes .../static/fonts/fontawesome-webfont.woff2 | Bin 71896 -> 71896 bytes .../sphinx_rtd_theme/static/js/modernizr.min.js | 0 .../_themes/sphinx_rtd_theme/static/js/theme.js | 0 .../_themes/sphinx_rtd_theme/theme.conf | 0 .../_themes/sphinx_rtd_theme/versions.html | 0 docs/{ => v_2_2_0}/advanced.rst | 4 ++-- docs/{ => v_2_2_0}/changelog.rst | 2 +- docs/{ => v_2_2_0}/citations.rst | 0 docs/{ => v_2_2_0}/client.rst | 0 docs/{ => v_2_2_0}/conf.py | 2 +- docs/{ => v_2_2_0}/develop.rst | 8 ++++---- docs/{ => v_2_2_0}/generate_manual.sh | 9 +++++---- docs/{ => v_2_2_0}/getting_started.rst | 0 docs/{ => v_2_2_0}/included_tools.rst | 0 docs/{ => v_2_2_0}/index.rst | 2 +- docs/{ => v_2_2_0}/make.bat | 0 docs/{ => v_2_2_0}/stats.rst | 8 ++++---- docs/{ => v_2_2_0}/va.rst | 6 +++--- docs/{ => v_2_2_0}/war.rst | 0 .../docs/{ => v_2_2_0}/_images/VMware_booted.png | Bin 9498 -> 9498 bytes website/docs/{ => v_2_2_0}/_images/VMware_cpu.png | Bin 33013 -> 33013 bytes .../docs/{ => v_2_2_0}/_images/folder-small.png | Bin 6092 -> 6092 bytes .../_images/usage_statistics_details.gif | Bin 11448 -> 11448 bytes .../_images/usage_statistics_job_details.gif | Bin 17499 -> 17499 bytes .../_images/usage_statistics_main.gif | Bin 9016 -> 9016 bytes .../_images/usage_statistics_month.gif | Bin 27046 -> 27046 bytes .../{ => v_2_2_0}/_images/vm_welcome_screen.png | Bin 9481 -> 9481 bytes .../docs/{ => v_2_2_0}/_images/ws-structure.png | Bin 19953 -> 19953 bytes .../docs/{ => v_2_2_0}/_sources/advanced.rst.txt | 4 ++-- .../docs/{ => v_2_2_0}/_sources/changelog.rst.txt | 2 +- .../docs/{ => v_2_2_0}/_sources/citations.rst.txt | 0 website/docs/{ => v_2_2_0}/_sources/client.rst.txt | 0 .../docs/{ => v_2_2_0}/_sources/develop.rst.txt | 8 ++++---- .../{ => v_2_2_0}/_sources/getting_started.rst.txt | 0 .../{ => v_2_2_0}/_sources/included_tools.rst.txt | 0 website/docs/{ => v_2_2_0}/_sources/index.rst.txt | 2 +- .../{ => v_2_2_0}/_sources/man/advanced.rst.txt | 0 .../{ => v_2_2_0}/_sources/man/changelog.rst.txt | 0 .../{ => v_2_2_0}/_sources/man/citations.rst.txt | 0 .../docs/{ => v_2_2_0}/_sources/man/client.rst.txt | 0 .../{ => v_2_2_0}/_sources/man/develop.rst.txt | 0 .../_sources/man/getting_started.rst.txt | 0 .../_sources/man/included_tools.rst.txt | 0 website/docs/{ => v_2_2_0}/_sources/man/va.rst.txt | 0 .../docs/{ => v_2_2_0}/_sources/man/war.rst.txt | 0 website/docs/{ => v_2_2_0}/_sources/stats.rst.txt | 8 ++++---- website/docs/{ => v_2_2_0}/_sources/va.rst.txt | 6 +++--- website/docs/{ => v_2_2_0}/_sources/war.rst.txt | 0 website/docs/{ => v_2_2_0}/_static/ajax-loader.gif | Bin 673 -> 673 bytes website/docs/{ => v_2_2_0}/_static/basic.css | 0 .../docs/{ => v_2_2_0}/_static/comment-bright.png | Bin 756 -> 756 bytes .../docs/{ => v_2_2_0}/_static/comment-close.png | Bin 829 -> 829 bytes website/docs/{ => v_2_2_0}/_static/comment.png | Bin 641 -> 641 bytes .../docs/{ => v_2_2_0}/_static/css/badge_only.css | 0 .../{ => v_2_2_0}/_static/css/badge_only.css.map | 0 website/docs/{ => v_2_2_0}/_static/css/theme.css | 0 .../docs/{ => v_2_2_0}/_static/css/theme.css.map | 0 website/docs/{ => v_2_2_0}/_static/doctools.js | 0 .../docs/{ => v_2_2_0}/_static/down-pressed.png | Bin 222 -> 222 bytes website/docs/{ => v_2_2_0}/_static/down.png | Bin 202 -> 202 bytes website/docs/{ => v_2_2_0}/_static/file.png | Bin 286 -> 286 bytes .../{ => v_2_2_0}/_static/fonts/FontAwesome.otf | Bin 124988 -> 124988 bytes .../_static/fonts/Inconsolata-Bold.ttf | Bin 109948 -> 109948 bytes .../_static/fonts/Inconsolata-Regular.ttf | Bin 96964 -> 96964 bytes .../docs/{ => v_2_2_0}/_static/fonts/Lato-Bold.ttf | Bin 656544 -> 656544 bytes .../{ => v_2_2_0}/_static/fonts/Lato-Regular.ttf | Bin 656568 -> 656568 bytes .../_static/fonts/RobotoSlab-Bold.ttf | Bin 170616 -> 170616 bytes .../_static/fonts/RobotoSlab-Regular.ttf | Bin 169064 -> 169064 bytes .../_static/fonts/fontawesome-webfont.eot | Bin 76518 -> 76518 bytes .../_static/fonts/fontawesome-webfont.svg | 0 .../_static/fonts/fontawesome-webfont.ttf | Bin 152796 -> 152796 bytes .../_static/fonts/fontawesome-webfont.woff | Bin 90412 -> 90412 bytes .../_static/fonts/fontawesome-webfont.woff2 | Bin 71896 -> 71896 bytes website/docs/{ => v_2_2_0}/_static/jquery-3.1.0.js | 0 website/docs/{ => v_2_2_0}/_static/jquery.js | 0 .../docs/{ => v_2_2_0}/_static/js/modernizr.min.js | 0 website/docs/{ => v_2_2_0}/_static/js/theme.js | 0 website/docs/{ => v_2_2_0}/_static/minus.png | Bin 90 -> 90 bytes website/docs/{ => v_2_2_0}/_static/plus.png | Bin 90 -> 90 bytes website/docs/{ => v_2_2_0}/_static/pygments.css | 0 website/docs/{ => v_2_2_0}/_static/searchtools.js | 0 .../docs/{ => v_2_2_0}/_static/underscore-1.3.1.js | 0 website/docs/{ => v_2_2_0}/_static/underscore.js | 0 website/docs/{ => v_2_2_0}/_static/up-pressed.png | Bin 214 -> 214 bytes website/docs/{ => v_2_2_0}/_static/up.png | Bin 203 -> 203 bytes website/docs/{ => v_2_2_0}/_static/websupport.js | 0 website/docs/{ => v_2_2_0}/advanced.html | 6 +++--- website/docs/{ => v_2_2_0}/changelog.html | 4 ++-- website/docs/{ => v_2_2_0}/citations.html | 2 +- website/docs/{ => v_2_2_0}/client.html | 2 +- website/docs/{ => v_2_2_0}/develop.html | 10 +++++----- website/docs/{ => v_2_2_0}/genindex.html | 2 +- website/docs/{ => v_2_2_0}/getting_started.html | 2 +- website/docs/{ => v_2_2_0}/included_tools.html | 2 +- website/docs/{ => v_2_2_0}/index.html | 4 ++-- website/docs/{ => v_2_2_0}/jabaws_manual.pdf | Bin 335464 -> 335198 bytes website/docs/{ => v_2_2_0}/objects.inv | Bin 1755 -> 1755 bytes website/docs/{ => v_2_2_0}/search.html | 2 +- website/docs/{ => v_2_2_0}/searchindex.js | 0 website/docs/{ => v_2_2_0}/stats.html | 2 +- website/docs/{ => v_2_2_0}/va.html | 2 +- website/docs/{ => v_2_2_0}/war.html | 2 +- website/download.jsp | 14 +++++++------- website/getting_started.jsp | 10 +++++----- website/index.jsp | 2 +- website/template_footer.jsp | 20 ++++++++++---------- website/template_header.jsp | 18 +++++++++--------- 131 files changed, 90 insertions(+), 89 deletions(-) rename docs/{ => v_2_2_0}/Makefile (100%) rename docs/{ => v_2_2_0}/README.txt (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/__init__.py (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/breadcrumbs.html (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/footer.html (98%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/layout.html (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/layout_old.html (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/search.html (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/searchbox.html (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/css/badge_only.css (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/css/badge_only.css.map (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/css/theme.css (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/css/theme.css.map (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/js/modernizr.min.js (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/static/js/theme.js (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/theme.conf (100%) rename docs/{ => v_2_2_0}/_themes/sphinx_rtd_theme/versions.html (100%) rename docs/{ => v_2_2_0}/advanced.rst (99%) rename docs/{ => v_2_2_0}/changelog.rst (96%) rename docs/{ => v_2_2_0}/citations.rst (100%) rename docs/{ => v_2_2_0}/client.rst (100%) rename docs/{ => v_2_2_0}/conf.py (97%) rename docs/{ => v_2_2_0}/develop.rst (99%) rename docs/{ => v_2_2_0}/generate_manual.sh (81%) rename docs/{ => v_2_2_0}/getting_started.rst (100%) rename docs/{ => v_2_2_0}/included_tools.rst (100%) rename docs/{ => v_2_2_0}/index.rst (96%) rename docs/{ => v_2_2_0}/make.bat (100%) rename docs/{ => v_2_2_0}/stats.rst (97%) rename docs/{ => v_2_2_0}/va.rst (97%) rename docs/{ => v_2_2_0}/war.rst (100%) rename website/docs/{ => v_2_2_0}/_images/VMware_booted.png (100%) rename website/docs/{ => v_2_2_0}/_images/VMware_cpu.png (100%) rename website/docs/{ => v_2_2_0}/_images/folder-small.png (100%) rename website/docs/{ => v_2_2_0}/_images/usage_statistics_details.gif (100%) rename website/docs/{ => v_2_2_0}/_images/usage_statistics_job_details.gif (100%) rename website/docs/{ => v_2_2_0}/_images/usage_statistics_main.gif (100%) rename website/docs/{ => v_2_2_0}/_images/usage_statistics_month.gif (100%) rename website/docs/{ => v_2_2_0}/_images/vm_welcome_screen.png (100%) rename website/docs/{ => v_2_2_0}/_images/ws-structure.png (100%) rename website/docs/{ => v_2_2_0}/_sources/advanced.rst.txt (99%) rename website/docs/{ => v_2_2_0}/_sources/changelog.rst.txt (96%) rename website/docs/{ => v_2_2_0}/_sources/citations.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/client.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/develop.rst.txt (99%) rename website/docs/{ => v_2_2_0}/_sources/getting_started.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/included_tools.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/index.rst.txt (96%) rename website/docs/{ => v_2_2_0}/_sources/man/advanced.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/changelog.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/citations.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/client.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/develop.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/getting_started.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/included_tools.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/va.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/man/war.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_sources/stats.rst.txt (97%) rename website/docs/{ => v_2_2_0}/_sources/va.rst.txt (97%) rename website/docs/{ => v_2_2_0}/_sources/war.rst.txt (100%) rename website/docs/{ => v_2_2_0}/_static/ajax-loader.gif (100%) rename website/docs/{ => v_2_2_0}/_static/basic.css (100%) rename website/docs/{ => v_2_2_0}/_static/comment-bright.png (100%) rename website/docs/{ => v_2_2_0}/_static/comment-close.png (100%) rename website/docs/{ => v_2_2_0}/_static/comment.png (100%) rename website/docs/{ => v_2_2_0}/_static/css/badge_only.css (100%) rename website/docs/{ => v_2_2_0}/_static/css/badge_only.css.map (100%) rename website/docs/{ => v_2_2_0}/_static/css/theme.css (100%) rename website/docs/{ => v_2_2_0}/_static/css/theme.css.map (100%) rename website/docs/{ => v_2_2_0}/_static/doctools.js (100%) rename website/docs/{ => v_2_2_0}/_static/down-pressed.png (100%) rename website/docs/{ => v_2_2_0}/_static/down.png (100%) rename website/docs/{ => v_2_2_0}/_static/file.png (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/FontAwesome.otf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/Inconsolata-Bold.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/Inconsolata-Regular.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/Lato-Bold.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/Lato-Regular.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/RobotoSlab-Bold.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/RobotoSlab-Regular.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/fontawesome-webfont.eot (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/fontawesome-webfont.svg (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/fontawesome-webfont.ttf (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/fontawesome-webfont.woff (100%) rename website/docs/{ => v_2_2_0}/_static/fonts/fontawesome-webfont.woff2 (100%) rename website/docs/{ => v_2_2_0}/_static/jquery-3.1.0.js (100%) rename website/docs/{ => v_2_2_0}/_static/jquery.js (100%) rename website/docs/{ => v_2_2_0}/_static/js/modernizr.min.js (100%) rename website/docs/{ => v_2_2_0}/_static/js/theme.js (100%) rename website/docs/{ => v_2_2_0}/_static/minus.png (100%) rename website/docs/{ => v_2_2_0}/_static/plus.png (100%) rename website/docs/{ => v_2_2_0}/_static/pygments.css (100%) rename website/docs/{ => v_2_2_0}/_static/searchtools.js (100%) rename website/docs/{ => v_2_2_0}/_static/underscore-1.3.1.js (100%) rename website/docs/{ => v_2_2_0}/_static/underscore.js (100%) rename website/docs/{ => v_2_2_0}/_static/up-pressed.png (100%) rename website/docs/{ => v_2_2_0}/_static/up.png (100%) rename website/docs/{ => v_2_2_0}/_static/websupport.js (100%) rename website/docs/{ => v_2_2_0}/advanced.html (99%) rename website/docs/{ => v_2_2_0}/changelog.html (98%) rename website/docs/{ => v_2_2_0}/citations.html (99%) rename website/docs/{ => v_2_2_0}/client.html (99%) rename website/docs/{ => v_2_2_0}/develop.html (98%) rename website/docs/{ => v_2_2_0}/genindex.html (99%) rename website/docs/{ => v_2_2_0}/getting_started.html (99%) rename website/docs/{ => v_2_2_0}/included_tools.html (99%) rename website/docs/{ => v_2_2_0}/index.html (99%) rename website/docs/{ => v_2_2_0}/jabaws_manual.pdf (92%) rename website/docs/{ => v_2_2_0}/objects.inv (100%) rename website/docs/{ => v_2_2_0}/search.html (99%) rename website/docs/{ => v_2_2_0}/searchindex.js (100%) rename website/docs/{ => v_2_2_0}/stats.html (99%) rename website/docs/{ => v_2_2_0}/va.html (99%) rename website/docs/{ => v_2_2_0}/war.html (99%) diff --git a/docs/Makefile b/docs/v_2_2_0/Makefile similarity index 100% rename from docs/Makefile rename to docs/v_2_2_0/Makefile diff --git a/docs/README.txt b/docs/v_2_2_0/README.txt similarity index 100% rename from docs/README.txt rename to docs/v_2_2_0/README.txt diff --git a/docs/_themes/sphinx_rtd_theme/__init__.py b/docs/v_2_2_0/_themes/sphinx_rtd_theme/__init__.py similarity index 100% rename from docs/_themes/sphinx_rtd_theme/__init__.py rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/__init__.py diff --git a/docs/_themes/sphinx_rtd_theme/breadcrumbs.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/breadcrumbs.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/breadcrumbs.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/breadcrumbs.html diff --git a/docs/_themes/sphinx_rtd_theme/footer.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/footer.html 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 --- a/docs/_themes/sphinx_rtd_theme/footer.html +++ b/docs/v_2_2_0/_themes/sphinx_rtd_theme/footer.html @@ -13,7 +13,7 @@
-

JABAWS 2.2 +

JABAWS 2.2 {%- if show_copyright %} {%- if hasdoc('copyright') %} {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} diff --git a/docs/_themes/sphinx_rtd_theme/layout.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/layout.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/layout.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/layout.html diff --git a/docs/_themes/sphinx_rtd_theme/layout_old.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/layout_old.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/layout_old.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/layout_old.html diff --git a/docs/_themes/sphinx_rtd_theme/search.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/search.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/search.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/search.html diff --git a/docs/_themes/sphinx_rtd_theme/searchbox.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/searchbox.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/searchbox.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/searchbox.html diff --git a/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/css/badge_only.css rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css diff --git a/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css.map b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css.map similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/css/badge_only.css.map rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/badge_only.css.map diff --git a/docs/_themes/sphinx_rtd_theme/static/css/theme.css b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/css/theme.css rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css diff --git a/docs/_themes/sphinx_rtd_theme/static/css/theme.css.map b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css.map similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/css/theme.css.map rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/css/theme.css.map diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff diff --git a/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 diff --git a/docs/_themes/sphinx_rtd_theme/static/js/modernizr.min.js b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/modernizr.min.js similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/js/modernizr.min.js rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/modernizr.min.js diff --git a/docs/_themes/sphinx_rtd_theme/static/js/theme.js b/docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/theme.js similarity index 100% rename from docs/_themes/sphinx_rtd_theme/static/js/theme.js rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/static/js/theme.js diff --git a/docs/_themes/sphinx_rtd_theme/theme.conf b/docs/v_2_2_0/_themes/sphinx_rtd_theme/theme.conf similarity index 100% rename from docs/_themes/sphinx_rtd_theme/theme.conf rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/theme.conf diff --git a/docs/_themes/sphinx_rtd_theme/versions.html b/docs/v_2_2_0/_themes/sphinx_rtd_theme/versions.html similarity index 100% rename from docs/_themes/sphinx_rtd_theme/versions.html rename to docs/v_2_2_0/_themes/sphinx_rtd_theme/versions.html diff --git a/docs/advanced.rst b/docs/v_2_2_0/advanced.rst similarity index 99% rename from docs/advanced.rst rename to docs/v_2_2_0/advanced.rst index 38a4185..e636c8a 100644 --- a/docs/advanced.rst +++ b/docs/v_2_2_0/advanced.rst @@ -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 diff --git a/docs/changelog.rst b/docs/v_2_2_0/changelog.rst similarity index 96% rename from docs/changelog.rst rename to docs/v_2_2_0/changelog.rst index d4016fc..f5f4d93 100644 --- a/docs/changelog.rst +++ b/docs/v_2_2_0/changelog.rst @@ -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 diff --git a/docs/citations.rst b/docs/v_2_2_0/citations.rst similarity index 100% rename from docs/citations.rst rename to docs/v_2_2_0/citations.rst diff --git a/docs/client.rst b/docs/v_2_2_0/client.rst similarity index 100% rename from docs/client.rst rename to docs/v_2_2_0/client.rst diff --git a/docs/conf.py b/docs/v_2_2_0/conf.py similarity index 97% rename from docs/conf.py rename to docs/v_2_2_0/conf.py index 41268cb..678f03a 100644 --- a/docs/conf.py +++ b/docs/v_2_2_0/conf.py @@ -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'), ] diff --git a/docs/develop.rst b/docs/v_2_2_0/develop.rst similarity index 99% rename from docs/develop.rst rename to docs/v_2_2_0/develop.rst index 538923c..4c7db93 100644 --- a/docs/develop.rst +++ b/docs/v_2_2_0/develop.rst @@ -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 diff --git a/docs/generate_manual.sh b/docs/v_2_2_0/generate_manual.sh similarity index 81% rename from docs/generate_manual.sh rename to docs/v_2_2_0/generate_manual.sh index 2d0297f..1effbb4 100755 --- a/docs/generate_manual.sh +++ b/docs/v_2_2_0/generate_manual.sh @@ -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 diff --git a/docs/getting_started.rst b/docs/v_2_2_0/getting_started.rst similarity index 100% rename from docs/getting_started.rst rename to docs/v_2_2_0/getting_started.rst diff --git a/docs/included_tools.rst b/docs/v_2_2_0/included_tools.rst similarity index 100% rename from docs/included_tools.rst rename to docs/v_2_2_0/included_tools.rst diff --git a/docs/index.rst b/docs/v_2_2_0/index.rst similarity index 96% rename from docs/index.rst rename to docs/v_2_2_0/index.rst index e0a0729..67dc7b0 100644 --- a/docs/index.rst +++ b/docs/v_2_2_0/index.rst @@ -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:: diff --git a/docs/make.bat b/docs/v_2_2_0/make.bat similarity index 100% rename from docs/make.bat rename to docs/v_2_2_0/make.bat diff --git a/docs/stats.rst b/docs/v_2_2_0/stats.rst similarity index 97% rename from docs/stats.rst rename to docs/v_2_2_0/stats.rst index 7e5ac8c..412731f 100644 --- a/docs/stats.rst +++ b/docs/v_2_2_0/stats.rst @@ -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 % diff --git a/docs/va.rst b/docs/v_2_2_0/va.rst similarity index 97% rename from docs/va.rst rename to docs/v_2_2_0/va.rst index d9e7de2..b5f3de4 100644 --- a/docs/va.rst +++ b/docs/v_2_2_0/va.rst @@ -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 % diff --git a/docs/war.rst b/docs/v_2_2_0/war.rst similarity index 100% rename from docs/war.rst rename to docs/v_2_2_0/war.rst diff --git a/website/docs/_images/VMware_booted.png b/website/docs/v_2_2_0/_images/VMware_booted.png similarity index 100% rename from website/docs/_images/VMware_booted.png rename to website/docs/v_2_2_0/_images/VMware_booted.png diff --git a/website/docs/_images/VMware_cpu.png b/website/docs/v_2_2_0/_images/VMware_cpu.png similarity index 100% rename from website/docs/_images/VMware_cpu.png rename to website/docs/v_2_2_0/_images/VMware_cpu.png diff --git a/website/docs/_images/folder-small.png b/website/docs/v_2_2_0/_images/folder-small.png similarity index 100% rename from website/docs/_images/folder-small.png rename to website/docs/v_2_2_0/_images/folder-small.png diff --git a/website/docs/_images/usage_statistics_details.gif b/website/docs/v_2_2_0/_images/usage_statistics_details.gif similarity index 100% rename from website/docs/_images/usage_statistics_details.gif rename to website/docs/v_2_2_0/_images/usage_statistics_details.gif diff --git a/website/docs/_images/usage_statistics_job_details.gif b/website/docs/v_2_2_0/_images/usage_statistics_job_details.gif similarity index 100% rename from website/docs/_images/usage_statistics_job_details.gif rename to website/docs/v_2_2_0/_images/usage_statistics_job_details.gif diff --git a/website/docs/_images/usage_statistics_main.gif b/website/docs/v_2_2_0/_images/usage_statistics_main.gif similarity index 100% rename from website/docs/_images/usage_statistics_main.gif rename to website/docs/v_2_2_0/_images/usage_statistics_main.gif diff --git a/website/docs/_images/usage_statistics_month.gif b/website/docs/v_2_2_0/_images/usage_statistics_month.gif similarity index 100% rename from website/docs/_images/usage_statistics_month.gif rename to website/docs/v_2_2_0/_images/usage_statistics_month.gif diff --git a/website/docs/_images/vm_welcome_screen.png b/website/docs/v_2_2_0/_images/vm_welcome_screen.png similarity index 100% rename from website/docs/_images/vm_welcome_screen.png rename to website/docs/v_2_2_0/_images/vm_welcome_screen.png diff --git a/website/docs/_images/ws-structure.png b/website/docs/v_2_2_0/_images/ws-structure.png similarity index 100% rename from website/docs/_images/ws-structure.png rename to website/docs/v_2_2_0/_images/ws-structure.png diff --git a/website/docs/_sources/advanced.rst.txt b/website/docs/v_2_2_0/_sources/advanced.rst.txt 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 --- a/website/docs/_sources/advanced.rst.txt +++ b/website/docs/v_2_2_0/_sources/advanced.rst.txt @@ -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 diff --git a/website/docs/_sources/changelog.rst.txt b/website/docs/v_2_2_0/_sources/changelog.rst.txt 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 --- a/website/docs/_sources/changelog.rst.txt +++ b/website/docs/v_2_2_0/_sources/changelog.rst.txt @@ -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 diff --git a/website/docs/_sources/citations.rst.txt b/website/docs/v_2_2_0/_sources/citations.rst.txt similarity index 100% rename from website/docs/_sources/citations.rst.txt rename to website/docs/v_2_2_0/_sources/citations.rst.txt diff --git a/website/docs/_sources/client.rst.txt b/website/docs/v_2_2_0/_sources/client.rst.txt similarity index 100% rename from website/docs/_sources/client.rst.txt rename to website/docs/v_2_2_0/_sources/client.rst.txt diff --git a/website/docs/_sources/develop.rst.txt b/website/docs/v_2_2_0/_sources/develop.rst.txt 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 --- a/website/docs/_sources/develop.rst.txt +++ b/website/docs/v_2_2_0/_sources/develop.rst.txt @@ -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 diff --git a/website/docs/_sources/getting_started.rst.txt b/website/docs/v_2_2_0/_sources/getting_started.rst.txt similarity index 100% rename from website/docs/_sources/getting_started.rst.txt rename to website/docs/v_2_2_0/_sources/getting_started.rst.txt diff --git a/website/docs/_sources/included_tools.rst.txt b/website/docs/v_2_2_0/_sources/included_tools.rst.txt similarity index 100% rename from website/docs/_sources/included_tools.rst.txt rename to website/docs/v_2_2_0/_sources/included_tools.rst.txt diff --git a/website/docs/_sources/index.rst.txt b/website/docs/v_2_2_0/_sources/index.rst.txt 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 --- a/website/docs/_sources/index.rst.txt +++ b/website/docs/v_2_2_0/_sources/index.rst.txt @@ -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:: diff --git a/website/docs/_sources/man/advanced.rst.txt b/website/docs/v_2_2_0/_sources/man/advanced.rst.txt similarity index 100% rename from website/docs/_sources/man/advanced.rst.txt rename to website/docs/v_2_2_0/_sources/man/advanced.rst.txt diff --git a/website/docs/_sources/man/changelog.rst.txt b/website/docs/v_2_2_0/_sources/man/changelog.rst.txt similarity index 100% rename from website/docs/_sources/man/changelog.rst.txt rename to website/docs/v_2_2_0/_sources/man/changelog.rst.txt diff --git a/website/docs/_sources/man/citations.rst.txt b/website/docs/v_2_2_0/_sources/man/citations.rst.txt similarity index 100% rename from website/docs/_sources/man/citations.rst.txt rename to website/docs/v_2_2_0/_sources/man/citations.rst.txt diff --git a/website/docs/_sources/man/client.rst.txt b/website/docs/v_2_2_0/_sources/man/client.rst.txt similarity index 100% rename from website/docs/_sources/man/client.rst.txt rename to website/docs/v_2_2_0/_sources/man/client.rst.txt diff --git a/website/docs/_sources/man/develop.rst.txt b/website/docs/v_2_2_0/_sources/man/develop.rst.txt similarity index 100% rename from website/docs/_sources/man/develop.rst.txt rename to website/docs/v_2_2_0/_sources/man/develop.rst.txt diff --git a/website/docs/_sources/man/getting_started.rst.txt b/website/docs/v_2_2_0/_sources/man/getting_started.rst.txt similarity index 100% rename from website/docs/_sources/man/getting_started.rst.txt rename to website/docs/v_2_2_0/_sources/man/getting_started.rst.txt diff --git a/website/docs/_sources/man/included_tools.rst.txt b/website/docs/v_2_2_0/_sources/man/included_tools.rst.txt similarity index 100% rename from website/docs/_sources/man/included_tools.rst.txt rename to website/docs/v_2_2_0/_sources/man/included_tools.rst.txt diff --git a/website/docs/_sources/man/va.rst.txt b/website/docs/v_2_2_0/_sources/man/va.rst.txt similarity index 100% rename from website/docs/_sources/man/va.rst.txt rename to website/docs/v_2_2_0/_sources/man/va.rst.txt diff --git a/website/docs/_sources/man/war.rst.txt b/website/docs/v_2_2_0/_sources/man/war.rst.txt similarity index 100% rename from website/docs/_sources/man/war.rst.txt rename to website/docs/v_2_2_0/_sources/man/war.rst.txt diff --git a/website/docs/_sources/stats.rst.txt b/website/docs/v_2_2_0/_sources/stats.rst.txt 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 --- a/website/docs/_sources/stats.rst.txt +++ b/website/docs/v_2_2_0/_sources/stats.rst.txt @@ -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 % diff --git a/website/docs/_sources/va.rst.txt b/website/docs/v_2_2_0/_sources/va.rst.txt 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 --- a/website/docs/_sources/va.rst.txt +++ b/website/docs/v_2_2_0/_sources/va.rst.txt @@ -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 % diff --git a/website/docs/_sources/war.rst.txt b/website/docs/v_2_2_0/_sources/war.rst.txt similarity index 100% rename from website/docs/_sources/war.rst.txt rename to website/docs/v_2_2_0/_sources/war.rst.txt diff --git a/website/docs/_static/ajax-loader.gif b/website/docs/v_2_2_0/_static/ajax-loader.gif similarity index 100% rename from website/docs/_static/ajax-loader.gif rename to website/docs/v_2_2_0/_static/ajax-loader.gif diff --git a/website/docs/_static/basic.css b/website/docs/v_2_2_0/_static/basic.css similarity index 100% rename from website/docs/_static/basic.css rename to website/docs/v_2_2_0/_static/basic.css diff --git a/website/docs/_static/comment-bright.png b/website/docs/v_2_2_0/_static/comment-bright.png similarity index 100% rename from website/docs/_static/comment-bright.png rename to website/docs/v_2_2_0/_static/comment-bright.png diff --git a/website/docs/_static/comment-close.png b/website/docs/v_2_2_0/_static/comment-close.png similarity index 100% rename from website/docs/_static/comment-close.png rename to website/docs/v_2_2_0/_static/comment-close.png diff --git a/website/docs/_static/comment.png b/website/docs/v_2_2_0/_static/comment.png similarity index 100% rename from website/docs/_static/comment.png rename to website/docs/v_2_2_0/_static/comment.png diff --git a/website/docs/_static/css/badge_only.css b/website/docs/v_2_2_0/_static/css/badge_only.css similarity index 100% rename from website/docs/_static/css/badge_only.css rename to website/docs/v_2_2_0/_static/css/badge_only.css diff --git a/website/docs/_static/css/badge_only.css.map b/website/docs/v_2_2_0/_static/css/badge_only.css.map similarity index 100% rename from website/docs/_static/css/badge_only.css.map rename to website/docs/v_2_2_0/_static/css/badge_only.css.map diff --git a/website/docs/_static/css/theme.css b/website/docs/v_2_2_0/_static/css/theme.css similarity index 100% rename from website/docs/_static/css/theme.css rename to website/docs/v_2_2_0/_static/css/theme.css diff --git a/website/docs/_static/css/theme.css.map b/website/docs/v_2_2_0/_static/css/theme.css.map similarity index 100% rename from website/docs/_static/css/theme.css.map rename to website/docs/v_2_2_0/_static/css/theme.css.map diff --git a/website/docs/_static/doctools.js b/website/docs/v_2_2_0/_static/doctools.js similarity index 100% rename from website/docs/_static/doctools.js rename to website/docs/v_2_2_0/_static/doctools.js diff --git a/website/docs/_static/down-pressed.png b/website/docs/v_2_2_0/_static/down-pressed.png similarity index 100% rename from website/docs/_static/down-pressed.png rename to website/docs/v_2_2_0/_static/down-pressed.png diff --git a/website/docs/_static/down.png b/website/docs/v_2_2_0/_static/down.png similarity index 100% rename from website/docs/_static/down.png rename to website/docs/v_2_2_0/_static/down.png diff --git a/website/docs/_static/file.png b/website/docs/v_2_2_0/_static/file.png similarity index 100% rename from website/docs/_static/file.png rename to website/docs/v_2_2_0/_static/file.png diff --git a/website/docs/_static/fonts/FontAwesome.otf b/website/docs/v_2_2_0/_static/fonts/FontAwesome.otf similarity index 100% rename from website/docs/_static/fonts/FontAwesome.otf rename to website/docs/v_2_2_0/_static/fonts/FontAwesome.otf diff --git a/website/docs/_static/fonts/Inconsolata-Bold.ttf b/website/docs/v_2_2_0/_static/fonts/Inconsolata-Bold.ttf similarity index 100% rename from website/docs/_static/fonts/Inconsolata-Bold.ttf rename to website/docs/v_2_2_0/_static/fonts/Inconsolata-Bold.ttf diff --git a/website/docs/_static/fonts/Inconsolata-Regular.ttf b/website/docs/v_2_2_0/_static/fonts/Inconsolata-Regular.ttf similarity index 100% rename from website/docs/_static/fonts/Inconsolata-Regular.ttf rename to website/docs/v_2_2_0/_static/fonts/Inconsolata-Regular.ttf diff --git a/website/docs/_static/fonts/Lato-Bold.ttf b/website/docs/v_2_2_0/_static/fonts/Lato-Bold.ttf similarity index 100% rename from website/docs/_static/fonts/Lato-Bold.ttf rename to website/docs/v_2_2_0/_static/fonts/Lato-Bold.ttf diff --git a/website/docs/_static/fonts/Lato-Regular.ttf b/website/docs/v_2_2_0/_static/fonts/Lato-Regular.ttf similarity index 100% rename from website/docs/_static/fonts/Lato-Regular.ttf rename to website/docs/v_2_2_0/_static/fonts/Lato-Regular.ttf diff --git a/website/docs/_static/fonts/RobotoSlab-Bold.ttf b/website/docs/v_2_2_0/_static/fonts/RobotoSlab-Bold.ttf similarity index 100% rename from website/docs/_static/fonts/RobotoSlab-Bold.ttf rename to website/docs/v_2_2_0/_static/fonts/RobotoSlab-Bold.ttf diff --git a/website/docs/_static/fonts/RobotoSlab-Regular.ttf b/website/docs/v_2_2_0/_static/fonts/RobotoSlab-Regular.ttf similarity index 100% rename from website/docs/_static/fonts/RobotoSlab-Regular.ttf rename to website/docs/v_2_2_0/_static/fonts/RobotoSlab-Regular.ttf diff --git a/website/docs/_static/fonts/fontawesome-webfont.eot b/website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.eot similarity index 100% rename from website/docs/_static/fonts/fontawesome-webfont.eot rename to website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.eot diff --git a/website/docs/_static/fonts/fontawesome-webfont.svg b/website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.svg similarity index 100% rename from website/docs/_static/fonts/fontawesome-webfont.svg rename to website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.svg diff --git a/website/docs/_static/fonts/fontawesome-webfont.ttf b/website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.ttf similarity index 100% rename from website/docs/_static/fonts/fontawesome-webfont.ttf rename to website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.ttf diff --git a/website/docs/_static/fonts/fontawesome-webfont.woff b/website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff similarity index 100% rename from website/docs/_static/fonts/fontawesome-webfont.woff rename to website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff diff --git a/website/docs/_static/fonts/fontawesome-webfont.woff2 b/website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from website/docs/_static/fonts/fontawesome-webfont.woff2 rename to website/docs/v_2_2_0/_static/fonts/fontawesome-webfont.woff2 diff --git a/website/docs/_static/jquery-3.1.0.js b/website/docs/v_2_2_0/_static/jquery-3.1.0.js similarity index 100% rename from website/docs/_static/jquery-3.1.0.js rename to website/docs/v_2_2_0/_static/jquery-3.1.0.js diff --git a/website/docs/_static/jquery.js b/website/docs/v_2_2_0/_static/jquery.js similarity index 100% rename from website/docs/_static/jquery.js rename to website/docs/v_2_2_0/_static/jquery.js diff --git a/website/docs/_static/js/modernizr.min.js b/website/docs/v_2_2_0/_static/js/modernizr.min.js similarity index 100% rename from website/docs/_static/js/modernizr.min.js rename to website/docs/v_2_2_0/_static/js/modernizr.min.js diff --git a/website/docs/_static/js/theme.js b/website/docs/v_2_2_0/_static/js/theme.js similarity index 100% rename from website/docs/_static/js/theme.js rename to website/docs/v_2_2_0/_static/js/theme.js diff --git a/website/docs/_static/minus.png b/website/docs/v_2_2_0/_static/minus.png similarity index 100% rename from website/docs/_static/minus.png rename to website/docs/v_2_2_0/_static/minus.png diff --git a/website/docs/_static/plus.png b/website/docs/v_2_2_0/_static/plus.png similarity index 100% rename from website/docs/_static/plus.png rename to website/docs/v_2_2_0/_static/plus.png diff --git a/website/docs/_static/pygments.css b/website/docs/v_2_2_0/_static/pygments.css similarity index 100% rename from website/docs/_static/pygments.css rename to website/docs/v_2_2_0/_static/pygments.css diff --git a/website/docs/_static/searchtools.js b/website/docs/v_2_2_0/_static/searchtools.js similarity index 100% rename from website/docs/_static/searchtools.js rename to website/docs/v_2_2_0/_static/searchtools.js diff --git a/website/docs/_static/underscore-1.3.1.js b/website/docs/v_2_2_0/_static/underscore-1.3.1.js similarity index 100% rename from website/docs/_static/underscore-1.3.1.js rename to website/docs/v_2_2_0/_static/underscore-1.3.1.js diff --git a/website/docs/_static/underscore.js b/website/docs/v_2_2_0/_static/underscore.js similarity index 100% rename from website/docs/_static/underscore.js rename to website/docs/v_2_2_0/_static/underscore.js diff --git a/website/docs/_static/up-pressed.png b/website/docs/v_2_2_0/_static/up-pressed.png similarity index 100% rename from website/docs/_static/up-pressed.png rename to website/docs/v_2_2_0/_static/up-pressed.png diff --git a/website/docs/_static/up.png b/website/docs/v_2_2_0/_static/up.png similarity index 100% rename from website/docs/_static/up.png rename to website/docs/v_2_2_0/_static/up.png diff --git a/website/docs/_static/websupport.js b/website/docs/v_2_2_0/_static/websupport.js similarity index 100% rename from website/docs/_static/websupport.js rename to website/docs/v_2_2_0/_static/websupport.js diff --git a/website/docs/advanced.html b/website/docs/v_2_2_0/advanced.html similarity index 99% rename from website/docs/advanced.html rename to website/docs/v_2_2_0/advanced.html index 3cdb12a..c64a862 100644 --- a/website/docs/advanced.html +++ b/website/docs/v_2_2_0/advanced.html @@ -540,10 +540,10 @@ After you have completed the editing your configuration may look like this:

/ help pages, index.html is the starting page -dm_javadoc +dm_javadoc JavaDoc for the JABAWS Data Model -full_javadoc +full_javadoc JavaDoc for the complete JABAWS prog_docs @@ -575,7 +575,7 @@ After you have completed the editing your configuration may look like this:

-

JABAWS 2.2 +

JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

diff --git a/website/docs/changelog.html b/website/docs/v_2_2_0/changelog.html similarity index 98% rename from website/docs/changelog.html rename to website/docs/v_2_2_0/changelog.html index 277cdad..89028b4 100644 --- a/website/docs/changelog.html +++ b/website/docs/v_2_2_0/changelog.html @@ -219,7 +219,7 @@
  • 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
    • @@ -269,7 +269,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/citations.html b/website/docs/v_2_2_0/citations.html similarity index 99% rename from website/docs/citations.html rename to website/docs/v_2_2_0/citations.html index 0db9016..58b388e 100644 --- a/website/docs/citations.html +++ b/website/docs/v_2_2_0/citations.html @@ -195,7 +195,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/client.html b/website/docs/v_2_2_0/client.html similarity index 99% rename from website/docs/client.html rename to website/docs/v_2_2_0/client.html index 4858aef..3fdffc3 100644 --- a/website/docs/client.html +++ b/website/docs/v_2_2_0/client.html @@ -271,7 +271,7 @@ Please note that -r and -f options cannot be used together. Alignment is done wi
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/develop.html b/website/docs/v_2_2_0/develop.html similarity index 98% rename from website/docs/develop.html rename to website/docs/v_2_2_0/develop.html index fb1d0f8..5d32d15 100644 --- a/website/docs/develop.html +++ b/website/docs/v_2_2_0/develop.html @@ -206,8 +206,8 @@

    The API¶

    -

    Data Model JavaDoc - read this if your are coding against JABA Web Services

    -

    Complete JavaDoc - for developers who want to use JABAWS framework and use Engines and Executables directly

    +

    Data Model JavaDoc - read this if your are coding against JABA Web Services

    +

    Complete JavaDoc - for developers who want to use JABAWS framework and use Engines and Executables directly

    @@ -337,7 +337,7 @@ JABAWS uses TestNG for testing. There is a TestNG plugin available for Eclipse w

    Additional utility libraries that this client depend upon is the compbio-util-1.3.jar and compbio-annotation-1.0.jar.

    -

    Please refer to a Data Model JavaDoc for a detailed description of each class and its methods.

    +

    Please refer to a Data Model JavaDoc for a detailed description of each class and its methods.

    @@ -587,7 +587,7 @@ Methods and classes mentioned in the excerpt are available from the JABAWS clien }
    -

    For a more detailed description of all available types and their functions please refer to the Data Model JavaDoc.

    +

    For a more detailed description of all available types and their functions please refer to the Data Model JavaDoc.

    @@ -695,7 +695,7 @@ Methods and classes mentioned in the excerpt are available from the JABAWS clien
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/genindex.html b/website/docs/v_2_2_0/genindex.html similarity index 99% rename from website/docs/genindex.html rename to website/docs/v_2_2_0/genindex.html index 0aeab05..d257af0 100644 --- a/website/docs/genindex.html +++ b/website/docs/v_2_2_0/genindex.html @@ -181,7 +181,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/getting_started.html b/website/docs/v_2_2_0/getting_started.html 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 --- a/website/docs/getting_started.html +++ b/website/docs/v_2_2_0/getting_started.html @@ -324,7 +324,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/included_tools.html b/website/docs/v_2_2_0/included_tools.html 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 --- a/website/docs/included_tools.html +++ b/website/docs/v_2_2_0/included_tools.html @@ -230,7 +230,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/index.html b/website/docs/v_2_2_0/index.html similarity index 99% rename from website/docs/index.html rename to website/docs/v_2_2_0/index.html index 6fced19..2f76723 100644 --- a/website/docs/index.html +++ b/website/docs/v_2_2_0/index.html @@ -166,7 +166,7 @@

    Welcome to JABAWS’s documentation!¶

    -

    Read on these documentation pages or go back to the JABAWS homepage!

    +

    Read on these documentation pages or go back to the JABAWS homepage!

    JABAWS documentation is also available in pdf. Download it here!

    Contents:

    @@ -305,7 +305,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/jabaws_manual.pdf b/website/docs/v_2_2_0/jabaws_manual.pdf similarity index 92% rename from website/docs/jabaws_manual.pdf rename to website/docs/v_2_2_0/jabaws_manual.pdf index 0e23b76550ff7f4eb81fb8ebd3b86726358dcfa0..08d4df95a6b1b892875bc52684777bb10a61fb0f 100644 GIT binary patch delta 24238 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 XQq#m~&}eW#0{mcXCMH=mIqd%e%DYc> delta 24559 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

    qjQAHtpI;UUjY4J7GJau?| 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 diff --git a/website/docs/objects.inv b/website/docs/v_2_2_0/objects.inv similarity index 100% rename from website/docs/objects.inv rename to website/docs/v_2_2_0/objects.inv diff --git a/website/docs/search.html b/website/docs/v_2_2_0/search.html similarity index 99% rename from website/docs/search.html rename to website/docs/v_2_2_0/search.html index c2141ce..2979a34 100644 --- a/website/docs/search.html +++ b/website/docs/v_2_2_0/search.html @@ -186,7 +186,7 @@

    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/searchindex.js b/website/docs/v_2_2_0/searchindex.js similarity index 100% rename from website/docs/searchindex.js rename to website/docs/v_2_2_0/searchindex.js diff --git a/website/docs/stats.html b/website/docs/v_2_2_0/stats.html similarity index 99% rename from website/docs/stats.html rename to website/docs/v_2_2_0/stats.html index 96abbb2..0e19253 100644 --- a/website/docs/stats.html +++ b/website/docs/v_2_2_0/stats.html @@ -298,7 +298,7 @@ local.stat.maxruntime=6
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/va.html b/website/docs/v_2_2_0/va.html similarity index 99% rename from website/docs/va.html rename to website/docs/v_2_2_0/va.html index 90b468f..2a2ddee 100644 --- a/website/docs/va.html +++ b/website/docs/v_2_2_0/va.html @@ -273,7 +273,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/docs/war.html b/website/docs/v_2_2_0/war.html similarity index 99% rename from website/docs/war.html rename to website/docs/v_2_2_0/war.html index 4f8d45e..b8b1e48 100644 --- a/website/docs/war.html +++ b/website/docs/v_2_2_0/war.html @@ -239,7 +239,7 @@
    -

    JABAWS 2.2 +

    JABAWS 2.2 © Copyright 2017, Peter Troshin, Alexander Sherstnev, Jim Procter, Alexey Drozdetskiy, Daniel Barton, Suzanne Duce, Fábio Madeira and Geoff Barton.

    diff --git a/website/download.jsp b/website/download.jsp index e700cc4..40e2d38 100644 --- a/website/download.jsp +++ b/website/download.jsp @@ -21,7 +21,7 @@

    Read the Getting Started guides to better decide which JABAWS distribution better suits your needs. - Additional information is available in the + Additional information is available in the documentation pages.


    @@ -99,18 +99,18 @@

    The command line client displays help when executed without arguments, more details is available from the JABAWS - document pages. + document pages.

    Back to top @@ -143,7 +143,7 @@ (includes source and precompiled Linux x86 and Windows binaries)

    - Please check the JABAWS document pages + Please check the JABAWS document pages for further instructions.

    @@ -175,7 +175,7 @@ JABAWS Virtual Appliance

    - Please check the JABAWS document pages + Please check the JABAWS document pages for further instructions.

    diff --git a/website/getting_started.jsp b/website/getting_started.jsp index 19978f3..df22a01 100644 --- a/website/getting_started.jsp +++ b/website/getting_started.jsp @@ -20,7 +20,7 @@

    Choose the JABAWS distribution that better suits your needs and read the Getting Started guides below. - Detailed information is available in the + Detailed information is available in the documentation pages.


    @@ -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 - documentation pages, + documentation pages, but a brief instructions are given below:

      @@ -110,7 +110,7 @@ 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 - documentation pages. + documentation pages.

      @@ -133,7 +133,7 @@ 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 - documentation pages, but brief instructions are given below: + documentation pages, but brief instructions are given below:

      1. Download the JABAWS WAR file
        2. @@ -198,7 +198,7 @@

        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 documentation pages, + to the JABAWS VA is given in the documentation pages, but for the impatient, brief instructions are given below:

        diff --git a/website/index.jsp b/website/index.jsp index c80ffb3..9e40bf8 100644 --- a/website/index.jsp +++ b/website/index.jsp @@ -141,7 +141,7 @@

        You can access our public JABAWS web services with Jalview, JABAWS CLI, or - with your own program. + with your own program. 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.

        diff --git a/website/template_footer.jsp b/website/template_footer.jsp index 631460f..e3781ef 100644 --- a/website/template_footer.jsp +++ b/website/template_footer.jsp @@ -55,31 +55,31 @@

        - Site Last updated: 12 April 2017. This site was built using the Bootstrap framework. + Site Last updated: 21 April 2017. This site was built using the Bootstrap framework.

    diff --git a/website/template_header.jsp b/website/template_header.jsp index a447d8f..831284b 100644 --- a/website/template_header.jsp +++ b/website/template_header.jsp @@ -103,34 +103,34 @@