From 287aa823cd239e0df156c3fdbcb0a3195100a89a Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 8 Nov 2023 15:10:01 +0000 Subject: [PATCH] reorganise --- .../unix/install-web/web-deployment.rst | 20 +++++++---------- omero/sysadmins/unix/server-installation.rst | 22 +++++++------------ 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/omero/sysadmins/unix/install-web/web-deployment.rst b/omero/sysadmins/unix/install-web/web-deployment.rst index ac30312f8b..aeaaaa42a4 100644 --- a/omero/sysadmins/unix/install-web/web-deployment.rst +++ b/omero/sysadmins/unix/install-web/web-deployment.rst @@ -43,24 +43,20 @@ Walkthroughs **Recommended:** -:doc:`walkthrough/omeroweb-install-centos7-ice3.6` - Instructions for installing OMERO.web from scratch on CentOS 7 with Ice 3.6. - -:doc:`walkthrough/omeroweb-install-debian10-ice3.6` - Instructions for installing OMERO.web from scratch on Debian 10 with Ice 3.6. - -:doc:`walkthrough/omeroweb-install-ubuntu1804-ice3.6` - Instructions for installing OMERO.web from scratch on Ubuntu 18.04 with Ice 3.6. - -:doc:`walkthrough/omeroweb-install-ubuntu2004-ice3.6` - Instructions for installing OMERO.web from scratch on Ubuntu 20.04 with Ice 3.6. - :doc:`walkthrough/omeroweb-install-rockylinux9-ice3.6` Instructions for installing OMERO.web from scratch on RHEL 9/Rocky Linux 9 with Ice 3.6. :doc:`walkthrough/omeroweb-install-ubuntu2204-ice3.6` Instructions for installing OMERO.web from scratch on Ubuntu 22.04 with Ice 3.6. +**Supported:** + +:doc:`walkthrough/omeroweb-install-centos7-ice3.6` + Instructions for installing OMERO.web from scratch on CentOS 7 with Ice 3.6. + +:doc:`walkthrough/omeroweb-install-ubuntu2004-ice3.6` + Instructions for installing OMERO.web from scratch on Ubuntu 20.04 with Ice 3.6. + .. toctree:: :maxdepth: 1 :titlesonly: diff --git a/omero/sysadmins/unix/server-installation.rst b/omero/sysadmins/unix/server-installation.rst index 4ea7c71c12..8e7cdd299c 100644 --- a/omero/sysadmins/unix/server-installation.rst +++ b/omero/sysadmins/unix/server-installation.rst @@ -16,30 +16,24 @@ Since 5.6, a new :envvar:`OMERODIR` variable is used, you should first unset :en **Recommended:** -:doc:`server-centos7-ice36` +:doc:`server-rockylinux9-ice36` Instructions for installing OMERO.server from scratch on - CentOS 7 with Ice 3.6 and Python 3.6. + RHEL 9/Rocky Linux 9 with Ice 3.6 and Python 3.9. -:doc:`server-debian10-ice36` +:doc:`server-ubuntu2204-ice36` Instructions for installing OMERO.server from scratch on - Debian 10 with Ice 3.6 and Python 3.7. + Ubuntu 22.04 with Ice 3.6 and Python 3.10. + +**Supported:** -:doc:`server-ubuntu1804-ice36` +:doc:`server-centos7-ice36` Instructions for installing OMERO.server from scratch on - Ubuntu 18.04 with Ice 3.6 and Python 3.6. + CentOS 7 with Ice 3.6 and Python 3.6. :doc:`server-ubuntu2004-ice36` Instructions for installing OMERO.server from scratch on Ubuntu 20.04 with Ice 3.6 and Python 3.8. -:doc:`server-rockylinux9-ice36` - Instructions for installing OMERO.server from scratch on - RHEL 9/Rocky Linux 9 with Ice 3.6 and Python 3.9. - -:doc:`server-ubuntu2204-ice36` - Instructions for installing OMERO.server from scratch on - Ubuntu 22.04 with Ice 3.6 and Python 3.10. - **Development:** :doc:`server-install-homebrew`