From 781551f443d67b5d7087e3aba726f909026f8650 Mon Sep 17 00:00:00 2001
From: RealRancor <Fisch.666@gmx.de>
Date: Sun, 29 Mar 2015 20:54:42 +0200
Subject: [PATCH] Added description and config hints for activity app

---
 .../activity_configuration.rst                | 32 +++++++++++++++++++
 admin_manual/configuration_server/index.rst   |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 admin_manual/configuration_server/activity_configuration.rst

diff --git a/admin_manual/configuration_server/activity_configuration.rst b/admin_manual/configuration_server/activity_configuration.rst
new file mode 100644
index 000000000..8a8203d12
--- /dev/null
+++ b/admin_manual/configuration_server/activity_configuration.rst
@@ -0,0 +1,32 @@
+Configuring the Activity App
+============================
+
+You can configure your ownCloud server to automatically send out e-mail notifications
+to your users for various events like:
+
+* A file or folder has been shared
+* A new file or folder has been created
+* A file or folder has been changed
+* A file or folder has been deleted
+
+Users can see actions (delete, add, modify) that happen to files they have access to.
+Sharing actions are only visible to the sharer and sharee.
+
+Enabling the Activity App
+-------------------------
+
+The Activity App is shipped and enabled by default. If it is not enabled
+simply go to your ownCloud Apps page to enable it.
+
+Configuring your ownCloud for the Activity App
+----------------------------------------------
+
+To configure your ownCloud to send out e-mail notifications a working
+:doc:`email_configuration` is mandatory.
+
+Furthermore it is recommended to configure the background job ``Webcron`` or
+``Cron`` as described in :doc:`background_jobs_configuration`.
+
+There is also a config option ``activity_expire_days`` available in your
+``config.php`` (See :doc:`config_sample_php_parameters.rst`) which allows
+you to clean-up older activies from the database.
diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst
index 5b64a823b..9496ab4f0 100644
--- a/admin_manual/configuration_server/index.rst
+++ b/admin_manual/configuration_server/index.rst
@@ -6,6 +6,7 @@ ownCloud Server Configuration
    :maxdepth: 2
 
    occ_command
+   activity_configuration
    antivirus_configuration
    automatic_configuration
    background_jobs_configuration