[Pkg-owncloud-commits] [owncloud-doc] 50/71: Backport #997 and #1079 to stable7

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 19dea187681b2f64a314b22ec04588095e79ece7
Author: RealRancor <Fisch.666 at gmx.de>
Date:   Fri Apr 24 18:25:36 2015 +0200

    Backport #997 and #1079 to stable7
---
 .../configuration/activity_configuration.rst       | 32 ++++++++++++++++++++++
 admin_manual/configuration/index.rst               |  1 +
 2 files changed, 33 insertions(+)

diff --git a/admin_manual/configuration/activity_configuration.rst b/admin_manual/configuration/activity_configuration.rst
new file mode 100644
index 0000000..662fb28
--- /dev/null
+++ b/admin_manual/configuration/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`) which allows
+you to clean-up older activies from the database.
diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst
index 70f904e..1cce865 100644
--- a/admin_manual/configuration/index.rst
+++ b/admin_manual/configuration/index.rst
@@ -5,6 +5,7 @@ Configuration
 .. toctree::
    :maxdepth: 2
 
+   activity_configuration
    antivirus_configuration
    automatic_configuration
    background_jobs_configuration

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git