diff --git a/admin_manual/maintenance/enable_maintenance.rst b/admin_manual/maintenance/enable_maintenance.rst
deleted file mode 100644
index 5710396de43..00000000000
--- a/admin_manual/maintenance/enable_maintenance.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-================
-Maintenance Mode
-================
-
-You must put your Nextcloud server into maintenance mode before performing 
-upgrades, and for performing troubleshooting and maintenance. Please 
-see :doc:`../configuration_server/occ_command` to learn how to put your server into 
-the various maintenance modes (``maintenance:mode, maintenance:singleuser``, 
-and ``maintenance:repair``) with the ``occ`` command.
-
-``maintenance:mode`` locks the sessions of logged-in users and prevents new 
-logins. This is the mode to use for upgrades. You must run ``occ`` as the HTTP user, 
-like this example on Ubuntu Linux::
-
- $ sudo -u www-data php occ maintenance:mode --on
-
-You may also put your 
-server into this mode by editing :file:`config/config.php`. Change 
-``"maintenance" => false`` to ``"maintenance" => true``:
-
-::
-
-   <?php
-
-    "maintenance" => true,
-
-Then change it back to ``false`` when you are finished.
diff --git a/admin_manual/maintenance/index.rst b/admin_manual/maintenance/index.rst
index 5dfd565f202..de3ef9b5eab 100644
--- a/admin_manual/maintenance/index.rst
+++ b/admin_manual/maintenance/index.rst
@@ -5,7 +5,6 @@ Maintenance
 .. toctree::
    :maxdepth: 2
 
-   enable_maintenance
    backup
    restore
    upgrade
diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst
index 7ed44952db6..4bedd735db5 100644
--- a/admin_manual/maintenance/upgrade.rst
+++ b/admin_manual/maintenance/upgrade.rst
@@ -62,3 +62,32 @@ Nextcloud release. Any apps that are not developed by Nextcloud show a 3rd party
 designation. **Install unsupported apps at your own risk**. Then, before the
 upgrade, all 3rd party apps must be disabled. After the upgrade is complete you
 may re-enable them.
+
+Maintenance mode
+----------------
+
+You can put your Nextcloud server into maintenance mode before performing
+upgrades, or for performing troubleshooting or maintenance. Please see
+:doc:`../configuration_server/occ_command` to learn how to put your server into
+the maintenance mode (``maintenance:mode``) or execute repair commands
+(``maintenance:repair``) with the ``occ`` command.
+
+The :doc:`build-in Updater <update>` does this for you before replacing the
+existing Nextcloud code with the code of the new Nextcloud version.
+
+``maintenance:mode`` locks the sessions of logged-in users and prevents new
+logins. This is the mode to use for upgrades. You must run ``occ`` as the HTTP
+user, like this example on Ubuntu Linux::
+
+ $ sudo -u www-data php occ maintenance:mode --on
+
+You may also put your server into this mode by editing :file:`config/config.php`.
+Change ``"maintenance" => false`` to ``"maintenance" => true``:
+
+::
+
+   <?php
+
+    "maintenance" => true,
+
+Then change it back to ``false`` when you are finished.