From 6d757dc189083bd796dade9c45fee9c7528a7777 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Sun, 6 Dec 2020 18:41:29 +0100 Subject: [PATCH 1/3] Improve punctuation and "Share" --- user_manual/files/sharing.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/user_manual/files/sharing.rst b/user_manual/files/sharing.rst index bf759eb36..214b90daa 100644 --- a/user_manual/files/sharing.rst +++ b/user_manual/files/sharing.rst @@ -2,7 +2,7 @@ File Sharing ============ -Nextcloud users can share files and folders. Possible targets are +Nextcloud users can share files and folders. Possible targets are: * public links * users @@ -27,16 +27,16 @@ A number of options are available for public *folder* shares: .. figure:: ../images/sharing_public_folder.png * **Read only** to allow viewing and downloading -* ** Allow upload and editing** -* With ** File drop**, the sharee can only upload files to a folder without seeing the files that are already in that folder. -* **Hide download** prevents the sharee from downloading +* **Allow upload and editing** +* With **File drop**, the share can only upload files to a folder without seeing the files that are already in that folder. +* **Hide download** prevents the share from downloading * **Password protect** * **Set expiration date** will automatically disable the share * **Note to recipient** * **Unshare** to revert the share * **Add another link** to create multiple public links with different rights -For public *file* shares, you may allow editing the file with one of Nextcloud's collaborative editing solutions. +For public *file* shares, you may allow editing the file with one of Nextcloud's collaborative editing solutions: .. figure:: ../images/sharing_public_file.png @@ -48,12 +48,12 @@ When sharing with users, groups, circles or members of a Talk conversation, righ .. figure:: ../images/sharing_internal.png -As a sharee, you can configure if you automatically want to accept all incoming shares and have them added to your root folder, or if you +As a share, you can configure if you automatically want to accept all incoming shares and have them added to your root folder, or if you want to be asked each time if you want to accept or decline the share. .. figure:: ../images/sharing_internal_acceptNotification.png -For adjusting the acceptance setting, go to **Settings** > **Personal** > **Sharing** +For adjusting the acceptance setting, go to **Settings** > **Personal** > **Sharing**: .. figure:: ../images/sharing_autoAcceptSetting.png @@ -62,23 +62,23 @@ Others with access ------------------ In order to find out if a file or folder is accessible to others through sharing of a superior folder -hierarchy level, click on **Others with access** in the sharing tab. +hierarchy level, click on **Others with access** in the sharing tab: .. figure:: ../images/sharing_others-with-access__collapsed.png The list shows all users, groups, chats etc. that the current object has been given access to through -sharing of a superior folder in the hierarchy. +sharing of a superior folder in the hierarchy: .. figure:: ../images/sharing_others-with-access__details.png -Click on the three dots to +Click on the three dots to: * see who initiated the share * see where the share was initiated (click to navigate to the folder, as far as you have access there) * unshare the initial share (only accessible for the share owner) -.. note:: This information is only visible to the owner of a file/folder or sharees with resharing rights. +.. note:: This information is only visible to the owner of a file/folder or shares with resharing rights. ================ @@ -101,7 +101,7 @@ in this form: ``@``. In this example, that is .. figure:: ../images/share-federation-1.png -The sharee is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. +The user is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. .. figure:: ../images/share-federation-2-notification.png From 092c471706e2150d310e9aabaa3d7cdfec39fecf Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Thu, 10 Dec 2020 13:13:06 +0100 Subject: [PATCH 2/3] Return of the word "sharee" --- user_manual/files/sharing.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_manual/files/sharing.rst b/user_manual/files/sharing.rst index 214b90daa..b16570148 100644 --- a/user_manual/files/sharing.rst +++ b/user_manual/files/sharing.rst @@ -28,8 +28,8 @@ A number of options are available for public *folder* shares: * **Read only** to allow viewing and downloading * **Allow upload and editing** -* With **File drop**, the share can only upload files to a folder without seeing the files that are already in that folder. -* **Hide download** prevents the share from downloading +* With **File drop**, the sharee can only upload files to a folder without seeing the files that are already in that folder. +* **Hide download** prevents the sharee from downloading * **Password protect** * **Set expiration date** will automatically disable the share * **Note to recipient** @@ -48,7 +48,7 @@ When sharing with users, groups, circles or members of a Talk conversation, righ .. figure:: ../images/sharing_internal.png -As a share, you can configure if you automatically want to accept all incoming shares and have them added to your root folder, or if you +As a sharee, you can configure if you automatically want to accept all incoming shares and have them added to your root folder, or if you want to be asked each time if you want to accept or decline the share. .. figure:: ../images/sharing_internal_acceptNotification.png @@ -78,7 +78,7 @@ Click on the three dots to: * unshare the initial share (only accessible for the share owner) -.. note:: This information is only visible to the owner of a file/folder or shares with resharing rights. +.. note:: This information is only visible to the owner of a file/folder or sharees with resharing rights. ================ @@ -101,7 +101,7 @@ in this form: ``@``. In this example, that is .. figure:: ../images/share-federation-1.png -The user is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. +The sharee is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. .. figure:: ../images/share-federation-2-notification.png From 31bf33d448ba42b6c628bf74dd39e561d69225f5 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Fri, 11 Dec 2020 13:19:32 +0100 Subject: [PATCH 3/3] Fix dot to a colon --- user_manual/files/sharing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_manual/files/sharing.rst b/user_manual/files/sharing.rst index b16570148..b41dab9af 100644 --- a/user_manual/files/sharing.rst +++ b/user_manual/files/sharing.rst @@ -97,11 +97,11 @@ Federation sharing is enabled by default. Follow these steps to create a new sha Go to your ``Files`` page and click the Share icon on the file or directory you want to share. In the sidebar enter the username and URL of the remote user in this form: ``@``. In this example, that is -``bob@cloud.example.com``. +``bob@cloud.example.com``: .. figure:: ../images/share-federation-1.png -The sharee is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. +The sharee is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share: .. figure:: ../images/share-federation-2-notification.png