Revisions and fixes to server_to_server_using.rst

user_manual/files/server_to_server_using.rst

@@ -1,62 +1,47 @@
 Using Server-to-Server Sharing
 ==============================
 
-ownCloud supports server-to-server sharing.  By mounting a share from another
-ownCloud instance, this feature enables you to:
+ownCloud 7 introduces a powerful new feature, server-to-server sharing.  With just a few clicks you can easily access shares from other ownCloud 7 servers, link them to your account, and create your own shares. This feature enables you to:
 
-* Seamlessly collaborate and share files from within two ownCloud instances.
+* Selectively share files or directories.
 * Combine two private clouds into a single public cloud. 
-* Locally synchronize the folder through the client. 
-* Eliminate the need to create user accounts on multiple instances.
+* Eliminate the need to create user accounts on multiple ownCloud servers.
+* View files in a Web browser or ownCloud client.
 
 .. note:: Server-to-server sharing requires that both servers are running
-   versions of ownCloud that support this feature.
+   versions of ownCloud that support this feature; currently this is ownCloud 7.
 
-For information about managing server-to-server sharing functions for internal
-and external users and groups see the following section.
+Creating a New Share
+------------------------
 
-Sharing Files and Folders Across Servers
-----------------------------------------
+Server-to-server sharing is enabled on new or upgraded ownCloud 7 installations
+by default. (See "Configuring Server-to-Server Sharing" in the Administrators Manual.) Follow these steps to create a new share:
 
-Server-to-server sharing is enabled on new or upgraded ownCloud installations
-by default. However, you need to share folders in a particular way for
-server-to-server sharing to function.  When sharing files and folders across
-servers, two primary steps are required.  These steps include:
+1. Go to your ``Files`` page and hover your cursor over the file or directory you want to share to expose your administration options. Check the ``Share Link`` checkbox to create the share, and to expose all of your sharing options.
 
-1. The originator sharing a file or folder from their server using a link.
+2. Set any options that you want to apply to your new share: send an email notification, add password protection, allow users to upload files to the share, or set an expiration date.
 
-2. The receiver(s) of the shared file or folder adding the file or folder to their ownCloud instance.
+   .. figure:: ../images/s2s-create_public_share.png
+   
+And that's all there is to it. Your new public share is labeled with a chain link. If you do not protect it with a password, it is visible to anyone who has the URL. (ownCloud server admins have the option of requiring users to set passwords on shares in ``Admin > Sharing.``)
 
-Sharing From a Server
-~~~~~~~~~~~~~~~~~~~~~
 
-To share a file or folder across servers as an originator:
+Connecting to a Remote Share
+-----------------------------
 
-1. Access the Files app on your server.
+1. Open the share link in your Web browser.
 
-2. Select and share a file or folder by link.
+   .. figure:: ../images/s2s-connect-to-remote-share.png
 
-   .. figure:: ../images/share_link.png
+2. Click the ``Add to your ownCloud`` button, and enter the URL of your ownCloud server. If you are not already logged in you will get a login window.
 
-      **Sharing a link**
+3. After logging in you will see a dialogue asking you ``"Do you want to add the remote share [share name] from [remote server name]?"``
 
-3. (Optional) Specify an alphanumeric password that you want others to use in order to accessing this share.
+   .. figure:: ../images/s2s-add-remote-share.png
 
-4. (Optional) Specify an expiration date for the share.
+4. Click the ``Add Remote Share`` button, and enjoy your new share. It is marked with a share icon, and the name of the share's owner and originating server.
 
-    If set, the ability to access the link expires on the date specified.
+   .. figure:: ../images/s2s-remote-share-labeled.png
 
-3. Send an email to the user or group to indicate the shared link.
+Remove your linked share anytime by clicking the trash can icon.   
 
-Adding a Shared File or Folder to Your ownCloud Instance
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To add a file or folder to your ownCloud:
-
-1. Access the shared link using a browser.
-
-   The links opens the shared folder or file.
-
-   .. figure:: ../images/share_link_adding.png
-
-2. Click "Add to your owncloud" and specify the URL to your ownCloud instance.