diff --git a/admin_manual/images/oc_admin_app_page.png b/admin_manual/images/oc_admin_app_page.png
index 543ec1321..4449cb8da 100644
Binary files a/admin_manual/images/oc_admin_app_page.png and b/admin_manual/images/oc_admin_app_page.png differ
diff --git a/admin_manual/installation/apps_management_installation.rst b/admin_manual/installation/apps_management_installation.rst
index 5c65ffe62..96f72ce91 100644
--- a/admin_manual/installation/apps_management_installation.rst
+++ b/admin_manual/installation/apps_management_installation.rst
@@ -18,27 +18,11 @@ During the ownCloud installation, some apps are enabled by default. To see which
apps are enabled go to your Apps page.
.. figure:: ../images/oc_admin_app_page.png
- :scale: 50%
-
- *Click to enlarge*
+ :alt: Apps page for enabling and disabling apps.
You will see which apps are enabled, not enabled, and recommended. You'll also
-see additional filters, such as Multimedia and Productivity for finding
-apps quickly. The ``More apps`` link takes you to the ownCloud Apps Store, and
-the ``Add your app`` link takes you to the ownCloud Developer Manual.
-
-Re-enabling Contacts and Calendar Apps
---------------------------------------
-
-The Contacts and Calendar apps are unsupported community apps, and by
-default are not enabled or installed in ownCloud 8+. You may easily install and
-enable them by clicking on the Productivity filter, and then clicking the **Enable**
-buttons for both apps. This will download and enable them.
-
-If you were using Contacts and Calendar in previous versions of ownCloud, and
-you upgraded to ownCloud 8, your Contacts and Calendar data are still in your
-ownCloud database. Installing and enabling them in ownCloud 8 will
-automatically restore your data.
+see additional filters, such as Multimedia, Productivity, and Tool for finding
+more mpps quickly.
Managing Apps
-------------
@@ -51,37 +35,31 @@ your ownCloud Admin page, Personal page, or in ``config.php``.
Adding Third Party Apps
-----------------------
-Some apps are developed and supported by ownCloud directly, while other apps are
-created by third parties and available for your ownCloud server installation.
-Apps developed by the ownCloud community show a *recommended* designation. Any
-apps that are not developed by ownCloud but have been reviewed by the ownCloud
-security team show a *3rd party* designation. Install unsupported apps at your
-own risk.
+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.
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
+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 `_.
+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. Scroll to the bottom of the Apps Information Field.
+1. Read about any of the apps in the ownCloud Apps Store and download any that
+ you like.
-2. Click *More apps*.
-
- The ownCloud Apps Store launches.
-
-3. Read about any of the apps in the ownCloud Apps Store and download any that you like.
-
-4. Extract a downloaded compressed file and place the contents (which should
+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``.
-5. Ensure the permissions and ownership are similar to the other 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``.
@@ -91,16 +69,14 @@ Sometimes the installation of a third-party app fails silently, possibly because
enabled it checks if third-party apps are using the private API, rather than the public
API. If they are then they will not be installed.
-.. note:: If you would like to create or add your own ownCloud app, please use the
- *Add your App...* button on the same page. This button redirects you to the
- `App Development documentation
- `_,
- where you can find information about creating and adding your own apps.
+.. note:: If you would like to create or add your own ownCloud app, please
+ refer to the `developer manual
+ `_.
Using Custom App Directories
----------------------------
-Use the **apps_paths** array in `config.php` to set any custom apps directory
+Use the **apps_paths** array in ``config.php`` to set any custom apps directory
locations. The key **path** defines the absolute file system path to the app
folder. The key **url** defines the HTTP web path to that folder, starting at
the ownCloud web root. The key **writable** indicates if a user can install apps
diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst
index 16d13f4f5..71108a32d 100644
--- a/admin_manual/whats_new_admin.rst
+++ b/admin_manual/whats_new_admin.rst
@@ -25,4 +25,7 @@ ownCloud has many improvements. Some of our new features are:
* Command-line options added to the Updater app. (:doc:`maintenance/update`)
* Many new ``occ`` commands. (:doc:`configuration_server/occ_command`)
* Admin option to enable and disable sharing on external storage mountpoints. (:ref:`external_storage_mount_options_label`)
+* New ``occ`` commands for migrating contacts and calendars from 8.2,
+ if auto-migration during upgrade fails, and new commands for creating
+ addressbooks and calendars (:ref:`dav_label`)