diff --git a/admin_manual/configuration_files/encryption_configuration.rst b/admin_manual/configuration_files/encryption_configuration.rst
index 083f6103e..f0038319b 100644
--- a/admin_manual/configuration_files/encryption_configuration.rst
+++ b/admin_manual/configuration_files/encryption_configuration.rst
@@ -292,7 +292,8 @@ Before you start your upgrade, put your ownCloud server into
 You must do this to prevent users and sync clients from accessing files before 
 you have completed your encryption migration.
 
-After your upgrade is complete, follow the steps in :ref:`enable_encryption` to 
+After your upgrade is complete, follow the steps in 
+:ref:`enable_encryption_label` to 
 enable the new encryption system. Then click the **Start Migration** button on 
 your Admin page to migrate your encryption keys, or use the ``occ`` command. We 
 strongly recommend using the ``occ`` command; the **Start Migration** button is 
diff --git a/admin_manual/enterprise_logging/enterprise_logging_apps.rst b/admin_manual/enterprise_logging/enterprise_logging_apps.rst
index 30e09773d..32d1ebd0c 100644
--- a/admin_manual/enterprise_logging/enterprise_logging_apps.rst
+++ b/admin_manual/enterprise_logging/enterprise_logging_apps.rst
@@ -2,36 +2,20 @@
 Enterprise Logging Apps
 =======================
 
-There are two enterprise logging apps available to ownCloud Enterprise 
-Subscription customers: **Log file sharing** and **Log user actions**. The **Log 
-file sharing** app records the file sharing activity of your users, and **Log 
-user actions** records user logins and logouts.
+
+The **Log user and file sharing actions** app (``apps/admin_audit``) records the 
+file sharing activity of your users, file tagging, and user logins and logouts.
 
 .. figure:: images/logging-1.png
-   :alt: The two enterprise logging apps on the Apps page.
+   :alt: Enterprise logging app on the Apps page.
    
-These two apps work together, and should be enabled together. Your logging 
-level must be set to at least **Info, warnings, errors, and fatal issues** on 
-your ownCloud admin page, or ``'loglevel' => 1`` in ``config.php``.  
-
-View your logfiles on your admin page. This shows which logging app recorded 
-the entries, timestamps, usernames, and their activities:
-
-.. figure:: images/logging-3.png
-   :alt: Graphical log example.
-   
-Click the **Download logfile** button to dump the plain text log, or open the 
-logfile directly in a text editor. The default location is 
-``owncloud/data/owncloud.log``. This is what the raw log looks like::
-
- {"reqId":"uaG6sHiutvgzVUCUXM3W","remoteAddr":"::1","app":"admin_audit",
- "message":"Rename \"\/molly\/files\/server-and-enterprise-installation\" to 
- \"\/molly\/files\/shared\/server-and-enterprise-installation\" by user molly, 
- owner: molly","level":1,"time":"2015-10-21T22:07:14+00:00"}
- {"reqId":"Krsnp8BgtLCtuT4zLTWs","remoteAddr":"::1","app":"admin_audit",
- "message":"Rename \"\/molly\/files\/shared\/San%20Francisco.jpg\" to 
- \"\/molly\/files\/shared\/SanFrancisco.jpg\" by user molly, owner: 
- molly","level":1,"time":"2015-10-21T22:07:25+00:00"}
+Your logging level must be set to at least **Info, warnings, errors, and fatal 
+issues** on your ownCloud admin page, or ``'loglevel' => 1`` in ``config.php``. 
  
-See :doc:`../configuration_server/logging_configuration` for more information 
-on logging.
+View your logfiles on your admin page. Click the **Download logfile** button to 
+dump the plain text log, or open the logfile directly in a text editor. The 
+default location is ``owncloud/data/owncloud.log``. 
+ 
+See :doc:`../configuration_server/logging_configuration` and 
+:doc:`../enterprise_file_management/files_tagging` for more information on 
+logging and tagging.
diff --git a/admin_manual/enterprise_logging/images/logging-1.png b/admin_manual/enterprise_logging/images/logging-1.png
index 30e50730b..02cef3b6d 100644
Binary files a/admin_manual/enterprise_logging/images/logging-1.png and b/admin_manual/enterprise_logging/images/logging-1.png differ
diff --git a/admin_manual/enterprise_logging/images/logging-3.png b/admin_manual/enterprise_logging/images/logging-3.png
deleted file mode 100644
index 18c3fb254..000000000
Binary files a/admin_manual/enterprise_logging/images/logging-3.png and /dev/null differ
diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst
index 4ccd834b6..837ad901a 100644
--- a/admin_manual/whats_new_admin.rst
+++ b/admin_manual/whats_new_admin.rst
@@ -29,4 +29,12 @@ ownCloud has many improvements. Some of our new features are:
   if auto-migration during upgrade fails, and new commands for creating 
   addressbooks and calendars (:ref:`dav_label`)
 * New optional second name attribute in the LDAP app, so that user names appear 
-  as ``User Foo (optional 2nd attribute)`` (:ref:`ldap_directory_settings`) 
+  as ``User Foo (optional 2nd attribute)`` (:ref:`ldap_directory_settings`)
+  
+Enterprise Only
+---------------
+
+* Advanced tagging management with the Workflow app 
+  (:doc:`enterprise_file_management/files_tagging`)
+* Advanced authentication backends (:doc:`  
+  enterprise_external_storage/enterprise_only_auth`)