[Pkg-owncloud-commits] [owncloud-doc] 234/270: More changes from Mark
David Prévot
taffit at moszumanska.debian.org
Thu Jul 31 03:53:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 3bc1257613e7fbbd2a19816ca3d735444d056dfe
Author: Daniel Molkentin <daniel at molkentin.de>
Date: Tue Jul 22 16:56:21 2014 +0200
More changes from Mark
---
user_manual/external_storage/google_drive.rst | 92 ++++++++++++-----
user_manual/files/configuring_big_file_upload.rst | 32 ++++--
user_manual/files/deletedfiles.rst | 83 +++++++++++----
user_manual/files/encryption.rst | 112 +++++++++++++--------
user_manual/files/filesweb.rst | 35 +++++--
user_manual/files/sync.rst | 12 +--
user_manual/images/apis_auth_google_drive.png | Bin 0 -> 43232 bytes
user_manual/images/deleted_files.png | Bin 0 -> 25471 bytes
user_manual/images/documents_personal_settings.png | Bin 0 -> 3558 bytes
.../images/email_address_personal_settings.png | Bin 0 -> 4957 bytes
user_manual/images/email_server_smtp_wizard.png | Bin 0 -> 13839 bytes
user_manual/images/encryption_enabling.png | Bin 0 -> 30317 bytes
user_manual/images/full_name.png | Bin 0 -> 3072 bytes
user_manual/images/language_personal_settings.png | Bin 0 -> 3901 bytes
user_manual/images/mail_templates.png | Bin 0 -> 5141 bytes
user_manual/images/new_project_google_drive.png | Bin 0 -> 12943 bytes
.../new_project_google_drive_api_settings.png | Bin 0 -> 18752 bytes
.../images/new_project_google_drive_branding.png | Bin 0 -> 96104 bytes
.../images/new_project_google_drive_new_client.png | Bin 0 -> 20733 bytes
.../images/notifications_personal_settings.png | Bin 0 -> 15316 bytes
user_manual/images/password_change.png | Bin 0 -> 4428 bytes
user_manual/images/personal_settings.png | Bin 0 -> 46927 bytes
.../images/profile_picture_personal_settings.png | Bin 0 -> 10696 bytes
user_manual/images/remote_shares.png | Bin 0 -> 6872 bytes
user_manual/images/s2s_share_link.png | Bin 0 -> 14435 bytes
user_manual/images/usage_indicator.png | Bin 0 -> 2945 bytes
user_manual/images/version_personal_settings.png | Bin 0 -> 7519 bytes
user_manual/userpreferences.rst | 70 +++++++++----
28 files changed, 305 insertions(+), 131 deletions(-)
diff --git a/user_manual/external_storage/google_drive.rst b/user_manual/external_storage/google_drive.rst
index bbb09ae..7af8079 100644
--- a/user_manual/external_storage/google_drive.rst
+++ b/user_manual/external_storage/google_drive.rst
@@ -1,42 +1,77 @@
-External storage
-================
+Configuring External Storage
+============================
-Google Drive
-------------
+ownCloud enables you to redirect files to external storage. This topic describes how to configure Google Drive for external storage.
-#. All applications that access a Google API must be registered through the "Google Cloud Console" which can be accessed using the following URL:
+Before You Begin
+----------------
+
+All applications that access a Google API must be registered through the "Google Cloud Console". You can access the Google Cloud console using the following URL:
::
https://cloud.google.com/console
-#. Enter your Google login credentials and press the ``Sign in`` button.
+Configuring Google Drive for External Storage
+---------------------------------------------
+
+To configure Google Drive for external storage:
+
+1. Access your Google Drive account page.
+
+2. Enter your Google login credentials and press the ``Sign in`` button.
+
+ .. figure:: ../images/external_google_drive_1_sign_in.png
+
+3. Enter your verification code.
+
+ .. figure:: The verification code was sent to you by SMS or the Authenticator App.
+
+# ?? Where do I find this??
+
+4. Click ``Verify``.
+
+ .. figure:: ../images/external_google_drive_2_verify.png
+
+5. Create a project by specifying a project name (for example, "ownCloud-Project").
- .. image:: ../images/external_google_drive_1_sign_in.png
+ .. figure:: ../images/new_project_google_drive.png
-#. Enter your verification code which has been sent to you by SMS or the Authenticator App and press the ``Verify`` button.
+6. Select the project and choose the "APIs & auth" menu entry.
- .. image:: ../images/external_google_drive_2_verify.png
+ .. figure:: ../images/apis_auth_google_drive.png
-#. Create a project, e.g. "ownCloud-Project"
+7. Ensure that the "Drive API" and "Drive SDK" status is set to "ON" in the APIs menu.
- .. image:: ../images/external_google_drive_3_create_project.png
+ .. figure:: ../images/new_project_google_drive_api_settings.png
-#. Select the project and choose the "APIs & auth" menu entry.
+8. Click on the gear button next to the "Drive API" or "Drive SDK" and choose the "API access" menu entry.
-#. Make sure that the "Drive API" and "Drive SDK" status is set to "ON" in the APIs menu.
+9. Click ``Edit branding information ...``.
- .. image:: ../images/external_google_drive_4_enable_api.png
+ The "Edit branding information" window opens.
-#. Click on the ``gear-wheel`` button behind "Drive API" or "Drive SDK" and choose the "API access" menu entry.
+ .. figure:: ../images/new_project_google_drive_branding.png
-#. Click on the ``Create another client ID...`` button and fill in the branding information.
+10. Specify the desired branding information that you want users to see whenever you request access to their private data using your new client ID.
-#. Click on the ``Next`` button and create a new client ID by selecting "Web application" as application type.
+11. Click ``Update``.
-#. Next to your site or hostname click on the ``Edit settings ...`` button.
+ The "Edit branding information" window closes.
-#. Enter the following URLs to the "Authorized Redirect URIs" list and press the Update-button.
+12. Click ``Create another client ID...``.
+
+ The "Create Client ID" window opens.
+
+ .. figure:: ../images/new_project_google_drive_new_client.png
+
+13. Select "Web application" as the application type.
+
+14. Next to "Your site or hostname", click ``more options``.
+
+# ??This doesn't appear to work.??
+
+15. Enter the following URLs to the "Authorized Redirect URIs" list.
::
@@ -46,17 +81,26 @@ Google Drive
.. note:: **Attention:** Make sure that the URLs contain a valid internet domain name and that this domain name is also used to access ownCloud, otherwise these URLs will not be accepted. This does not mean that ownCloud need to be accessible from the Internet, but that the domain name is send to Google to verify if the redirect URIs are valid.
-12. Login into ownCloud using the previously entered Internet domain.
+16. Click ``Update``.
+
+17. Log in to ownCloud using the previously entered Internet domain.
+
+# ??Which one? It looks like we are supposed to enter two of them ... one personal and one admin. I am unable to go further with these instructions without understanding why this isn't working the way it is described.??
+
+18. Click ``Add storage`` in the ownCloud Admin or Personal settings dialog to add the Google Drive.
+
+19. Specify the folder name that you want to use to access the share (for example, "GDrive").
-#. Click on the ``Add storage`` button in the ownCloud Admin or Personal settings dialog to add a Google Drive.
+20. Specify the Google OAuth 2.0 **Client ID** and **Client secret**.
-#. Enter the folder name which should be used to access the share, e.g. "GDrive", enter the Google OAuth 2.0 **Client ID** and **Client secret**. Additional for the admin settings you have to choose the **user and/or group** who/which should be allowed to access the Google Drive (Applicable).
+ For the admin settings, you must also choose the **user and/or group** to allow access to the Google Drive (Applicable).
.. image:: ../images/external_google_drive_5_setup_ownCloud.png
-#. Now press the ``Grant Access`` button and you will finally be redirected to a Google website.
+21. Click ``Grant Access``.
+ Your are redirected to a Google website.
-#. Click on the ``Accept`` button to confirm that you accept the Google data usage and data security policy.
+22. Click ``Accept`` to confirm that you accept the Google data usage and data security policy.
.. image:: ../images/external_google_drive_6_accept.png
diff --git a/user_manual/files/configuring_big_file_upload.rst b/user_manual/files/configuring_big_file_upload.rst
index 0edc105..f9c8f31 100644
--- a/user_manual/files/configuring_big_file_upload.rst
+++ b/user_manual/files/configuring_big_file_upload.rst
@@ -1,11 +1,21 @@
-Big Files
-=========
-
-There are a few default configuration settings that you will want to change to enable ownCloud to operate
-more effectively as a self hosted file sync and share server.
-When uploading through the web client, ownCloud is governed by PHP and Apache.
-As a default, PHP is configured for only 2 MB uploads.
-This is not entirely useful, so it is important to increase these variables to the sizes you want to
-support on your server.
-Ask your administrator to increase these variables for you or read the section in concern `within the
-Admin Documentation <http://doc.owncloud.org/server/6.0/admin_manual/configuration/configuring_big_file_upload.html>`_.
+Managing Big Files
+==================
+
+There are a few default configuration settings that you will want to change to
+enable ownCloud to operate more effectively as a self-hosted file sync and
+share server.
+
+When uploading through the web client, ownCloud is governed by PHP and Apache.
+By default, PHP is configured for only 2 megabyte uploads. As this default
+upload limit is not entirely useful, we recommend that you increase the
+ownCloud variables to the sizes you want to support on your server.
+
+Modifying certain ownCloud variables requires administrative access. If you
+require larger upload limits than have been provided by the default (or already
+set by your administrator):
+
+* Contact your administrator to request an increase in these variables
+
+* Refer to the section in the `Admin Documentation
+ <http://doc.owncloud.org/server/6.0/admin_manual/configuration/configuring_big_file_upload.html>`_
+ that describes how to configure for big files.
diff --git a/user_manual/files/deletedfiles.rst b/user_manual/files/deletedfiles.rst
index 9d0dcd6..baad672 100644
--- a/user_manual/files/deletedfiles.rst
+++ b/user_manual/files/deletedfiles.rst
@@ -1,22 +1,65 @@
-Deleted Files
-=============
+Managing Deleted Files
+======================
ownCloud maintains a copy of deleted files in case you need them again. To
-ensure that the user does not run out of memory, the deleted files app manages
-the size of the deleted files for the user. The app takes care to never use
-more that 50% of your currently available free space. If your deleted files
-exceed this limit, ownCloud deletes the oldest versions until it meets the
-memory usage limit again.
-
-Deleted files can be found by clicking on the :guilabel:`Deleted files` button
-on files app of web interface. You can either restore or permanently delete
-using appropriate buttons.
-
-ownCloud also checks the age of deleted files every time new files are added to
-the deleted files. By default, deleted files stay in the trash bin for 180
-days. The Administrator can adjust this value in the config.php by setting the
-``trashbin_retention_obligation`` value. Files older than the
-``trashbin_retention_obligation`` will be deleted permanently. Additionally,
-ownCloud calculates the maximum available space every time a new file is added.
-If the deleted files exceed the new maximum allowed space ownCloud will expire
-old deleted files until the limit is met once again.
+ensure that individual users do not run out of memory, the Files app manages
+the total memory size of deleted files for each user. When it comes to managing
+deleted files, keep the following in mind:
+
+* The total memory allocation for deleted files can never exceed more that 50%
+ of the currently available free space for each user.
+
+* Once the 50% maximum is reached for deleted files, ownCloud begins to delete files,
+ starting with the oldest versions, until it reaches the memory usage limit again.
+
+You can view all of the deleted files by clicking on the :guilabel:`Deleted
+files` button in Files app on the web interface.
+
+Restoring Files
+---------------
+
+To restore a deleted file:
+
+1. In the Files app, click the :guilabel:`Deleted files` button.
+
+ The Files app shows all deleted files.
+
+ .. figure:: ../images/deleted_files.png
+
+ **Deleted files**
+
+2. Hover the cursor over the file that you want to restore.
+
+ Task options appear for the file.
+
+3. Click the :guilabel:`Restore` button.
+
+ The Files app restores the file to its original location on the server.
+
+Deleting Files
+--------------
+
+To permanently delete a file:
+
+1. In the Files app, click the :guilabel:`Deleted files` button.
+
+ See the **Deleted files** image above.
+
+2. Hover the cursor over the file that you want to delete.
+
+ Task options appear for the file.
+
+3. Click the :guilabel:`Trash can` button.
+
+ The Files app permanently removes the file from the server.
+
+Modifying the Deleted File Age-Out Value
+----------------------------------------
+
+Each time a file is added to the deleted files directory, ownCloud checks the
+age of the deleted files. By default, deleted files remain in the deleted files
+directory for 180 days.
+
+The administrator can adjust the age-out value in the config.php by setting the
+``trashbin_retention_obligation`` value. Files with ages that exceed this value
+are deleted permanently.
diff --git a/user_manual/files/encryption.rst b/user_manual/files/encryption.rst
index 0d9dea1..7b5853c 100644
--- a/user_manual/files/encryption.rst
+++ b/user_manual/files/encryption.rst
@@ -1,62 +1,88 @@
-Files Encryption
+Encrypting Files
================
-ownCloud ships an encryption app, which enables encryption of all files stored in
-your ownCloud. Once the encryption app is enabled by the admin, all your files
-will be encrypted automatically. Encryption and decryption always happen on the
-server-side. This enables the user to continue to use all the other apps to
-view and edit their data. But this also means that the server administrator could
-intercept your data. Server-Side encryption is especially useful if you
-use external storages. This way you can make sure that the storage provider is
-not able to read your data.
+By default, ownCloud provides an Encryption app. This app enables encryption
+of all files stored in your ownCloud. Once enabled by the administrator, all of
+your files are encrypted automatically.
-Please remember. Once the encryption app is enabled, your log-in password is required
-to decrypt and access your data. By default your data will be lost if
-you lose your log-in password. If you want to protect yourself against password
-loss, store your log-in password in a secure place or enable the recovery-key
-feature as described below.
+Encryption and decryption always occurs on the server side. This enables you to
+continue to use all other apps to view and edit data. However, this method of
+encryption also means that the server administrator can intercept your data.
+Server-side encryption is especially useful if you use external storage. It
+ensures that the external storage provider is not able to read your data.
-What gets encrypted
--------------------
+.. note:: Once the Encryption app is enabled, your log-in password is required
+ to decrypt and access your data. By default, your data will be lost if you
+ cannot use your log-in password to retrieve it. If you want to protect yourself
+ against password loss, store your log-in password in a secure place or enable
+ the recovery-key feature as described below.
-The current version encrypts all your files stored in ownCloud except the following:
+The current version of the Encryption app encrypts all files stored in ownCloud except the following:
-- old files in the trash bin (files which were deleted before the encryption app was enabled)
-- image thumbnails from the gallery app and previews from the files app
-- search index from the full text search app
+- Old files in the trash bin (files that were deleted prior to the encryption app being enabled).
+- Image thumbnails from the Gallery app.
+- Previews from the Files app.
+- The search index from the full text search app.
-All this data is stored directly on your ownCloud server, so you don't have to worry about exposing
-your data to a third party storage provider.
+.. note:: All data is stored directly on the ownCloud server, eliminating
+ exposure of your data to third party storage providers.
-Decrypt your data again
------------------------
+Enabling the Encryption App
+---------------------------
-If the encryption app is disabled after users have already stored encrypted data, users
-will be prompted to decrypt their files again in their personal settings. After this is
-done, they can continue to use their ownCloud without encryption.
+Though ownCloud provides the Encryption app in the server download, it is
+disabled by default. To enable the Encryption app:
+
+1. Access the ownCloud server as administrator.
+
+2. In the Apps Selection Menu, click "+".
+
+ All apps appear in the Apps Information field.
+
+3. Scroll down the apps list and click the Encryption app.
+
+ .. figure:: ../images/encryption_enabling.png
+
+ **Encryption app (Enabling)**
+
+4. Click the :guilabel:`Enable` button.
+
+ The Encryption app is enabled.
+
+Decrypting Encrypted Files
+--------------------------
+
+If the Encryption app is disabled after users have already stored encrypted
+data, users are prompted to decrypt their files again in their personal
+settings. Once done, users can continue to use their ownCloud without
+encryption.
Settings
--------
-Once the encryption app is enabled, you will find some additional settings on
-your personal settings page.
+Once the encryption app is enabled, additional settings appear on the Admin
+settings page. These settings include the ability to:
+
+* Set a recovery key password.
+* Enable or disable the use of the recovery key password.
-Recovery Key
-~~~~~~~~~~~~
+Recovery Key Password
+~~~~~~~~~~~~~~~~~~~~~
-If the admin enabled the recovery-key feature you can decide for yourself if
-you want to use this feature for your account. If you enable "Password recovery"
-the admin will be able to read your data with a special password. This allows
-him to recover your files in the event you lose your password. If the recovery-key
-is not enabled than there is no way to restore your files if you lose your log-in
-password.
+If the administrator enabled the recovery key feature, you can choose to use
+this feature for your account. If you enable "Password recovery" the
+administrator can read your data with a special password. This feature enables
+the administrator to recover your files in the event you lose your password. If
+the recovery key is not enabled, then there is no way to restore your files if
+you lose your login password.
Change Private Key Password
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option will be only available if your log-in password but not your
-encryption password was changed by your admin. This can happen if your ownCloud
-provider uses a external user back-end, e.g. LDAP, and changed your log-in
-password there. In this case you can set your encryption password to your new
-log-in password by providing your old and new log-in password. The encryption
-app only works if log-in password and encryption password is identical.
+This option is only available if your log-in password, but not your encryption
+password, was changed by your administrator. This can occur if your ownCloud
+provider uses a external user back-end (for example, LDAP) and changed your
+login password using that back-end configuration. In this case, you can set
+your encryption password to your new login password by providing your old and
+new login password. The Encryption app works only if your login password and
+your encryption password are identical.
diff --git a/user_manual/files/filesweb.rst b/user_manual/files/filesweb.rst
index 0c33be3..672ce67 100644
--- a/user_manual/files/filesweb.rst
+++ b/user_manual/files/filesweb.rst
@@ -2,7 +2,7 @@ Accessing your Files Using the Web Interface
============================================
You can access your ownCloud files from anywhere using the ownCloud web
-interface. Once accessed, using the files app you can view (if a common type),
+interface. Once accessed, using the Files app you can view (if a common type),
move, rename, download, share, and delete your files easily.
.. figure:: ../images/oc_filesweb.png
@@ -71,8 +71,24 @@ the top right side of the Files app field.
.. note:: If the ``Download`` button is not visible, the administrator has
disabled this feature. Contact your administrator for further guidance.
-Viewing Files
--------------
+
+Filtering the File Application View
+-----------------------------------
+
+ownCloud enables you to view files in the File Application View using filter options located in the Apps Information Field. This feature enables you to quickly and easily view and manage files based on their share status.
+
+You can click on any of the filter options to view the files as follows:
+
+* ``All files`` -- The default view; displays all files in the Application View window.
+
+* ``Shared with you`` -- Displays all files shared with you by another user or group.
+
+* ``Shared with others`` -- Displays all files that you have shared with other users or groups.
+
+* ``Shared by link`` -- Displays all files that are shared by you through the use of a link.
+
+Previewing Files
+----------------
You can display uncompressed text files, OpenDocument files, PDFs, and image
files from the ownCloud server by clicking on the file name. If ownCloud cannot
@@ -90,14 +106,15 @@ navigation bar.
Sharing Files
-------------
-You can share any file or folder on ownCloud with a local user, group, or any
-person online with a public link. By sharing a file or folder, the user or
-group can download the information directly to their system. Shared files and
-folders depict a globe icon and the status *Shared* in the file or folder row.
+When enabled by the administrator, you can share any file or folder on ownCloud
+ with a local user, group, or any person online with a public link. By sharing a
+ file or folder, the user or group can download the information directly to their
+ system. Shared files and folders depict a globe icon and the status *Shared* in
+ the file or folder row.
To share a file or folder:
-1. Using your cursor, hover over on an item in the Files app field.
+1. Using your cursor, hover over an item in the Files Application View.
2. Locate the **Share** icon in the file or folder row.
@@ -114,7 +131,7 @@ To share a file or folder:
* **User/Group Share** field: Enables you to specify to whom you want to share the file or folder. Once you specify a user or group, a dialog appears providing added sharing options.
.. figure:: ../images/oc_share_with_options.png
-
+
**Sharing options dialog**
* **Share link** checkbox: When enabled (checked), provides the following additional share options:
diff --git a/user_manual/files/sync.rst b/user_manual/files/sync.rst
index 992121f..e2b4f6b 100644
--- a/user_manual/files/sync.rst
+++ b/user_manual/files/sync.rst
@@ -4,12 +4,12 @@ Desktop Synchronization
For synchronizing files with your desktop computer, we recommend using the
`ownCloud Client`_ for Windows, Mac OS X and Linux.
-The ownCloud Desktop Client enables you to connect to your private ownCloud Server.
-You can create folders in your home directory, and keep the contents of those
-folders synced with your ownCloud server. Simply copy a file into the directory
-and the ownCloud desktop client does the rest. Make a change to the files on one
-computer, it will flow across the others using these desktop sync clients. Always
-have your latest files with you wherever you are.
+The ownCloud Desktop Client enables you to connect to your private ownCloud Server.
+You can create folders in your home directory, and keep the contents of those
+folders synced with your ownCloud server. Simply copy a file into the directory
+and the ownCloud desktop client does the rest. Make a change to the files on one
+computer, it will flow across the others using these desktop sync clients. Always
+have your latest files with you wherever you are.
Its usage is documented separately in the `ownCloud Desktop Client Manual`_.
diff --git a/user_manual/images/apis_auth_google_drive.png b/user_manual/images/apis_auth_google_drive.png
new file mode 100644
index 0000000..8089490
Binary files /dev/null and b/user_manual/images/apis_auth_google_drive.png differ
diff --git a/user_manual/images/deleted_files.png b/user_manual/images/deleted_files.png
new file mode 100644
index 0000000..52c2fd3
Binary files /dev/null and b/user_manual/images/deleted_files.png differ
diff --git a/user_manual/images/documents_personal_settings.png b/user_manual/images/documents_personal_settings.png
new file mode 100644
index 0000000..c7c7c07
Binary files /dev/null and b/user_manual/images/documents_personal_settings.png differ
diff --git a/user_manual/images/email_address_personal_settings.png b/user_manual/images/email_address_personal_settings.png
new file mode 100644
index 0000000..9fdb967
Binary files /dev/null and b/user_manual/images/email_address_personal_settings.png differ
diff --git a/user_manual/images/email_server_smtp_wizard.png b/user_manual/images/email_server_smtp_wizard.png
new file mode 100644
index 0000000..3991c42
Binary files /dev/null and b/user_manual/images/email_server_smtp_wizard.png differ
diff --git a/user_manual/images/encryption_enabling.png b/user_manual/images/encryption_enabling.png
new file mode 100644
index 0000000..43c0fcd
Binary files /dev/null and b/user_manual/images/encryption_enabling.png differ
diff --git a/user_manual/images/full_name.png b/user_manual/images/full_name.png
new file mode 100644
index 0000000..7a1d670
Binary files /dev/null and b/user_manual/images/full_name.png differ
diff --git a/user_manual/images/language_personal_settings.png b/user_manual/images/language_personal_settings.png
new file mode 100644
index 0000000..f86cf8f
Binary files /dev/null and b/user_manual/images/language_personal_settings.png differ
diff --git a/user_manual/images/mail_templates.png b/user_manual/images/mail_templates.png
new file mode 100644
index 0000000..f09ef19
Binary files /dev/null and b/user_manual/images/mail_templates.png differ
diff --git a/user_manual/images/new_project_google_drive.png b/user_manual/images/new_project_google_drive.png
new file mode 100644
index 0000000..c4dccda
Binary files /dev/null and b/user_manual/images/new_project_google_drive.png differ
diff --git a/user_manual/images/new_project_google_drive_api_settings.png b/user_manual/images/new_project_google_drive_api_settings.png
new file mode 100644
index 0000000..746f67e
Binary files /dev/null and b/user_manual/images/new_project_google_drive_api_settings.png differ
diff --git a/user_manual/images/new_project_google_drive_branding.png b/user_manual/images/new_project_google_drive_branding.png
new file mode 100644
index 0000000..cc7180b
Binary files /dev/null and b/user_manual/images/new_project_google_drive_branding.png differ
diff --git a/user_manual/images/new_project_google_drive_new_client.png b/user_manual/images/new_project_google_drive_new_client.png
new file mode 100644
index 0000000..8b64e5f
Binary files /dev/null and b/user_manual/images/new_project_google_drive_new_client.png differ
diff --git a/user_manual/images/notifications_personal_settings.png b/user_manual/images/notifications_personal_settings.png
new file mode 100644
index 0000000..9f61d41
Binary files /dev/null and b/user_manual/images/notifications_personal_settings.png differ
diff --git a/user_manual/images/password_change.png b/user_manual/images/password_change.png
new file mode 100644
index 0000000..3907bfa
Binary files /dev/null and b/user_manual/images/password_change.png differ
diff --git a/user_manual/images/personal_settings.png b/user_manual/images/personal_settings.png
new file mode 100644
index 0000000..8a8b1f2
Binary files /dev/null and b/user_manual/images/personal_settings.png differ
diff --git a/user_manual/images/profile_picture_personal_settings.png b/user_manual/images/profile_picture_personal_settings.png
new file mode 100644
index 0000000..988993b
Binary files /dev/null and b/user_manual/images/profile_picture_personal_settings.png differ
diff --git a/user_manual/images/remote_shares.png b/user_manual/images/remote_shares.png
new file mode 100644
index 0000000..1b48ef5
Binary files /dev/null and b/user_manual/images/remote_shares.png differ
diff --git a/user_manual/images/s2s_share_link.png b/user_manual/images/s2s_share_link.png
new file mode 100644
index 0000000..3db88df
Binary files /dev/null and b/user_manual/images/s2s_share_link.png differ
diff --git a/user_manual/images/usage_indicator.png b/user_manual/images/usage_indicator.png
new file mode 100644
index 0000000..7ad8bbb
Binary files /dev/null and b/user_manual/images/usage_indicator.png differ
diff --git a/user_manual/images/version_personal_settings.png b/user_manual/images/version_personal_settings.png
new file mode 100644
index 0000000..6d74caf
Binary files /dev/null and b/user_manual/images/version_personal_settings.png differ
diff --git a/user_manual/userpreferences.rst b/user_manual/userpreferences.rst
index 370950b..1a64cf3 100644
--- a/user_manual/userpreferences.rst
+++ b/user_manual/userpreferences.rst
@@ -1,31 +1,65 @@
Changing Preferences
====================
-.. figure:: images/oc_user_preferences.png
+As a user, you can manage your personal settings.
-As a user, you can change your personal settings by clicking on your username
-on the top-right of ownCloud instance and choosing *Personal*.
+To access your personal settings:
-If you are an administrator, you can also manage users and administer the server
-by using the related links. Those links will not be shown to a normal user.
+1. Clicking on your username in the top, right corner of your ownCloud instance.
-This document will explain the default items on this page. Depending on the enabled
-applications, you may have more options listed.
+ The Personal Settings Menu opens.
-* In the beginning of the page, you will see your usage and available quota.
+ .. figure:: images/oc_user_preferences.png
-* You can change your password. For that, you need to enter your current and new password in the field
- named *Password*. If you would like to able to recover your password via e-mail, fill the e-mail field
- with the one that you currently using.
+ **Personal Settings Menu**
-* By default, your image will have the initial of your username. This image is currently used in editing documents.
- You can either upload a new image or choose one from the existing images on your ownCloud to set.
+2. Choose *Personal* from the drop down menu.
-* In this page, you can also change your web interface language if you want to override the browser settings.
+ The Personal Settings Page opens in the main viewing window.
-* WebDAV link will allow you to only view and download your ownCloud files using a browser. You will still need
- your username and password to access this page.
+ .. figure:: images/personal_settings.png
-* Documents app will have an option to specify the folder for newly created documents. You can set the folder here.
+.. note:: If you are an administrator, you can also manage users and administer the server by using the related links in the Personal Settings Menu. However, these links do not appear to a normal user.
-* This page will have more options if you have e.g. external storage app enabled.
+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).
+
+ .. figure:: images/usage_indicator.png
+
+* 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/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.
+
+ .. 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.
+
+ .. figure:: images/email_address_personal_settings.png
+
+ * 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/profile_picture_personal_settings.png
+
+* Language -- Enables you to change your web interface language, if you want to override the browser settings.
+
+ .. figure:: images/language_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.
+
+ .. figure:: images/notifications_personal_settings.png
+
+* Documents -- Enables you to specify a location (folder) to which newly created documents are saved.
+
+ .. figure:: images/documents_personal_settings.png
+
+
+* WebDAV link will allow you to only view and download your ownCloud files using a browser. You will still need your username and password to access this page.
+
+# ??Is this no longer visible??
+
+* Version -- Specifies the ownCloud software version that you are using along with links to the ownCloud community, source code, and licensing information.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list