diff --git a/admin_manual/configuration_server/security_setup_warnings.rst b/admin_manual/configuration_server/security_setup_warnings.rst
index 4653a98d5..5e9d0e466 100644
--- a/admin_manual/configuration_server/security_setup_warnings.rst
+++ b/admin_manual/configuration_server/security_setup_warnings.rst
@@ -122,4 +122,4 @@ refer to :ref:`service-discovery-label` for more info.
Some files have not passed the integrity check
----------------------------------------------
-Please refer to the :ref:`code_signing_fix_warning_label` documentation how to debug this issue.
\ No newline at end of file
+Please refer to the :ref:`code_signing_fix_warning_label` documentation how to debug this issue.
diff --git a/admin_manual/enterprise_installation/supported_apps_installation.rst b/admin_manual/enterprise_installation/supported_apps_installation.rst
index f1b654bc0..919d44760 100644
--- a/admin_manual/enterprise_installation/supported_apps_installation.rst
+++ b/admin_manual/enterprise_installation/supported_apps_installation.rst
@@ -2,61 +2,7 @@
Supported ownCloud Enterprise Subscription Apps
===============================================
-See :doc:`../installation/apps_management_installation` for instructions on
-managing ownCloud apps.
-
-These applications are supported in ownCloud Enterprise Edition. The first name
-on each line is the name of the application as it appears on the Apps page in
-your ownCloud Web GUI, and the name in parentheses is the filename as it
-appears in your ``owncloud/apps`` directory.
-
-Activity (activity)
-
-Antivirus app for files (files_antivirus)
-
-Deleted Files (files_trashbin)
-
-Encryption (encryption)
-
-Enterprise License Key (enterprise_key)
-
-External Storage Support (files_external)
-
-External user support (user_external)
-
-Files (files)
-
-File Firewall (firewall)
-
-File Locking (files_locking)
-
-File Shared access logging app (files_sharing_log)
-
-First Run Wizard (firstrunwizard)
-
-LDAP Home Connector (files_ldap_home)
-
-LDAP user and group backend (user_ldap)
-
-Log audit info (admin_audit)
-
-Mail Template Editor (templateeditor)
-
-Provisioning API (provisioning_api)
-
-Share Files (files_sharing)
-
-SharePoint (sharepoint)
-
-Shibboleth user backend (user_shibboleth)
-
-Text Editor (files_texteditor)
-
-Versions (files_versions)
-
-User backend using remote HTTP servers (user_webdavauth)
-
-Windows Network Drive (windows_network_drive)
+See :doc:`../installation/apps_supported` for a list of supported apps.
.. note:: 3rd party and unsupported apps must be disabled before performing a
system upgrade. Then install the upgraded versions, and after the
diff --git a/admin_manual/installation/apps_management_installation.rst b/admin_manual/installation/apps_management_installation.rst
index f8e06f6c8..1b0601991 100644
--- a/admin_manual/installation/apps_management_installation.rst
+++ b/admin_manual/installation/apps_management_installation.rst
@@ -5,11 +5,10 @@ Installing and Managing Apps
After installing ownCloud, you may provide added functionality by installing
applications.
-Enterprise Subscription Supported Apps
---------------------------------------
+Supported Apps
+--------------
-See :doc:`../enterprise_installation/supported_apps_installation` for a list of
-supported Enterprise Subscription apps.
+See :doc:`apps_supported` for a list of supported Server and Enterprise Subscription apps.
Viewing Enabled Apps
--------------------
@@ -39,30 +38,12 @@ Some apps are developed and supported by ownCloud directly. These have an
**Official** tag. Apps with the **Approved** tag are community-developed and
supported; they are maintained by trusted developers, and are under active
development. Only **Official** and **Approved** apps are linked on the Apps
-page.
+page by default.
-To understand what an application does, you can click the app name to view a
-description of the app and any of the app settings in the Application View
-field. Clicking the **Enable** button will enable the app. If the app is not
-part of the ownCloud installation, it will be downloaded from the app store,
-installed and enabled.
+Click the app name to view a description of the app and any of the app settings in the Application View field. Clicking the **Enable** button will enable the app. If the app is not part of the ownCloud installation, it will be downloaded from the app store, installed and enabled.
-You can view new, unreviewed or unstable applications in the `ownCloud Apps
-Store `_. Install unsupported apps at your own risk.
-
-To view or install apps from the ownCloud Apps Store:
-
-1. Read about any of the apps in the ownCloud Apps Store and download any that
- you like.
-
-2. Extract a downloaded compressed file and place the contents (which should
- themselves be contained in a folder with the app name) in the apps folder in
- your ownCloud installation, typically ``owncloud/apps``.
-
-3. Ensure the permissions and ownership are similar to the other ownCloud apps.
- Typically, access rights are **rwxr-x---**, or **0750** in octal notation,
- and the owner and group are your HTTP user. On CentOS this is ``apache``,
- Debian/Ubuntu is ``www-data``, and on openSUSE is it ``wwwrun:www``.
+Click the gear icon on the lower left to browse experimental apps in the `ownCloud Apps
+Store `_. Install experimental apps at your own risk.
Sometimes the installation of a third-party app fails silently, possibly because
``'appcodechecker' => true,`` is enabled in ``config.php``. When ``appcodechecker`` is
diff --git a/admin_manual/installation/apps_supported.rst b/admin_manual/installation/apps_supported.rst
new file mode 100644
index 000000000..14319692f
--- /dev/null
+++ b/admin_manual/installation/apps_supported.rst
@@ -0,0 +1,47 @@
+==========================
+Supported Apps in ownCloud
+==========================
+
+AGPL Apps
+---------
+
+* Activity
+* AntiVirus
+* Collaborative Tags
+* Comments
+* Encryption
+* External Sites
+* External Storage
+* ownCloud WebDAV Endpoint (handles old and new webdav endpoints)
+* Federated File Sharing (allows file sharing across ownCloud instances)
+* Federation (allows usernname auto-complete across ownCloud instances)
+* Files (cannot be disabled)
+* Files PDF Viewer
+* Files Sharing
+* Files TextEditor
+* Files Trashbin
+* Files Versions
+* Files VideoPlayer
+* First Run Wizard
+* Gallery
+* Notifications
+* Object Storage (Swift)
+* Provisioning API
+* Template Editor (for notification emails)
+* Update Notifications
+* User External
+* User LDAP
+
+Enterprise-Only Apps
+--------------------
+
+* Enterprise License Key
+* Files Drop
+* File Firewall
+* LDAP Home Connector
+* Log user and Sharing actions (1 new app, replacing the 2 former logging apps)
+* Object Storage (S3)
+* SharePoint
+* Shibboleth (SAML)
+* Windows Network Drives (requires External Storage)
+* Workflow
diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst
index 1c07f3a1e..f571593d0 100644
--- a/admin_manual/installation/index.rst
+++ b/admin_manual/installation/index.rst
@@ -11,6 +11,7 @@ Installation
installation_wizard
command_line_installation
apps_management_installation
+ apps_supported
source_installation
appliance_installation
php_54_installation
diff --git a/admin_manual/issues/code_signing.rst b/admin_manual/issues/code_signing.rst
index b2b9d54f0..ceae306dd 100644
--- a/admin_manual/issues/code_signing.rst
+++ b/admin_manual/issues/code_signing.rst
@@ -49,7 +49,7 @@ Is Code Signing Mandatory For Apps?
Code signing is optional for all third-party applications. Applications
with a tag of "Official" on apps.owncloud.com require code signing.
-.. code_signing_fix_warning_label:
+.. _code_signing_fix_warning_label:
Fixing Invalid Code Integrity Messages
--------------------------------------