diff --git a/admin_manual/configuration_files/external_storage/owncloud.rst b/admin_manual/configuration_files/external_storage/nextcloud.rst
similarity index 100%
rename from admin_manual/configuration_files/external_storage/owncloud.rst
rename to admin_manual/configuration_files/external_storage/nextcloud.rst
diff --git a/admin_manual/configuration_files/external_storage_configuration_gui.rst b/admin_manual/configuration_files/external_storage_configuration_gui.rst
index 1a5cb2c85..2f1b32077 100644
--- a/admin_manual/configuration_files/external_storage_configuration_gui.rst
+++ b/admin_manual/configuration_files/external_storage_configuration_gui.rst
@@ -113,9 +113,8 @@ may provide their own backends, which are not listed here.
     external_storage/ftp
     external_storage/google
     external_storage/local
-	external_storage/nextcloud
+    external_storage/nextcloud
     external_storage/openstack
-    external_storage/owncloud
     external_storage/sftp
     external_storage/smb
     external_storage/webdav
diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst
index 9dce20b29..7e27d779c 100644
--- a/admin_manual/configuration_server/config_sample_php_parameters.rst
+++ b/admin_manual/configuration_server/config_sample_php_parameters.rst
@@ -67,6 +67,7 @@ domains prevents host header poisoning. Do not remove this, as it performs
 necessary security checks.
 
 You can specify:
+
 - the exact hostname of your host or virtual host, e.g. demo.example.org.
 - the exact hostname with permitted port, e.g. demo.example.org:443.
   This disallows all other ports on this host
@@ -975,7 +976,7 @@ defines the interval in minutes for the background job that checks user
 existence and marks them as ready to be cleaned up. The number is always
 minutes. Setting it to 0 disables the feature.
 
-See command line (occ) methods ldap:show-remnants and user:delete
+See command line (occ) methods ``ldap:show-remnants`` and ``user:delete``
 
 Comments
 --------
diff --git a/admin_manual/installation/nginx_examples.rst b/admin_manual/installation/nginx_examples.rst
index 231b2337e..8935c9271 100644
--- a/admin_manual/installation/nginx_examples.rst
+++ b/admin_manual/installation/nginx_examples.rst
@@ -26,7 +26,6 @@ community-maintained. (Thank you, contributors!)
 Example Configurations
 ----------------------
 
-- :doc:`nginx_owncloud_8x`
 - :doc:`nginx_nextcloud_9x`
 
 You can use Nextcloud over plain http, but we strongly encourage you to use 
@@ -92,7 +91,7 @@ To use http_v2 for nginx you have to check two things:
    ``listen 443 ssl spdy;`` to ``listen 443 ssl http2;``
 
 nginx: caching Nextcloud gallery thumbnails
-==========================================
+===========================================
 
 One of the optimizations for Nextcloud when using nginx as the Web server is to 
 combine FastCGI caching with "Cache Purge", a `3rdparty nginx module 
diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst
index e3363c3c8..b7abd0e84 100644
--- a/admin_manual/maintenance/upgrade.rst
+++ b/admin_manual/maintenance/upgrade.rst
@@ -77,19 +77,6 @@ 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.
 
-.. _Open Build Service: 
-   https://download.owncloud.org/download/repositories/8.2/owncloud/
-   
-.. _owncloud.org/install/:
-   https://owncloud.org/install/  
-
-Encryption migration from oC 7.0 to 8.0 and 8.0 to 8.1
-------------------------------------------------------
-
-The encryption backend was changed twice between ownCloud 7.0 and 8.0 as well as
-between 8.0 and 8.1. If you're upgrading from these older versions please refer to 
-:ref:`upgrading_encryption_label` for the needed migration steps.
-
 Debian Migration to Official ownCloud Packages
 ----------------------------------------------