From 13ac4a64446ce5c941255f0beea5f11b5a9a3719 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 2 Mar 2016 11:03:17 -0800 Subject: [PATCH 1/2] minor grammar correction --- .../federated_cloud_sharing_configuration.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst b/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst index b69a54392..9325d89b9 100644 --- a/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst +++ b/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst @@ -10,11 +10,11 @@ when you create the share, share directly with users on other ownCloud servers, add password protection, allow users to upload files, and set an expiration date. -Sharing With ownCloud 7 ------------------------ +Sharing With ownCloud 8 and Older +--------------------------------- Direct Federation shares (:ref:`label-direct-share-link`) are not supported in -ownCloud 7, so you must create Federation shares with public links +ownCloud 8 and older, so you must create Federation shares with public links (:ref:`label-public-link-share`). .. _label-direct-share-link: @@ -70,7 +70,7 @@ automatically added to your trusted list when you create new Federation shares. You may also enter ownCloud server URLs in the **Add ownCloud Server** field. The yellow light indicates a successful connection, with no user names -exchanges. The green light indicates a successful connection with user names +exchanged. The green light indicates a successful connection with user names exchanged. A red light means the connection failed. .. figure:: images/federation-1.png From cd975022509fbc8df6b9eae24d14a939e0c15cba Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 2 Mar 2016 11:05:15 -0800 Subject: [PATCH 2/2] Update federated_cloud_sharing_configuration.rst --- .../federated_cloud_sharing_configuration.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst b/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst index 9325d89b9..92386e6e1 100644 --- a/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst +++ b/admin_manual/configuration_files/federated_cloud_sharing_configuration.rst @@ -5,10 +5,7 @@ Configuring Federation Sharing Federated Cloud Sharing is now managed by the Federation app (9.0+), and is now called Federation sharing. When you enable the Federation app you can easily and securely link file shares between ownCloud servers, in effect -creating a cloud of ownClouds. You can automatically send an email notification -when you create the share, share directly with users on other ownCloud servers, -add password protection, allow users to upload files, and set an expiration -date. +creating a cloud of ownClouds. Sharing With ownCloud 8 and Older --------------------------------- @@ -57,8 +54,6 @@ is a few steps on the originating server. You may disconnect the share at any time by clicking the trash can icon. -.. Note:: Federation shares cannot be re-shared. - Configuring Trusted ownCloud Servers ------------------------------------