diff --git a/admin_manual/configuration_files/encryption_configuration.rst b/admin_manual/configuration_files/encryption_configuration.rst
index ff9ac5c5e..c59f0267f 100644
--- a/admin_manual/configuration_files/encryption_configuration.rst
+++ b/admin_manual/configuration_files/encryption_configuration.rst
@@ -146,7 +146,7 @@ storage mount, see :ref:`external_storage_mount_options_label`
.. _enable-file-recovery-key:
Enabling Users File Recovery Keys
-----------------------------------
+---------------------------------
If you lose your Nextcloud password, then you lose access to your encrypted
files. If one of your users loses their Nextcloud password their files are
diff --git a/admin_manual/configuration_server/server_tuning.rst b/admin_manual/configuration_server/server_tuning.rst
index 3f330996b..3dd26eed2 100644
--- a/admin_manual/configuration_server/server_tuning.rst
+++ b/admin_manual/configuration_server/server_tuning.rst
@@ -73,8 +73,6 @@ Enable HTTP2 for faster loading
HTTP2 has `huge speed improvements `_ over HTTP with multiple request. Most `browsers already support HTTP2 over SSL (HTTPS) `_. So refer to your server manual for guides on how to use HTTP2.
-.. _opcache:
-
Enable PHP OPcache
------------------
diff --git a/admin_manual/installation/selinux_configuration.rst b/admin_manual/installation/selinux_configuration.rst
index 51002e8fb..6531986cd 100644
--- a/admin_manual/installation/selinux_configuration.rst
+++ b/admin_manual/installation/selinux_configuration.rst
@@ -132,6 +132,6 @@ Nextcloud directory::
It is much stronger security to have a more fine-grained ruleset as in the
examples at the beginning, so use this only for testing and troubleshooting. It
- has a similar effect to disabling SELinux, so don't use it on production
- systems.
+has a similar effect to disabling SELinux, so don't use it on production
+systems.
diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst
index 09d364bf2..afb8b47d5 100644
--- a/admin_manual/installation/source_installation.rst
+++ b/admin_manual/installation/source_installation.rst
@@ -45,9 +45,9 @@ To install the Nextcloud Snap Package, run the following command in a terminal::
sudo snap install nextcloud
.. note:: The `snapd technology `_ is the core
-that powers snaps, and it offers a new way to package, distribute, update and
-run OS components and applications on a Linux system. See more about snaps on
-`snapcraft.io `_.
+ that powers snaps, and it offers a new way to package, distribute, update and
+ run OS components and applications on a Linux system. See more about snaps on
+ `snapcraft.io `_.
.. _prerequisites_label:
diff --git a/user_manual/files/encrypting_files.rst b/user_manual/files/encrypting_files.rst
index 1bdf9fd2d..7acd52418 100644
--- a/user_manual/files/encrypting_files.rst
+++ b/user_manual/files/encrypting_files.rst
@@ -33,21 +33,31 @@ Encryption FAQ
How Can Encryption Be Disabled?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The only way to disable encryption is to run the :ref:`"decrypt all" `
+The only way to disable encryption is to run the `"decrypt all"
+`_.
+
+.. TODO ON RELEASE: Update version number above on release
+
script, which decrypts all files and disables encryption.
Is It Possible To Disable Encryption With The Recovery Key?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Yes, *if* every user uses the :ref:`file recovery key
-`, :ref:`"decrypt all" ` will use it
-to decrypt all files.
+Yes, *if* every user uses the `file recovery key
+`_, `"decrypt all"
+`_ will use it to decrypt all files.
+
+.. TODO ON RELEASE: Update version number above on release
Can Encryption Be Disabled Without The User’s Password?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you don't have the users password or :ref:`file recovery key
-` then there is no way to decrypt all files. What's
+If you don't have the users password or `file recovery key
+`_.
+
+.. TODO ON RELEASE: Update version number above on release
+
+then there is no way to decrypt all files. What's
more, running it on login would be dangerous, because you would most likely run
into timeouts.
diff --git a/user_manual/user_2fa.rst b/user_manual/user_2fa.rst
index 3fbd3984b..f13d11dda 100644
--- a/user_manual/user_2fa.rst
+++ b/user_manual/user_2fa.rst
@@ -60,8 +60,8 @@ enter the TOTP code in your browser. Just enter your code:
If the code was correct you will be redirected to your Nextcloud account.
.. note:: Since the code is time-based, it’s important that your server’s and
-your smartphone’s clock are almost in sync. A time drift of a few seconds
-won’t be a problem.
+ your smartphone’s clock are almost in sync. A time drift of a few seconds
+ won’t be a problem.
Using client applications with two-factor authentication
========================================================
diff --git a/user_manual/whats_new.rst b/user_manual/whats_new.rst
index 133987afd..d73992fa6 100644
--- a/user_manual/whats_new.rst
+++ b/user_manual/whats_new.rst
@@ -4,7 +4,7 @@ What's New for Users in Nextcloud |version|
1. Easier way to select a new app
- .. figure:: images/app_menu.png
+ .. figure:: images/apps_menu.png
:alt: screenshot of apps menu at top-left of Nextcloud Web GUI
2. New Contacts menu to reach your colleagues or friends easier