[Pkg-owncloud-commits] [owncloud-doc] 26/38: Add notes re: no expiration date on local shares

[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 cc42c7778e35bc1876dd605d30db1ad853de3e42
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Oct 20 21:14:37 2014 -0700

    Add notes re: no expiration date on local shares
---
 admin_manual/configuration/configuration_file_sharing.rst |  6 ++++++
 admin_manual/whats_new_admin.rst                          |  4 ++++
 user_manual/files/filesweb.rst                            | 13 ++++++++++---
 user_manual/whats_new.rst                                 |  7 +++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/admin_manual/configuration/configuration_file_sharing.rst b/admin_manual/configuration/configuration_file_sharing.rst
index 39efad2..6d9a303 100644
--- a/admin_manual/configuration/configuration_file_sharing.rst
+++ b/admin_manual/configuration/configuration_file_sharing.rst
@@ -62,6 +62,12 @@ re-sharing, editing, updating, and deletion privileges:
 
 .. figure:: ../images/sharing-user-local.png
 
+.. note::In older versions of ownCloud, you could set an expiration date on both 
+   local and public shares. Now you can set an expiration date only on public 
+   shares, and local shares do not expire when public shares expire. The only 
+   way to "expire" a local share is to click the trash can icon to un-share your 
+   files.
+
 Creating Persistent File Shares
 -------------------------------
 
diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst
index 27eda47..a46cf3f 100644
--- a/admin_manual/whats_new_admin.rst
+++ b/admin_manual/whats_new_admin.rst
@@ -88,6 +88,10 @@ faster and accessible. Improvements include:
    ``'share_folder'`` directive in ``config.php``. If you are upgrading from 
    older ownCloud versions you will still have your old Shared folder. 
 
+* In older versions of ownCloud, you could set an expiration date on both local 
+   and public shares. Now you can set an expiration date only on public shares, 
+   and local shares do not expire when public shares expire. The only way to 
+   "expire" a local share is to click the trash can icon to un-share your files.
  
 Email Configuration Wizard
 --------------------------
diff --git a/user_manual/files/filesweb.rst b/user_manual/files/filesweb.rst
index 3ec53bd..8afd4d6 100644
--- a/user_manual/files/filesweb.rst
+++ b/user_manual/files/filesweb.rst
@@ -163,8 +163,7 @@ Sharing Files Locally
 
 When enabled by your administrator, you can share files or folders on ownCloud 
 with a local user, group, or any person online with a public link. Shared files 
-and folders are labeled with overlay icons the triangular share icon, and the 
-status *Shared* 
+and folders are labeled with the triangular share icon, and the status *Shared* 
 in the file or folder row.
 
 To create a local share with other users or groups on your ownCloud server:
@@ -210,4 +209,12 @@ and check Share Link.
 This creates a public URL that anyone can use to access the share. You have the
 options to send an email notification, protect it with a password, and put an 
 expiration date on it. Your ownCloud administrator has the option to require 
-passwords and expiration dates.  
+passwords and expiration dates. 
+
+Change in Share Expiration Date
+-------------------------------
+
+In older versions of ownCloud, you could set an expiration date on both local 
+and public shares. Now you can set an expiration date only on public shares, 
+and local shares do not expire when public shares expire. The only way to 
+"expire" a local share is to click the trash can icon to un-share your files.
diff --git a/user_manual/whats_new.rst b/user_manual/whats_new.rst
index e02b512..24d3d90 100644
--- a/user_manual/whats_new.rst
+++ b/user_manual/whats_new.rst
@@ -56,4 +56,11 @@ Viewing your Files page is faster now thanks to "lazy loading", which loads
 files as you scroll down the page instead of loading all of them when you open 
 the page.
 
+Change in Share Expiration Date
+-------------------------------
+
+In older versions of ownCloud, you could set an expiration date on both local 
+and public shares. Now you can set an expiration date only on public shares, 
+and local shares do not expire when public shares expire. The only way to 
+"expire" a local share is to click the trash can icon to un-share your files.
 

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