Merge pull request #1357 from owncloud/improve-activity-notifications-description

Improve activity notifications description

user_manual/userpreferences.rst

@@ -27,59 +27,97 @@ The options listed in the Personal Settings Page depend on the applications that
 are enabled by the administrator.  However, some of the default settings for 
 this page include the following:
 
-* Usage and available quota -- Appearing at the top of the page, this 
-  information provides the amount of space used and available for the user (in 
-  Megabytes).
+Usage and available quota
+-------------------------
 
-   .. figure:: images/usage_indicator.png
+Appearing at the top of the page, this information provides the amount of space
+used and available for the user (in Megabytes).
 
-* Password -- Enables you to change your password.  To change your password, you 
-  must provide your current password along with your new password.  When 
-  creating a new password, ownCloud provides a dynamic password strength 
-  indicator for your assistance.
+.. figure:: images/usage_indicator.png
 
-  .. figure:: images/password_change.png
+Password
+--------
 
-  .. note:: If you would like the ability to recover your password through 
+Enables you to change your password.  To change your password, you must provide
+your current password along with your new password. When creating a new
+password, ownCloud provides a dynamic password strength indicator for your
+assistance.
+
+.. figure:: images/password_change.png
+
+.. note:: If you would like the ability to recover your password through
      e-mail, specify your email address in the Email field (see below).
 
-* Full Name -- Enables you to specify your full name.  This name appears at the 
-  top of the Personal Settings Menu.
+Full Name
+---------
+
+Enables you to specify your full name. This name appears at the top of the
+Personal Settings Menu.
 
    .. figure:: images/full_name.png
 
-* Email -- Enables you to specify an email address for use by the ownCloud 
-  server and administrator in sending you notifications.  For information about 
-  setting email notifications, see "Notifications" below.
+Email
+-----
 
-   .. figure:: images/email_address_personal_settings.png
+Enables you to specify an email address for use by the ownCloud server and
+administrator in sending you notifications. For information about setting email
+notifications, see "Notifications" below.
 
- * Profile picture -- Enables you to specify a new avatar (profile image) that 
-   identifies you on the ownCloud server.  By default, the profile picture is 
-   the first initial of your username.  You can choose to keep the letter 
-   designation, upload a new image from an external source, or select an image 
-   from any existing images in your ownCloud folders.
+.. figure:: images/email_address_personal_settings.png
 
-   .. figure:: images/profile_picture_personal_settings.png
+Profile picture
+---------------
 
-* Language -- Enables you to change your web interface language, if you want to 
-  override the browser settings.
+Enables you to specify a new avatar (profile image) that identifies you on the
+ownCloud server. By default, the profile picture is the first initial of your
+username. You can choose to keep the letter designation, upload a new image
+from an external source, or select an image from any existing images in your
+ownCloud folders.
 
-   .. figure:: images/language_personal_settings.png
+.. figure:: images/profile_picture_personal_settings.png
 
-* Notifications -- Enables you to specify what notifications you receive for 
-  activities on your ownCloud instance.  You can choose to receive messages 
-  through an email notification or online stream notification.  In addition, 
-  the Notifications settings enable you to exclude changes that you make 
-  yourself and obtain only changes made by others on your account.  You can 
-  obtain notifications hourly, daily, or weekly.
+Language
+--------
 
-   .. figure:: images/notifications_personal_settings.png
+Enables you to change your web interface language, if you want to override the
+browser settings.
 
-* Documents -- Enables you to specify a location (folder) to which newly created 
-  documents are saved.
+.. figure:: images/language_personal_settings.png
 
-   .. figure:: images/documents_personal_settings.png
+Notifications
+-------------
 
-* Version -- Specifies the ownCloud software version that you are using along 
-  with links to the ownCloud community, source code, and licensing information.
+Enables you to specify what notifications you receive for activities on your
+ownCloud instance. You can choose to receive messages through an email
+notification or online stream notification. In addition, the Notifications
+settings enable you to exclude changes that you make yourself and obtain only
+changes made by others on your account. You can obtain email notifications
+hourly, daily, or weekly.
+
+.. figure:: images/notifications_personal_settings.png
+
+Limit notifications to your favorite files
+++++++++++++++++++++++++++++++++++++++++++
+
+Since ownCloud 8.1 it is possible to "Limit notifications about creation and
+changes to your favorite files". This means you will no longer receive
+notifications for all files, but only those, which are marked as favorite or are
+in a folder that is marked as a favorite, using the new :ref:`favorites-label`
+feature.
+
+.. note:: This option is only available for the notification stream at the
+  moment, due to the way the email notifications are generated in ownCloud 8.1.
+
+Documents
+---------
+
+Enables you to specify a location (folder) to which newly created documents are
+saved.
+
+.. figure:: images/documents_personal_settings.png
+
+Version
+-------
+
+Specifies the ownCloud software version that you are using along with links to
+the ownCloud community, source code, and licensing information.

user_manual/whats_new.rst

@@ -15,6 +15,8 @@ manager, and has a new graphical selective sync file chooser. See the
 `ownCloud Desktop Client Manual <http://doc.owncloud.org/desktop/1.8/>`_ for 
 more information.
 
+.. _favorites-label:
+
 Favorites
 ---------