diff --git a/admin_manual/gdpr/index.rst b/admin_manual/gdpr/index.rst
index cb47f49e1..8d1b924b7 100644
--- a/admin_manual/gdpr/index.rst
+++ b/admin_manual/gdpr/index.rst
@@ -1,9 +1,8 @@
-====
-GDPR
-====
+===============
+GDPR-compliance
+===============
.. toctree::
:maxdepth: 2
cookies
-
diff --git a/admin_manual/groupware/calendar.rst b/admin_manual/groupware/calendar.rst
index b71ad50aa..8a0ac3a63 100644
--- a/admin_manual/groupware/calendar.rst
+++ b/admin_manual/groupware/calendar.rst
@@ -1,6 +1,6 @@
-========
-Calendar
-========
+=================
+Calendar / CalDAV
+=================
Invitations
-----------
@@ -16,7 +16,7 @@ Contacts that have a birthday date filled are automatically added as events to a
If you deactivate this option, all users will no longer have this calendar.
When activating this option, users birthday calendars won't be available right away because they need to be generated
-by a background task. See :doc:`../configuration_server/occ_command` section Dav commands.
+by a background task. See :doc:`../configuration_server/occ_command` section DAV commands.
Reminder notifications
----------------------
@@ -31,8 +31,8 @@ Make sure the "Send notifications for events" and the "Enable notifications for
Background jobs
~~~~~~~~~~~~~~~
Running background jobs can be an expensive task when there are a large number of events, reminders, event sharees and attendees. However, this needs to happen
-often enough so that the notifications are sent on time. To accomplish this you should use a dedicated occ command that runs
-more often than the standard cron system::
+often enough so that the notifications are sent on time. To accomplish this you should use a dedicated ``occ`` command that runs
+more often than the standard `cron`` system::
# crontab -u www-data -e
*/5 * * * * php -f /var/www/nextcloud/occ dav:send-event-reminders
@@ -54,11 +54,13 @@ If you don't wish for users to have this capability, you can disable FreeBusy fo
php occ config:app:set dav disableFreeBusy --value yes
Subscriptions
-----------------------
+-------------
+
Refresh rate
~~~~~~~~~~~~
-Calendar subscriptions are cached on server and refreshed periodically. The default refresh rate is one week, unless the subscription itself tells otherwise.
+Calendar subscriptions are cached on server and refreshed periodically.
+The default refresh rate is one week, unless the subscription itself tells otherwise.
To set up a different default refresh rate, change the ``calendarSubscriptionRefreshRate`` option::
@@ -69,6 +71,7 @@ Where the value is a `DateInterval `_.
@@ -20,11 +20,11 @@ Videos and blogs
----------------
See the `official Nextcloud channel
-`_
+`_
on YouTube for tutorials, overviews, and conference videos.
-Visit `Nextcloud Planet `_ for news and developer
-blogs.
+Visit `our blog `_ for latest news and to learn more
+about what is going on in and around Nextcloud.
Target audience
---------------
@@ -38,6 +38,6 @@ respective manuals:
* `Nextcloud Desktop Client`_
.. _`Nextcloud User Manual`: https://docs.nextcloud.com/server/latest/user_manual/en/
-.. _`Nextcloud Desktop Client`: https://docs.nextcloud.com/desktop/2.6/
+.. _`Nextcloud Desktop Client`: https://docs.nextcloud.com/desktop/3.1/
.. TODO ON RELEASE: Update version number above on release
diff --git a/admin_manual/maintenance/backup.rst b/admin_manual/maintenance/backup.rst
index b0e97c342..f3f53d78d 100644
--- a/admin_manual/maintenance/backup.rst
+++ b/admin_manual/maintenance/backup.rst
@@ -43,7 +43,7 @@ Backup database
MySQL/MariaDB
^^^^^^^^^^^^^
-MySQL or MariaDB, which is a drop-in MySQL replacement, is the recommended
+MySQL or MariaDB, which is a drop-in MySQL replacement, is the recommended
database engine. To backup MySQL/MariaDB::
mysqldump --single-transaction -h [server] -u [username] -p[password] [db_name] > nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
@@ -59,4 +59,3 @@ PostgreSQL
::
PGPASSWORD="password" pg_dump [db_name] -h [server] -U [username] -f nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
-
diff --git a/admin_manual/release_schedule.rst b/admin_manual/release_schedule.rst
index d0ca88fae..40d9835cb 100644
--- a/admin_manual/release_schedule.rst
+++ b/admin_manual/release_schedule.rst
@@ -7,13 +7,10 @@ This page gives an overview of the currently supported and released versions as
+--------+-------------------+------------------+
| | release date | end of life |
+========+===================+==================+
+| **20** | 2020-10-03 | 2021-10 |
++--------+-------------------+------------------+
| **19** | 2020-06-03 | 2021-06 |
+--------+-------------------+------------------+
-| **18** | 2020-01-16 | 2021-01 |
-+--------+-------------------+------------------+
-| **17** | 2019-09-30 | 2020-09 |
-+--------+-------------------+------------------+
-
Find the detailed schedule for major and maintenance releases at: `GitHub `_.
@@ -35,6 +32,9 @@ Older versions
+----------+----------------+-------------+-------------------------+
| | release date | end of life | latest version |
+==========+================+=============+=========================+
+| **18** | 2020-01-16 | 2021-01 | 18.0.14 (2021-01-27) |
++----------+----------------+-------------+-------------------------+
+| **17** | 2019-09-30 | 2020-10 | 17.0.10 (2020-10-08) |
+----------+----------------+-------------+-------------------------+
| **16** | 2019-04-25 | 2020-06 | 16.0.11 (2020-06-04) |
+----------+----------------+-------------+-------------------------+