From b5b9213f39d92b9a58c3348aa4dadea3112ea6ab Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Sun, 9 Jan 2022 17:49:45 +0100
Subject: [PATCH 1/2] improve update instructions

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 php/templates/containers.twig | 4 ++--
 readme.md                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 31a73c02..85e1d716 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -99,7 +99,7 @@
                     </ul>
 
                     {% if has_update_available == true %}
-                        Updates are available. Stop your containers and restart them to apply the update. You should consider creating a backup first.<br><br>
+                        ⚠ Container updates are available. Click on `Stop Containers` and `Start Containers` to update them. You should consider creating a backup first. The mastercontainer gets updated with a different procedure though and has its own update button which is visible if an update is available.<br><br>
                     {% else %}
                         You are up-to-date.<br><br>
                     {% endif %}
@@ -142,7 +142,7 @@
                     {% if isBackupOrRestoreRunning == false %}
                         <h2>Mastercontainer update</h2>
 
-                        A new mastercontainer is available. Please click on the button below to update it.<br><br>
+                        ⚠ A mastercontainer update is available. Please click on the button below to update it. All other containers get updated independently from the mastercontainer by simply clicking on `Stop containers` and clicking on `Start containers` if a new update is available.<br><br>
                         <form method="POST" action="/api/docker/watchtower" class="xhr">
                             <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                             <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
diff --git a/readme.md b/readme.md
index 622c16d2..0be59fae 100644
--- a/readme.md
+++ b/readme.md
@@ -70,7 +70,7 @@ Simply run the following: `sudo docker exec -it nextcloud-aio-nextcloud php occ
 Simply run the following command: `sudo docker exec -it nextcloud-aio-nextcloud php occ config:system:set default_phone_region --value="yourvalue"`. Of course you need to modify `yourvalue` based on your location. Examples are `DE`, `EN` and `GB`. See this list for more codes: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
 
 ### How to update the containers?
-If we push new containers to `latest`, you will see in the AIO interface below the `containers` section that new container updates were found. In this case, just press `Stop containers` and `Start containers` in order to update the containers. And don't forget to back up the current state of your instance using the built-in backup solution before starting the containers again! Otherwise you won't be able to restore your instance easily if something should break during the update.
+If we push new containers to `latest`, you will see in the AIO interface below the `containers` section that new container updates were found. In this case, just press `Stop containers` and `Start containers` in order to update the containers. The mastercontainer has its own update procedure though. See below. And don't forget to back up the current state of your instance using the built-in backup solution before starting the containers again! Otherwise you won't be able to restore your instance easily if something should break during the update. 
 
 If a new `Mastercontainer` update was found, you'll see an additional section below the `containers` section which shows that a mastercontainer update is available. If so, you can simply press on the button to update the container.
 

From e42d53d0697c56954d1c0226ecedf2c37cd590ac Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Sun, 9 Jan 2022 17:58:56 +0100
Subject: [PATCH 2/2] improve up-to-date-message

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 php/templates/containers.twig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 85e1d716..afd31f7d 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -101,7 +101,11 @@
                     {% if has_update_available == true %}
                         ⚠ Container updates are available. Click on `Stop Containers` and `Start Containers` to update them. You should consider creating a backup first. The mastercontainer gets updated with a different procedure though and has its own update button which is visible if an update is available.<br><br>
                     {% else %}
-                        You are up-to-date.<br><br>
+                        {% if is_mastercontainer_update_available == false %}
+                            Your containers are up-to-date.<br><br>
+                        {% else %}
+                            Your containers are up-to-date. (Except the mastercontainer. See the section below.)<br><br>
+                        {% endif %}
                     {% endif %}
                 {% endif %}