From b5e7a224e3450d9ef1ca769a0a9524f7daee5db4 Mon Sep 17 00:00:00 2001
From: jburel <jburel@users.noreply.github.com>
Date: Sun, 12 May 2024 00:57:28 +0000
Subject: [PATCH 1/2] Changes from upstream repositories:  openmicroscopy

---
 omero/conf_autogen.py      | 18 +++++++++---------
 omero/sysadmins/config.rst |  8 +++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/omero/conf_autogen.py b/omero/conf_autogen.py
index 47ae31f7bd..5c1e65164e 100644
--- a/omero/conf_autogen.py
+++ b/omero/conf_autogen.py
@@ -1,14 +1,14 @@
 current_dbver = "OMERO5.4__0"
 previous_dbver = "OMERO5.3__1"
-version_openmicroscopy = "5.6.10"
-version_formats_gpl = "7.1.0"
-version_blitz = "5.7.2"
-version_server = "5.6.10"
-version_romio = "5.7.5"
-version_renderer = "5.5.15"
-version_common = "5.6.4"
-version_model = "5.6.13"
-version_gateway = "5.9.0"
+version_openmicroscopy = "5.6.11"
+version_formats_gpl = "7.3.0"
+version_blitz = "5.7.3"
+version_server = "5.6.11"
+version_romio = "5.7.6"
+version_renderer = "5.5.16"
+version_common = "5.6.5"
+version_model = "5.6.14"
+version_gateway = "5.9.1"
 version_insight = "5.8.3"
 version_matlab = "5.5.6"
 version_dsl_plugin = "5.5.2"
diff --git a/omero/sysadmins/config.rst b/omero/sysadmins/config.rst
index f75d419c18..5d608b65bd 100644
--- a/omero/sysadmins/config.rst
+++ b/omero/sysadmins/config.rst
@@ -2051,12 +2051,10 @@ omero.security.ignore_case
 Whether to ignore the case of the username during login (`true` or
 `false`). Default: `false` (JSmith and jsmith will be considered two
 different users).
-
 .. warning::
-
-    Before enabling this feature, lower the case of all usernames in OMERO
-    (`omename` column in the `experimenter` table). It is the system
-    administrator's responsibility to handle any username clashes.
+   Before enabling this feature, lower the case of all usernames in OMERO
+   (`omename` column in the `experimenter` table). It is the system
+   administrator's responsibility to handle any username clashes.
 
 Default: `false`
 

From d0e31f9022f54e10309abdadf16b546788d7828b Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Mon, 13 May 2024 10:28:05 +0100
Subject: [PATCH 2/2] add line

---
 omero/sysadmins/config.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/omero/sysadmins/config.rst b/omero/sysadmins/config.rst
index 5d608b65bd..6463afd0ac 100644
--- a/omero/sysadmins/config.rst
+++ b/omero/sysadmins/config.rst
@@ -2052,6 +2052,7 @@ Whether to ignore the case of the username during login (`true` or
 `false`). Default: `false` (JSmith and jsmith will be considered two
 different users).
 .. warning::
+
    Before enabling this feature, lower the case of all usernames in OMERO
    (`omename` column in the `experimenter` table). It is the system
    administrator's responsibility to handle any username clashes.