Merge branch 'stable9' of https://github.com/owncloud/documentation into stable9

This commit is contained in:
Carla Schroder 2016-03-02 11:09:44 -08:00
commit 0d9a05ed93

View File

@ -5,16 +5,13 @@ 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 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:
@ -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
------------------------------------
@ -70,7 +65,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